OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=86

audacity-flac_assert.h.patch

@@ -1,23 +1,28 @@
-diff -aur a/m4/audacity_checklib_libflac.m4 b/m4/audacity_checklib_libflac.m4
 --- a/m4/audacity_checklib_libflac.m4
 +++ b/m4/audacity_checklib_libflac.m4
-@@ -13,16 +13,16 @@
+@@ -13,21 +13,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
  
     dnl See if FLAC is installed in the system
  
 -   PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0],
-+   PKG_CHECK_MODULES([FLAC], [flac >= 1.4.0 flac++ >= 1.4.0],
++   PKG_CHECK_MODULES([FLAC], [flac >= 1.5.0 flac++ >= 1.5.0],
                       [LIBFLAC_SYSTEM_AVAILABLE="yes"],
                       [LIBFLAC_SYSTEM_AVAILABLE="no"])
  
 -   dnl Check for flac < 1.3.0
-+   dnl Check for flac < 1.4.0
++   dnl Check for flac < 1.5.0
     if test "$LIBFLAC_SYSTEM_AVAILABLE" = "no"; then
        PKG_CHECK_MODULES([FLAC], [flac flac++],
                          [LIBFLAC_SYSTEM_AVAILABLE="yes"],
                          [LIBFLAC_SYSTEM_AVAILABLE="no"])
 -      dnl flac < 1.3.0 adds its own FLAC and FLAC++ subdirectories to the search
-+      dnl flac < 1.4.0 adds its own FLAC and FLAC++ subdirectories to the search
++      dnl flac < 1.5.0 adds its own FLAC and FLAC++ subdirectories to the search
        dnl path and ships a assert.h file there. This assert.h overwrites the
        dnl assert.h header from the C standard library. We need to strip /FLAC
        dnl and /FLAC++ from the include paths to make the assert.h from the C
+       dnl standard library available again.
+-      [FLAC_CFLAGS=$(echo "$FLAC_CFLAGS" | sed 's@-I\([^ ]*\)/FLAC\(++\)\? @-I\1 @g')]
++      [FLAC_CFLAGS=$(echo "$FLAC_CFLAGS" | sed 's|-I\([^ ]*\)/FLAC\(++\)\?[ ]*|-I\1 |g')]
+    fi
+ 
+    if test "$LIBFLAC_SYSTEM_AVAILABLE" = "yes"; then

audacity.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct 25 11:08:54 UTC 2015 - sor.alexei@meowr.ru
+
+- Fix audacity-flac_assert.h.patch up a little.
+- Build with ffmpeg support in openSUSE Leap 42.1 and newer.
+
 -------------------------------------------------------------------
 Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de
 

audacity.spec

@@ -18,7 +18,7 @@
 
 %define _use_internal_dependency_generator 0
 %define __find_requires %{wx_requires}
-%bcond_with ffmpeg
+%bcond_with restricted
 %bcond_with mad
 %bcond_with lame
 %bcond_with twolame
@@ -34,12 +34,12 @@ Source1:        %{name}-license-nyquist
 Source2:        %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch reddwarf@opensuse.org -- Remove the buildstamp.
 Patch0:         %{name}-no_buildstamp.patch
-# PATCH-FIX-UPSTREAM audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to build against libflac 1.3.0+.
+# PATCH-FIX-OPENSUSE audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to fix build against libflac 1.3.0+.
 Patch1:         %{name}-flac_assert.h.patch
-# PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddwarf@opensuse.org -- Patch to compile with latest ffmpeg.
-Patch2:         %{name}-ffmpeg.patch
 # PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason.
-Patch3:         %{name}-fix-nonsense.patch
+Patch2:         %{name}-fix-nonsense.patch
+# PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddwarf@opensuse.org -- Patch to compile with latest ffmpeg.
+Patch3:         %{name}-ffmpeg.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
@@ -70,7 +70,7 @@ Recommends:     libavcodec
 Recommends:     libavformat
 Recommends:     libavutil
 Recommends:     libmp3lame0
-%if %{with ffmpeg}
+%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) || %{with restricted}
 BuildRequires:  pkgconfig(libavcodec) >= 51.53
 BuildRequires:  pkgconfig(libavformat) >= 52.12
 BuildRequires:  pkgconfig(libavutil)
@@ -98,19 +98,14 @@ than the physical memory size of your computer.
 %setup -q -n %{name}-minsrc-%{version}
 %patch0 -p1
 %patch1 -p1
-%if %{with ffmpeg}
+%patch2 -p1
-%patch2
+%patch3
-%endif
-%patch3 -p1
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
 rm -rf lib-src/{expat,libvamp,libsoxr}/
 %if %{with lame}
 rm -rf lib-src/lame/
 %endif
-%if %{with ffmpeg}
-rm -rf lib-src/ffmpeg/
-%endif
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -128,7 +123,7 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-# E-mail written to feedback@audacityteam.org.
+# E-mail wrote to feedback@audacityteam.org.
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/
 mv -f %{buildroot}%{_datadir}/pixmaps/gnome-mime-application-x-audacity-project.xpm \
   %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-audacity-project.xpm