diff --git a/audacity.changes b/audacity.changes index 41fb4fa..e8e6bd7 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 26 07:39:33 UTC 2021 - Dave Plater + +- Conflict pipewire-libjack-0_3 to prevent boo#1191585 + ------------------------------------------------------------------- Sat Oct 16 10:37:47 UTC 2021 - Dave Plater diff --git a/audacity.spec b/audacity.spec index e376a87..c8bc995 100644 --- a/audacity.spec +++ b/audacity.spec @@ -84,6 +84,9 @@ Requires: ffmpeg Requires: libmp3lame0 Provides: %{name}-plugins = %{version} Obsoletes: %{name}-plugins <= 2.4.2 +# pipewire-libjack-0_3 replaces jack and when audacity loads it +# causes a sigsev See https://bugzilla.suse.com/show_bug.cgi?id=1191585 +Conflicts: pipewire-libjack-0_3 #Doesn't build for 32 bit anymore ExcludeArch: i586 @@ -131,7 +134,46 @@ export PKG_CONFIG_PATH="`echo $PWD`:%{_libdir}/pkgconfig" fi export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)" export CXXFLAGS="$CFLAGS -std=gnu++11" +%if 1 == 1 %cmake \ +%else + find . -name CMakeLists.txt \ + -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\)/{s/^/#IGNORE /}' {} + + mkdir -p build + cd build + /usr/bin/cmake $OLDPWD/. \ +%if "/usr/bin/make" == "/usr/bin/make" + -G"Unix Makefiles" \ +%else + -GNinja \ +%endif + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DINCLUDE_INSTALL_DIR:PATH=/usr/include \ + -DLIB_INSTALL_DIR:PATH=/usr/lib64 \ + -DSYSCONF_INSTALL_DIR:PATH=/etc \ + -DSHARE_INSTALL_PREFIX:PATH=/usr/share \ + -DCMAKE_INSTALL_LIBDIR:PATH=lib64 \ + -DCMAKE_INSTALL_LIBEXECDIR=/usr/libexec \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_C_FLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables} -DDEBUG" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables} -DDEBUG" \ + -DCMAKE_Fortran_FLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables} -DDEBUG" \ + -DCMAKE_EXE_LINKER_FLAGS=" -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS=" -Wl,--as-needed" \ + -DCMAKE_SHARED_LINKER_FLAGS=" -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ +%if "lib64" == "lib64" + -DLIB_SUFFIX=64 \ +%endif + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING="Debug" \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_STATIC_LIBS:BOOL=OFF \ + -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \ + -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \ + -DCMAKE_MODULES_INSTALL_DIR=/usr/lib64/cmake/%{name} \ +%endif -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(wx-config --libs)" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(wx-config --libs)" \ -Daudacity_conan_enabled=Off \