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

@@ -1,8 +1,20 @@
+-------------------------------------------------------------------
+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>
 

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/*