[arch-commits] Commit in alsa-plugins/trunk (PKGBUILD ffmpeg.diff)

[Jan Steffens]

    Date: Sunday, October 28, 2018 @ 09:27:15
  Author: heftig
Revision: 337416

1.1.7-3: FS#60616: Revert broken fix for FS#60586

Modified:
  alsa-plugins/trunk/PKGBUILD
Deleted:
  alsa-plugins/trunk/ffmpeg.diff

-------------+
 PKGBUILD    |   14 ++++----------
 ffmpeg.diff |   35 -----------------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-28 08:37:49 UTC (rev 337415)
+++ PKGBUILD	2018-10-28 09:27:15 UTC (rev 337416)
@@ -4,7 +4,7 @@
 
 pkgname=alsa-plugins
 pkgver=1.1.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Extra alsa plugins"
 arch=(x86_64)
 url="http://www.alsa-project.org"
@@ -13,20 +13,14 @@
 makedepends=(libpulse jack ffmpeg)
 optdepends=('libpulse: PulseAudio plugin'
             'jack: Jack plugin'
-            'ffmpeg: libavcodec resampling plugin, a52 plugin'
+            #'ffmpeg: libavcodec resampling plugin, a52 plugin'
             'libsamplerate: libsamplerate resampling plugin'
             'speex: libspeexdsp resampling plugin')
-source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
-        ffmpeg.diff)
-sha256sums=('a74b405ab6d9e346e6908a853d5e7631cc61038d9b265bc7f37fab16e827da47'
-            'b98b760fe28bd33d18fa5f0c904d9f2735c07d42775e52afacd669459817a8c7')
+source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
+sha256sums=('a74b405ab6d9e346e6908a853d5e7631cc61038d9b265bc7f37fab16e827da47')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # https://bugs.archlinux.org/task/60586
-  patch -Np1 -i ../ffmpeg.diff
-
   autoreconf -fvi
 }
 

Deleted: ffmpeg.diff
===================================================================
--- ffmpeg.diff	2018-10-28 08:37:49 UTC (rev 337415)
+++ ffmpeg.diff	2018-10-28 09:27:15 UTC (rev 337416)
@@ -1,35 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1eb9d65..e1fa4d6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,7 +93,7 @@ AC_ARG_ENABLE([libav],
-       AS_HELP_STRING([--disable-libav], [Do not build plugins depending on libav/ffmpeg (a52,lavrate...)]))
- 
- if test "x$enable_libav" != "xno"; then
--  PKG_CHECK_MODULES(LIBAV, [libavcodec libavutil libavresample], [HAVE_LIBAV=yes], [HAVE_LIBAV=no])
-+  PKG_CHECK_MODULES(LIBAV, [libavcodec libavutil], [HAVE_LIBAV=yes], [HAVE_LIBAV=no])
- fi
- 
- if test "x$HAVE_LIBAV" = "xno"; then
-@@ -121,6 +121,12 @@ AM_CONDITIONAL(HAVE_LIBAV, test x$HAVE_LIBAV = xyes)
- AC_SUBST(LIBAV_CFLAGS)
- AC_SUBST(LIBAV_LIBS)
- AC_SUBST(LIBAV_CODEC_LIBS)
-+
-+if test "x$enable_libav" != "xno"; then
-+  PKG_CHECK_MODULES(LIBAVRESAMPLE, [libavresample], [HAVE_LIBAVRESAMPLE=yes], [HAVE_LIBAVRESAMPLE=no])
-+fi
-+
-+AM_CONDITIONAL(HAVE_LIBAV, test x$HAVE_LIBAVRESAMLE = xyes)
- AC_SUBST(LIBAV_RESAMPLE_LIBS)
- 
- AC_ARG_ENABLE([a52],
-@@ -134,7 +140,7 @@ AM_CONDITIONAL(HAVE_A52, test x$HAVE_A52 = xyes)
- AC_ARG_ENABLE([lavrate],
-       AS_HELP_STRING([--disable-lavrate], [Disable building of libav/ffmpeg rate plugin]))
- 
--if test "x$enable_lavrate" != "xno" -a "$HAVE_LIBAV" = "yes"; then
-+if test "x$enable_lavrate" != "xno" -a "$HAVE_LIBAVRESAMPLE" = "yes"; then
-   HAVE_LAVRATE=yes
- fi
- AM_CONDITIONAL(HAVE_LAVRATE, test x$HAVE_LAVRATE = xyes)