From 66189dbbfcadbe8351841db54a4d8e9ef5a6a0ca75b990f7ca0998b4df8f82df Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 21 Aug 2020 09:15:31 +0000 Subject: [PATCH 1/4] Accepting request 828432 from home:plater - Create symlink for libavformat, audacity looks for the major version only and this no longer exists in openSUSE after ffmpeg-4.3.1. See boo#1175205 OBS-URL: https://build.opensuse.org/request/show/828432 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=152 --- audacity.changes | 7 +++++++ audacity.spec | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/audacity.changes b/audacity.changes index f60bac8..b4fdedd 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 20 13:28:49 UTC 2020 - Dave Plater + +- Create symlink for libavformat, audacity looks for the major + version only and this no longer exists in openSUSE after + ffmpeg-4.3.1. See boo#1175205 + ------------------------------------------------------------------- Sun Jul 5 13:07:34 UTC 2020 - Markus Reckwerth diff --git a/audacity.spec b/audacity.spec index 4e43119..61fe748 100644 --- a/audacity.spec +++ b/audacity.spec @@ -16,6 +16,10 @@ # +%define avfmtmaj %(pkg-config --modversion libavformat|cut -d . -f 1) +%define avfmtvers %(pkg-config --modversion libavformat) +%define avfmtversion %(pkg-config --modversion libavformat|tr -d .) + Name: audacity Version: 2.4.2 Release: 0 @@ -146,12 +150,24 @@ mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project. rm -rf %{buildroot}%{_datadir}/pixmaps/ rm -rf %{buildroot}%{_datadir}/doc cp -v lib-src/portmixer/LICENSE.txt portmixer.LICENSE.txt + +# Audacity looks for the major version of libavformat but the symlink no longer exists +# in openSUSE after version 58.45.100 +%if %{avfmtversion} >= 5845100 +pushd %{buildroot}%{_libdir} +ln -s %{_libdir}/libavformat.so.%{avfmtvers} libavformat.so.%{avfmtmaj} +popd +%endif + %find_lang %{name} %files plugins %license LICENSE.txt %dir %{_libdir}/%{name} %{_libdir}/%{name}/suil*.so +%if %{avfmtversion} >= 5845100 +%{_libdir}/libavformat.so.%{avfmtmaj} +%endif %files %defattr(-,root,root) From e2dcc41477f751daa1b6328cf58fa73d0ec1556097f6f3ca2ccdbb2aa76bf6e8 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 22 Aug 2020 09:01:51 +0000 Subject: [PATCH 2/4] Accepting request 828645 from home:plater Fix build with updated libsuil-0-0 OBS-URL: https://build.opensuse.org/request/show/828645 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=153 --- audacity.spec | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/audacity.spec b/audacity.spec index 61fe748..5fe0462 100644 --- a/audacity.spec +++ b/audacity.spec @@ -58,27 +58,34 @@ BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libavcodec) >= 51.53 BuildRequires: pkgconfig(libavformat) >= 52.12 BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(lilv-0) >= 0.16 -BuildRequires: pkgconfig(lv2) +BuildRequires: pkgconfig(lilv-0) >= 0.24.6 +BuildRequires: pkgconfig(lv2) >= 1.16.0 BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(serd-0) >= 0.30.2 BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(sord-0) >= 0.16.4 BuildRequires: pkgconfig(soundtouch) BuildRequires: pkgconfig(soxr) -BuildRequires: pkgconfig(suil-0) >= 0.8.2 +BuildRequires: pkgconfig(sratom-0) >= 0.6.4 +BuildRequires: pkgconfig(suil-0) >= 0.10.6 BuildRequires: pkgconfig(twolame) BuildRequires: pkgconfig(vamp-hostsdk) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) +# 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. # This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. #BuildRequires: portaudio-devel Recommends: %{name}-lang -# WARNING Nothing provides libavutil without a suffix -Requires: %{name}-plugins = %{version} +# Nothing provides libavutil without a suffix Requires: ffmpeg Requires: libmp3lame0 +%if %{avfmtversion} >= 5845100 +Requires: %{name}-plugins +%endif #Doesn't build for 32 bit anymore ExcludeArch: i586 @@ -91,14 +98,15 @@ physical memory size can be edited. %lang_package +%if %{avfmtversion} >= 5845100 %package plugins Summary: Enhancments for Audacity Group: Productivity/Multimedia/Sound Requires: %{name} = %{version} %description plugins -This package contains extra plugins for audacity. - +This package contains libavformat link for audacity. +%endif %prep %setup -q -n %{name}-Audacity-%{version} @@ -154,6 +162,7 @@ cp -v lib-src/portmixer/LICENSE.txt portmixer.LICENSE.txt # Audacity looks for the major version of libavformat but the symlink no longer exists # in openSUSE after version 58.45.100 %if %{avfmtversion} >= 5845100 +mkdir -p %{buildroot}%{_libdir} pushd %{buildroot}%{_libdir} ln -s %{_libdir}/libavformat.so.%{avfmtvers} libavformat.so.%{avfmtmaj} popd @@ -161,11 +170,8 @@ popd %find_lang %{name} -%files plugins -%license LICENSE.txt -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/suil*.so %if %{avfmtversion} >= 5845100 +%files plugins %{_libdir}/libavformat.so.%{avfmtmaj} %endif From 44d219563139ab2bf363ef3d7296bd0b42786b42e0f6d9804046388f66898bc3 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 27 Aug 2020 05:33:35 +0000 Subject: [PATCH 3/4] Accepting request 829805 from home:michel_mno:branches:multimedia:apps - Add _constraints for min 6GB physicalymemory for ppc64/ppc64le OBS-URL: https://build.opensuse.org/request/show/829805 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=154 --- _constraints | 14 ++++++++++++++ audacity.changes | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 _constraints diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..ea93d73 --- /dev/null +++ b/_constraints @@ -0,0 +1,14 @@ + + + + ppc64 + ppc64le + + + + 6 + + + + + diff --git a/audacity.changes b/audacity.changes index b4fdedd..37d6969 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 26 15:25:22 UTC 2020 - Michel Normand + +- Add _constraints for min 6GB physicalymemory for ppc64/ppc64le + ------------------------------------------------------------------- Thu Aug 20 13:28:49 UTC 2020 - Dave Plater From 0dabb47bd9651f7512f5f1b1b5516a9bf951e9d900e3d4ec90c32f0e16ee0c94 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 30 Aug 2020 09:59:29 +0000 Subject: [PATCH 4/4] Accepting request 830586 from home:plater - Remove libavformat symlink and remove the plugins sub package. The symlink is obsoleted by linking to ffmpeg rather than dlopening it. The plugins were caused by the wrong suil version. - Add _constraints for min 6GB physicalymemory for ppc64/ppc64le - Link to ffmpeg rather than dlopening it. OBS-URL: https://build.opensuse.org/request/show/830586 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=155 --- audacity.changes | 12 ++++++++++++ audacity.spec | 41 +++++++++-------------------------------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/audacity.changes b/audacity.changes index 37d6969..3d57a27 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,8 +1,20 @@ +------------------------------------------------------------------- +Sat Aug 29 07:15:45 UTC 2020 - Dave Plater + +- Remove libavformat symlink and remove the plugins sub package. + The symlink is obsoleted by linking to ffmpeg rather than + dlopening it. The plugins were caused by the wrong suil version. + ------------------------------------------------------------------- Wed Aug 26 15:25:22 UTC 2020 - Michel Normand - Add _constraints for min 6GB physicalymemory for ppc64/ppc64le +------------------------------------------------------------------- +Wed Aug 26 12:45:48 UTC 2020 - Jan Engelhardt + +- Link to ffmpeg rather than dlopening it. + ------------------------------------------------------------------- Thu Aug 20 13:28:49 UTC 2020 - Dave Plater diff --git a/audacity.spec b/audacity.spec index 5fe0462..87e22d6 100644 --- a/audacity.spec +++ b/audacity.spec @@ -16,10 +16,6 @@ # -%define avfmtmaj %(pkg-config --modversion libavformat|cut -d . -f 1) -%define avfmtvers %(pkg-config --modversion libavformat) -%define avfmtversion %(pkg-config --modversion libavformat|tr -d .) - Name: audacity Version: 2.4.2 Release: 0 @@ -77,15 +73,15 @@ BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) # 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. + # This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. #BuildRequires: portaudio-devel Recommends: %{name}-lang # Nothing provides libavutil without a suffix Requires: ffmpeg Requires: libmp3lame0 -%if %{avfmtversion} >= 5845100 -Requires: %{name}-plugins -%endif +Provides: %{name}-plugins = %{version} +Obsoletes: %{name}-plugins <= 2.4.2 #Doesn't build for 32 bit anymore ExcludeArch: i586 @@ -98,16 +94,6 @@ physical memory size can be edited. %lang_package -%if %{avfmtversion} >= 5845100 -%package plugins -Summary: Enhancments for Audacity -Group: Productivity/Multimedia/Sound -Requires: %{name} = %{version} - -%description plugins -This package contains libavformat link for audacity. -%endif - %prep %setup -q -n %{name}-Audacity-%{version} %autopatch -p1 @@ -144,12 +130,15 @@ fi export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb" export CXXFLAGS="$CFLAGS -std=gnu++11" %cmake \ - -Duse_lame:STRING=system + -Duse_lame:STRING=system \ + -Daudacity_use_ffmpeg:STRING=linked make %{?_smp_mflags} %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/ @@ -159,27 +148,15 @@ rm -rf %{buildroot}%{_datadir}/pixmaps/ rm -rf %{buildroot}%{_datadir}/doc cp -v lib-src/portmixer/LICENSE.txt portmixer.LICENSE.txt -# Audacity looks for the major version of libavformat but the symlink no longer exists -# in openSUSE after version 58.45.100 -%if %{avfmtversion} >= 5845100 -mkdir -p %{buildroot}%{_libdir} -pushd %{buildroot}%{_libdir} -ln -s %{_libdir}/libavformat.so.%{avfmtvers} libavformat.so.%{avfmtmaj} -popd -%endif - %find_lang %{name} -%if %{avfmtversion} >= 5845100 -%files plugins -%{_libdir}/libavformat.so.%{avfmtmaj} -%endif - %files %defattr(-,root,root) %doc README.txt %license LICENSE.txt LICENSE_NYQUIST.txt portmixer.LICENSE.txt %{_bindir}/%{name} +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/mod-script-pipe.so %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*