diff --git a/0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch b/0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch deleted file mode 100644 index 9fe92c8..0000000 --- a/0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 342c4b588f2f069a2df2157ac166237a54277b3a Mon Sep 17 00:00:00 2001 -From: Ian McInerney -Date: Fri, 8 Apr 2022 01:27:52 +0100 -Subject: [PATCH] Call the proper wxBitmap constructor for XPM data - -wxBitmap back to at least 3.0.0 did not have a constructor for an XPM -image that took a size parameter, it would only take the XPM data -itself. - -I don't know how this compiled until now, but it doesn't anymore when -the size is included and built against wx 3.1.6 in Fedora. ---- - src/MixerBoard.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp -index 54b5f146c..7fe816154 100644 ---- a/src/MixerBoard.cpp -+++ b/src/MixerBoard.cpp -@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments() - wxMemoryDC dc; - - for (const auto &data : table) { -- auto bmp = std::make_unique(data.bitmap,24); -+ auto bmp = std::make_unique(data.bitmap); - dc.SelectObject(*bmp); - AColor::Bevel(dc, false, bev); - mMusicalInstruments.push_back(std::make_unique( --- -2.34.1 - diff --git a/0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch b/0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch deleted file mode 100644 index 84afacb..0000000 --- a/0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch +++ /dev/null @@ -1,44 +0,0 @@ -From efc11c4ac50ac51cd71d4dcfa84e63b11000c3f5 Mon Sep 17 00:00:00 2001 -From: Ian McInerney -Date: Fri, 8 Apr 2022 01:08:12 +0100 -Subject: [PATCH] Remove custom languages in wx 3.1.6 and above - -Basque was added as a language with identifier "eu" into wx 3.1.6, so -there is no more need to provide custom languages. Additionally, this -struct changed formatting in 3.1.6, meaning it threw a compile error -when included (so it would have to be fixed if still needed). ---- - src/AudacityApp.cpp | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp -index d6e2576bf..e3979249c 100644 ---- a/src/AudacityApp.cpp -+++ b/src/AudacityApp.cpp -@@ -992,12 +992,10 @@ void AudacityApp::OnTimer(wxTimerEvent& WXUNUSED(event)) - #define WL(lang,sublang) - #endif - --#if wxCHECK_VERSION(3, 0, 1) -+#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) - wxLanguageInfo userLangs[] = - { -- // Bosnian is defined in wxWidgets already --// { wxLANGUAGE_USER_DEFINED, wxT("bs"), WL(0, SUBLANG_DEFAULT) wxT("Bosnian"), wxLayout_LeftToRight }, -- -+ // Included upstream in version 3.1.6 - { wxLANGUAGE_USER_DEFINED, wxT("eu"), WL(0, SUBLANG_DEFAULT) wxT("Basque"), wxLayout_LeftToRight }, - }; - #endif -@@ -1332,7 +1330,7 @@ bool AudacityApp::OnInit() - // - // TODO: The whole Language initialization really need to be reworked. - // It's all over the place. --#if wxCHECK_VERSION(3, 0, 1) -+#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) - for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++) - { - wxLocale::AddLanguage(userLangs[i]); --- -2.34.1 - diff --git a/Audacity-3.1.3.tar.gz b/Audacity-3.1.3.tar.gz deleted file mode 100644 index bbbc48c..0000000 --- a/Audacity-3.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07aed333a20b8df381d5c0a167840883fff8ef65f5e5f71e654c0925d6c60de8 -size 56500219 diff --git a/Audacity-3.2.1.tar.gz b/Audacity-3.2.1.tar.gz new file mode 100644 index 0000000..cd35bf1 --- /dev/null +++ b/Audacity-3.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbded508d26dba809bbacc5d16da35f89a8ee32ba8622c0555e0577130eac609 +size 56971920 diff --git a/_service b/_service new file mode 100644 index 0000000..a324934 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/steinbergmedia/vst3sdk/ + v3.7.6_build_18 + 3.7.6_build_18 + enable + vst3sdk + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..524e0aa --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/steinbergmedia/vst3sdk/ + 05c4a9763f311a58fe3f34b68a199e5eea92e2b4 \ No newline at end of file diff --git a/audacity-no_buildstamp.patch b/audacity-no_buildstamp.patch index 29b1847..074d871 100644 --- a/audacity-no_buildstamp.patch +++ b/audacity-no_buildstamp.patch @@ -1,8 +1,8 @@ -Index: audacity-Audacity-3.1.3-beta-1/src/AboutDialog.cpp -=================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/src/AboutDialog.cpp -+++ audacity-Audacity-3.1.3-beta-1/src/AboutDialog.cpp -@@ -71,7 +71,7 @@ hold information about one contributor t +diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp +index 2f42df1..2147892 100644 +--- a/src/AboutDialog.cpp ++++ b/src/AboutDialog.cpp +@@ -66,7 +66,7 @@ hold information about one contributor to Audacity. #endif #ifdef REV_LONG @@ -11,7 +11,7 @@ Index: audacity-Audacity-3.1.3-beta-1/src/AboutDialog.cpp #else #define REV_IDENT (XO("No revision identifier was provided").Translation()) #endif -@@ -598,8 +598,8 @@ void AboutDialog::PopulateInformationPag +@@ -536,8 +536,8 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S ) << XO("The Build") << wxT("\n"); // start build info table diff --git a/audacity-no_return_in_nonvoid.patch b/audacity-no_return_in_nonvoid.patch index 377c7ca..f40f3a8 100644 --- a/audacity-no_return_in_nonvoid.patch +++ b/audacity-no_return_in_nonvoid.patch @@ -1,19 +1,19 @@ -Index: audacity-Audacity-3.1.3-beta-1/src/widgets/NumericTextCtrl.cpp -=================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/src/widgets/NumericTextCtrl.cpp -+++ audacity-Audacity-3.1.3-beta-1/src/widgets/NumericTextCtrl.cpp -@@ -679,6 +679,7 @@ static const BuiltinFormatString Bandwid - case NumericConverter::BANDWIDTH: - return WXSIZEOF(BandwidthConverterFormats_); - } -+ return WXSIZEOF(BandwidthConverterFormats_); - } +diff --git a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c +index 8c1c7b5..e05c28d 100644 +--- a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c ++++ b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c +@@ -600,6 +600,7 @@ double pv_get_effective_pos(Phase_vocoder x) + return -(pv->ratio * pv->fftsize / 2.0); + } // I can't think of any other case. + assert(FALSE); ++ return(0); } -Index: audacity-Audacity-3.1.3-beta-1/lib-src/libnyquist/nyquist/xlisp/xlbfun.c -=================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/lib-src/libnyquist/nyquist/xlisp/xlbfun.c -+++ audacity-Audacity-3.1.3-beta-1/lib-src/libnyquist/nyquist/xlisp/xlbfun.c + +diff --git a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c +index 37ab604..f434a67 100644 +--- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c ++++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c @@ -603,7 +603,10 @@ LVAL xcleanup(void) { xllastarg(); @@ -26,11 +26,11 @@ Index: audacity-Audacity-3.1.3-beta-1/lib-src/libnyquist/nyquist/xlisp/xlbfun.c } /* xtoplevel - special form 'top-level' */ -Index: audacity-Audacity-3.1.3-beta-1/lib-src/portsmf/allegro.cpp -=================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/lib-src/portsmf/allegro.cpp -+++ audacity-Audacity-3.1.3-beta-1/lib-src/portsmf/allegro.cpp -@@ -2905,6 +2905,9 @@ Alg_event_ptr &Alg_seq::operator[](int i +diff --git a/lib-src/portsmf/allegro.cpp b/lib-src/portsmf/allegro.cpp +index a87117e..d471785 100644 +--- a/lib-src/portsmf/allegro.cpp ++++ b/lib-src/portsmf/allegro.cpp +@@ -2905,6 +2905,9 @@ Alg_event_ptr &Alg_seq::operator[](int i) tr++; } assert(false); // out of bounds @@ -40,15 +40,15 @@ Index: audacity-Audacity-3.1.3-beta-1/lib-src/portsmf/allegro.cpp } #pragma warning(default: 4715) -Index: audacity-Audacity-3.1.3-beta-1/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c -=================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c -+++ audacity-Audacity-3.1.3-beta-1/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c -@@ -600,6 +600,7 @@ double pv_get_effective_pos(Phase_vocode - return -(pv->ratio * pv->fftsize / 2.0); - } // I can't think of any other case. - assert(FALSE); -+ return(0); +diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp +index 9bd57e2..0e46c96 100644 +--- a/src/widgets/NumericTextCtrl.cpp ++++ b/src/widgets/NumericTextCtrl.cpp +@@ -679,6 +679,7 @@ static const BuiltinFormatString BandwidthConverterFormats_[] = { + case NumericConverter::BANDWIDTH: + return WXSIZEOF(BandwidthConverterFormats_); + } ++ return WXSIZEOF(BandwidthConverterFormats_); + } } - diff --git a/audacity-rpmlintrc b/audacity-rpmlintrc index a317fca..f2861ea 100644 --- a/audacity-rpmlintrc +++ b/audacity-rpmlintrc @@ -1 +1,2 @@ -addFilter("audacity.* desktopfile-without-binary") +addFilter("lib-theme.* branding-requires-unversioned") +addFilter("lib-theme-resources.* branding-requires-specific-flavor") diff --git a/audacity.changes b/audacity.changes index 60ee415..7e85f64 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,4 +1,135 @@ ------------------------------------------------------------------- +Sun Oct 16 08:48:46 UTC 2022 - Konstantin Voinov + +- No more bundled custom wxWidgets, so remove them from the .spec completely + +------------------------------------------------------------------- +Fri Oct 14 03:10:15 UTC 2022 - Konstantin Voinov + +- Fix build for Leap 15.3 + +------------------------------------------------------------------- +Tue Oct 11 13:05:37 UTC 2022 - Konstantin Voinov + +- update spec, install audacity libs into _libdir/audacity +- update build deps - no need for carla +- don't create lame.pc +- use %cmake_build + +------------------------------------------------------------------- +Fri Oct 7 05:23:17 UTC 2022 - Konstantin Voinov + +- add patch: + mod-script-pipe-disable-rpath.patch +- update audacity-rpmlintrc + +------------------------------------------------------------------- +Fri Oct 7 03:02:49 UTC 2022 - Konstantin Voinov + +- remove patches, now upstream: + 0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch + 0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch + missing-include.patch +- refresh patches: + audacity-no_buildstamp.patch + audacity-no_return_in_nonvoid.patch + no-more-strip.patch +- update licenses + +- Update to 3.2.1 +Changes in version 3.2.1 + + This is a patch release. It fixes some bugs and has minor improvements. + + * #3686 Fixed Audacity crashing on startup on some systems. + * #3694 Fixed a crash when applying Waves Berzerk Distortion + Mono to a mono track + * #3699 Fixed a freeze when very quickly starting and stopping + playback. + * #3747 macOS: Homebrew FFmpeg installs are now found automatically + * #3594 macOS: Fixed Melda VST Plugin UI + * #3474 Building with VST3 support is now possible without Conan. + +Changes in version 3.2.0 + + This version adds realtime effects and VST3. + + Prominent changes + * Added a new Effects button to the tracks menu, allowing you to + place realtime effects. + Further information can be found can be found on + https://support.audacityteam.org/audio-editing/using-realtime-effects + * Merged the mixer bar with the meter bars. + * Added a new Audio Setup button, replacing the Device Toolbar + by default. The device toolbar can be re-added via the + View > Toolbars menu. + * The Effects menu has gotten a new sorting. Other sorting and + grouping options can be found in the Effects preferences. + * Updated the icons. + * Added a quick audio sharing feature. + More info can be found on https://support.audacityteam.org/basics/sharing-audio-online + + Plugin changes + You can find plugins on https://plugins.audacityteam.org + * VST3 effects are now supported. + * The following plugin formats are now realtime capable: + VST3, LV2, LADSPA, Audio Units. + * Plugins now automatically get scanned, tested and enabled + when Audacity starts. + + System changes + * Apple Silicon (arm64) is now supported on macOS + Note: When using an arm64 Audacity, you must use arm64 + versions of FFMPEG and plugins. Plugins for x86-64 (Intel macs) will not load. + For the time being, Audacity will continue to download + x86-64 versions by default to avoid these incompatibilities, + but you can download an arm64 version from Github releases: + https://github.com/audacity/audacity/releases + * FFMPEG 5.0 (avformat 59) is now supported, in addition to + avformat 55, 57 and 58 + * Added support for Wavpack + * On Linux, Audacity can now be compiled without JACK present. + * Audacity now uses XDG directories on Linux. + Note: If you are upgrading from a previous version, + Audacity will keep using the ~/.audacity-data and ~/.audacity folders until you delete them. + * Switched from mad to mpg123 as MP3 importer + + License update + * Audacity binaries are now licensed under the + GNU General Public License, Version 3. + Most code files remain GPLv2-or-later, but VST3 + support required this license update. + More information can be found in the announcement + post: https://github.com/audacity/audacity/discussions/2142 + + Removals + * Removed the Zoom Tool. You can use the zoom buttons + or Ctrl+Scroll (macOS: Cmd+Scroll) to zoom instead. + * The Audacity Manual HTML pages are no longer included + in the installation. + If you require offline access of the manual, you can download + it here: https://github.com/audacity/audacity-manual/releases + You also can download PDFs of https://support.audacityteam.org + straight from its sidebar (or the three-dot button on mobile devices). + + + Fixed bugs: + * #3079 Fixed Audacity sometimes not being able to import MP3 + files (or reporting Huffman Data Overruns) + * #2590 Fixed rare data loss bug when placing labels during recording + * #2272 Fixed clip titles being able to disappear off-screen when editing them + * #2162 Fixed Punch and Roll not paying tracks in sync + * #1889 Fixed clip titles changing name when applying some effects + * #1624 During batch processing, Audacity will no longer stop to ask + for a sample rate when an unsupported one is chosen, but choose the + nearest supported one instead. + * #2265 Fixed mod-script-pipe not being installed on Linux + * #3571 Fixed GTK packaging in Appimages. This fixes various issues with + icons, dropdowns and similar things not appearing properly. + * #3634 Improved M4A/AAC support. Previously the target bitrate was + not honored at all, now it can be set between 98 and 160 kbit/s (mono) + or 196 and 320 kbit/s (stereo). The UI does not yet reflect these limits. +------------------------------------------------------------------- Sun Jun 26 11:47:35 UTC 2022 - Berthold Gunreben - #error All sample block data is little endian...big endian not yet supported diff --git a/audacity.spec b/audacity.spec index 47fb740..6c9b23f 100644 --- a/audacity.spec +++ b/audacity.spec @@ -17,33 +17,27 @@ Name: audacity -Version: 3.1.3 +Version: 3.2.1 Release: 0 -%define pkg_version 3.1.3 +%define pkg_version 3.2.1 Summary: A Multi Track Digital Audio Editor -License: GPL-2.0-or-later +License: CC-BY-3.0 AND GPL-2.0-or-later AND GPL-3.0-only Group: Productivity/Multimedia/Sound/Utilities URL: http://audacityteam.org/ -# https://github.com/audacity/audacity/archive/refs/tags/Audacity-3.0.4.tar.gz Source: https://github.com/audacity/audacity/archive/Audacity-%{pkg_version}.tar.gz -#Source: https://www.fosshub.com/Audacity.html/%%{name}-minsrc-%%{version}.tar.xz Source1: audacity-license-nyquist Source2: audacity-rpmlintrc +Source3: vst3sdk-3.7.6_build_18.tar.xz # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp. Patch0: audacity-no_buildstamp.patch # PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch - Fix false positive errors Two new gcc10 ones ignoring assert Patch1: audacity-no_return_in_nonvoid.patch -Patch2: missing-include.patch +Patch2: mod-script-pipe-disable-rpath.patch Patch3: no-more-strip.patch -Patch4: 0001-Remove-custom-languages-in-wx-3.1.6-and-above.patch -Patch5: 0001-Call-the-proper-wxBitmap-constructor-for-XPM-data.patch BuildRequires: cmake >= 3.16 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ #!BuildIgnore: gstreamer-0_10-plugins-base -%ifarch x86_64 -BuildRequires: carla-devel -%endif BuildRequires: hicolor-icon-theme BuildRequires: libmp3lame-devel BuildRequires: portmidi-devel @@ -54,11 +48,13 @@ BuildRequires: pkgconfig(flac) >= 1.3.1 BuildRequires: pkgconfig(flac++) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(id3tag) +BuildRequires: pkgconfig(id3tag) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libavcodec) >= 51.53 BuildRequires: pkgconfig(libavformat) >= 52.12 BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libmpg123) BuildRequires: pkgconfig(lilv-0) >= 0.24.6 BuildRequires: pkgconfig(lv2) >= 1.16.0 BuildRequires: pkgconfig(mad) @@ -80,6 +76,7 @@ BuildRequires: pkgconfig(vamp-hostsdk) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) +BuildRequires: pkgconfig(wavpack) # WARNING lilv-0 >= 0.24.6;lv2 >= 1.16.0;serd-0 >= 0.30.2;sord-0 >= 0.16.4;sratom-0 >= 0.6.4;suil-0 >= 0.10.6 # check these versions after every update otherwise audacity builds libsuil itself. @@ -114,27 +111,15 @@ physical memory size can be edited. cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/ -# Audacity's cmake can't find libmp3lame without a .pc file -# This is a temporary workaround. -if ! test -e %{_libdir}/pkgconfig/lame.pc -then -echo "creating lame.pc" -cat << EOF > lame.pc -prefix=%{_prefix} -libdir=%{_libdir} -includedir=%{_includedir}/lame - -Name: mp3lame -Description: encoder that converts audio to the MP3 file format. -Version: 3.100 -Libs: -L${libdir} -lmp3lame -Cflags: -I${includedir} -EOF -fi #Included in src/AboutDialog.cpp but not supplied touch include/RevisionIdent.h +# Disable VST3 for Leap 15.3 due an old cmake +%if 0%{?sle_version} != 150300 && 0%{?is_opensuse} +tar xf %{SOURCE3} --strip-components=1 --one-top-level=vst3sdk +%endif + %build if ! test -e %{_libdir}/pkgconfig/lame.pc then @@ -142,25 +127,31 @@ export PKG_CONFIG_PATH="`echo $PWD`:%{_libdir}/pkgconfig" fi export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)" export CXXFLAGS="$CFLAGS -std=gnu++17" -%cmake \ - -DCMAKE_SKIP_RPATH:BOOL=on \ + +%cmake \ -DAUDACITY_REV_TIME=$(date -u -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%dT%H:%M:%SZ") \ -DAUDACITY_REV_LONG=STRING:%{version} \ - -DAUDACITY_BUILD_LEVEL=1 \ + -DAUDACITY_BUILD_LEVEL=2 \ -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(wx-config --libs)" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(wx-config --libs)" \ -Daudacity_conan_enabled=Off \ -Daudacity_has_networking:BOOL=Off \ -Daudacity_lib_preference:STRING=system \ -Duse_lame:STRING=system \ +%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} + -Daudacity_has_vst3=off \ +%endif -Daudacity_use_ffmpeg:STRING=loaded -make %{?_smp_mflags} +# Workaround for an old cmake in Leap 15.3 +%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} +export LD_LIBRARY_PATH=%{_builddir}/%{name}-Audacity-%{pkg_version}/build/utils/ +%endif + +%cmake_build %install %cmake_install -mkdir -p %{buildroot}%{_libdir}/%{name} -find %{buildroot}%{_datadir} -name "*.so" -print -exec mv {} %{buildroot}%{_libdir}/%{name}/ \; # E-mail wrote to feedback@audacityteam.org. mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/ @@ -168,29 +159,22 @@ mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project. %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm rm -rf %{buildroot}%{_datadir}/pixmaps/ rm -rf %{buildroot}%{_datadir}/doc -mv -v %{buildroot}%{_libdir}/%{name}/*so %{buildroot}%{_libdir}/ -chmod 0755 %{buildroot}%{_libdir}/* -# Why make install installs these is a mystery -rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu-suse-nostl.so.* -rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu_net-suse-nostl.so.* -rm -f %{buildroot}%{_libdir}/audacity/libwx_baseu_xml-suse-nostl.so.* -rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_core-suse-nostl.so.* -rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_html-suse-nostl.so.* -rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_qa-suse-nostl.so.* -rm -f %{buildroot}%{_prefix}/%{name} %find_lang %{name} -%post -p /sbin/ldconfig +%post +ldconfig %{_libdir}/%{name} +%end -%postun -p /sbin/ldconfig +%postun +ldconfig %{_libdir}/%{name} +%end %files %defattr(-,root,root) %doc README.txt %license LICENSE.txt LICENSE_NYQUIST.txt %{_bindir}/%{name} -%{_libdir}/*.so %{_libdir}/%{name} %{_libdir}/%{name}/modules/mod-script-pipe.so %{_datadir}/%{name}/ diff --git a/missing-include.patch b/missing-include.patch deleted file mode 100644 index e7fb456..0000000 --- a/missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: b/libraries/lib-utility/BufferedStreamReader.h -=================================================================== ---- a/libraries/lib-utility/BufferedStreamReader.h 2021-12-22 17:35:36.000000000 +0200 -+++ b/libraries/lib-utility/BufferedStreamReader.h 2022-04-14 09:56:19.275619728 +0200 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - - /*! -Index: b/libraries/lib-xml/XMLAttributeValueView.cpp -=================================================================== ---- a/libraries/lib-xml/XMLAttributeValueView.cpp 2021-12-22 17:35:36.000000000 +0200 -+++ b/libraries/lib-xml/XMLAttributeValueView.cpp 2022-04-14 09:56:19.275619728 +0200 -@@ -12,6 +12,7 @@ - #include "FromChars.h" - - #include -+#include - - XMLAttributeValueView::XMLAttributeValueView(bool value) noexcept - : mInteger(value) diff --git a/mod-script-pipe-disable-rpath.patch b/mod-script-pipe-disable-rpath.patch new file mode 100644 index 0000000..9e3009f --- /dev/null +++ b/mod-script-pipe-disable-rpath.patch @@ -0,0 +1,9 @@ +diff --git a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt +index 5ee1862..feeb7b8 100644 +--- a/modules/mod-script-pipe/CMakeLists.txt ++++ b/modules/mod-script-pipe/CMakeLists.txt +@@ -1,3 +1,4 @@ ++set(CMAKE_SKIP_BUILD_RPATH ON) + set( SOURCES + PipeServer.cpp + ScripterCallback.cpp diff --git a/no-more-strip.patch b/no-more-strip.patch index c10fdb6..0ecce4e 100644 --- a/no-more-strip.patch +++ b/no-more-strip.patch @@ -1,8 +1,8 @@ -Index: audacity-Audacity-3.1.3-beta-1/cmake-proxies/cmake-modules/AudacityFunctions.cmake -=================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/cmake-proxies/cmake-modules/AudacityFunctions.cmake -+++ audacity-Audacity-3.1.3-beta-1/cmake-proxies/cmake-modules/AudacityFunctions.cmake -@@ -440,13 +440,13 @@ function( audacity_module_fn NAME SOURCE +diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake +index 47682eb..8f63837 100644 +--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake ++++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake +@@ -469,13 +469,13 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS target_link_options( ${TARGET} PRIVATE ${LOPTS} ) target_link_libraries( ${TARGET} PUBLIC ${LIBRARIES} ) @@ -13,13 +13,13 @@ Index: audacity-Audacity-3.1.3-beta-1/cmake-proxies/cmake-modules/AudacityFuncti - COMMAND $,echo,strip> -x $ - ) - endif() -+ # if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" ) -+ # add_custom_command( -+ # TARGET "${TARGET}" -+ # POST_BUILD -+ # COMMAND $,echo,strip> -x $ -+ # ) -+ # endif() ++ # if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" ) ++ # add_custom_command( ++ # TARGET "${TARGET}" ++ # POST_BUILD ++ # COMMAND $,echo,strip> -x $ ++ # ) ++ # endif() if( NOT REAL_LIBTYPE STREQUAL "MODULE" ) if( CMAKE_SYSTEM_NAME MATCHES "Windows" ) diff --git a/vst3sdk-3.7.6_build_18.tar.xz b/vst3sdk-3.7.6_build_18.tar.xz new file mode 100644 index 0000000..a9733ff --- /dev/null +++ b/vst3sdk-3.7.6_build_18.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3bf618a3884a39c95def7f4a52fc437f4b219174231986c4669f935e33c363e +size 40298328