Accepting request 830589 from multimedia:apps

- 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.
- 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/830589
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=89

_constraints

@@ -0,0 +1,14 @@
+<constraints>
+  <overwrite>
+    <conditions>
+      <arch>ppc64</arch>
+      <arch>ppc64le</arch>
+    </conditions>
+    <hardware>
+    <physicalmemory>
+      <size unit="G">6</size>
+    </physicalmemory>
+    </hardware>
+  </overwrite>
+</constraints>
+

audacity.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sat Aug 29 07:15:45 UTC 2020 - Dave Plater <davejplater@gmail.com>
+
+- 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 <normand@linux.vnet.ibm.com>
+
+- Add _constraints for min 6GB physicalymemory for ppc64/ppc64le
+
+-------------------------------------------------------------------
+Wed Aug 26 12:45:48 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Link to ffmpeg rather than dlopening it.
+
+-------------------------------------------------------------------
+Thu Aug 20 13:28:49 UTC 2020 - Dave Plater <davejplater@gmail.com>
+
+- 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 <marec@detebe.org>
 

audacity.spec

@@ -54,27 +54,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(lilv-0) >= 0.24.6
-BuildRequires:  pkgconfig(lv2)
+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
+# Nothing provides libavutil without a suffix
-Requires:       %{name}-plugins = %{version}
 Requires:       ffmpeg
 Requires:       libmp3lame0
+Provides:       %{name}-plugins = %{version}
+Obsoletes:      %{name}-plugins <= 2.4.2
 #Doesn't build for 32 bit anymore
 ExcludeArch:    i586
 
@@ -87,15 +94,6 @@ physical memory size can be edited.
 
 %lang_package
 
-%package plugins
-Summary:        Enhancments for Audacity
-Group:          Productivity/Multimedia/Sound
-Requires:       %{name} =  %{version}
-
-%description plugins
-This package contains extra plugins for audacity.
-
-
 %prep
 %setup -q -n %{name}-Audacity-%{version}
 %autopatch -p1
@@ -132,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/
@@ -146,18 +147,16 @@ 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
-%find_lang %{name}
 
-%files plugins
+%find_lang %{name}
-%license LICENSE.txt
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/suil*.so
 
 %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/*