diff --git a/audacity-3.0.2-gcc-11.1.0.patch b/audacity-3.0.2-gcc-11.1.0.patch new file mode 100644 index 0000000..97b8d2c --- /dev/null +++ b/audacity-3.0.2-gcc-11.1.0.patch @@ -0,0 +1,10 @@ +--- audacity-3.0.2/include/audacity/Types.h.orig 2021-07-10 17:02:26.434549605 +0200 ++++ audacity-3.0.2/include/audacity/Types.h 2021-07-10 17:02:44.820883759 +0200 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include // for wxASSERT + #include // type used in inline function and member variable + diff --git a/audacity.spec b/audacity.spec index d1efa10..2388bff 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,13 +1,13 @@ Name: audacity Version: 3.0.2 -Release: 1mamba +Release: 2mamba Epoch: 1 Summary: A free audio editor Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: https://audacity.sourceforge.net +URL: https://www.audacityteam.org/ Source: https://github.com/audacity/audacity.git/Audacity-%{version}/audacity-%{version}.tar.bz2 #Source: http://www.fosshub.com/Audacity.html/audacity-minsrc-%{version}.tar.xz #Source: http://sourceforge.net/projects/audacity/files/audacity-minsrc-%{version}.tar.xz @@ -20,6 +20,7 @@ Patch3: audacity-1.3.12-playback_underrun.patch Patch4: audacity-2.1.2-ffmpeg-3.0.patch Patch5: audacity-2.1.2-gcc-6.1.0.patch Patch6: audacity-2.4.2-x86-sse-build-fix.patch +Patch7: audacity-3.0.2-gcc-11.1.0.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -44,7 +45,6 @@ BuildRequires: libsndfile-devel BuildRequires: libsord-devel BuildRequires: libsoundtouch-devel BuildRequires: libsoxr-devel -BuildRequires: libsqlite-devel BuildRequires: libsratom-devel BuildRequires: libstdc++6-devel BuildRequires: libsuil-devel @@ -56,8 +56,8 @@ BuildRequires: libwx_gtk3u-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: libsoundtouch-devel >= 1.9.2-1mamba -BuildRequires: libwx_baseu-devel >= 3.1.3 -BuildRequires: libwx_gtk3u-devel >= 3.1.3 +BuildRequires: libwx_baseu-devel >= 3.1.5 +BuildRequires: libwx_gtk3u-devel >= 3.1.5 BuildRequires: liblrdf-devel BuildRequires: libraptor-devel BuildRequires: librdf-devel @@ -77,47 +77,37 @@ Built-in effects include Bass Boost, Wahwah, and Noise Removal, and it also supp %setup -q #-D -T #:<< _EOF +%global __provides_exclude_from ^%{_libdir}/audacity/.*$ + #%ifarch %{ix86} #%patch6 -p1 #%endif -%global __provides_exclude_from ^%{_libdir}/audacity/.*$ +%patch7 -p1 -#cd lib-src/portmixer -#autoreconf -#cd ../.. +# Disable check for wxWidget audacity fork +sed -i "s|NOT ours|0|" cmake-proxies/wxWidgets/CMakeLists.txt %build #:<< _EOF %cmake -d build \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-unicode-3 - -##export WX_CONFIG=/usr/bin/wx-config-unicode -# -#WX_CONFIG=wx-config-unicode-3 ./configure \ -# --with-wx-version=3.1 \ -# --prefix=%{_prefix} \ -# --mandir=%{_mandir} \ -# --with-libsndfile="system" \ -# --with-ffmpeg="system" \ -# --with-expat="system" \ -# --with-lame="system" \ -# --with-libsoxr="system" \ -# --with-portaudio \ -# --with-portmidi \ -# --with-libflac \ -# --with-libid3tag \ -# --with-libsamplerate \ -# --with-sbsms \ -# --with-soundtouch \ -# --with-libtwolame \ -# --with-libvorbis \ -# --with-lv2 \ -#%ifnarch %{ix86} x86_64 -# --disable-sse \ -#%endif -#%ifarch arm -# LDFLAGS="-latomic -lavutil" -#%endif + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-unicode-3 \ + -Daudacity_use_sqlite=local \ + -Daudacity_use_sndfile=system \ + -Daudacity_use_soxr=system \ + -Daudacity_use_lame=system \ + -Daudacity_use_twolame=system \ + -Daudacity_use_flac=system \ + -Daudacity_use_ladspa=on \ + -Daudacity_use_vorbis=system \ + -Daudacity_use_id3tag=system \ + -Daudacity_use_expat=system \ + -Daudacity_use_soundtouch=system \ + -Daudacity_use_vamp=system \ + -Daudacity_use_lv2=system \ + -Daudacity_use_portaudio=local \ + -Daudacity_use_midi=system \ + -Daudacity_use_ogg=system \ + -Daudacity_use_ffmpeg=loaded %make @@ -155,6 +145,9 @@ rm -rf %{buildroot}%{_libdir}/audacity* %{_mandir}/man1/* %changelog +* Sat Jul 10 2021 Silvan Calarco 3.0.2-2mamba +- rebuilt with official wxWidgets 3.1.5 + * Tue Apr 20 2021 Automatic Build System 3.0.2-1mamba - automatic version update by autodist