[arch-commits] Commit in alsa-plugins/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Saturday, October 27, 2018 @ 16:49:43
  Author: heftig
Revision: 337399

archrelease: copy trunk to extra-x86_64

Added:
  alsa-plugins/repos/extra-x86_64/PKGBUILD
    (from rev 337398, alsa-plugins/trunk/PKGBUILD)
  alsa-plugins/repos/extra-x86_64/ffmpeg.diff
    (from rev 337398, alsa-plugins/trunk/ffmpeg.diff)
Deleted:
  alsa-plugins/repos/extra-x86_64/PKGBUILD

-------------+
 PKGBUILD    |   79 +++++++++++++++++++++++++++++++++-------------------------
 ffmpeg.diff |   35 +++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 34 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-27 16:49:29 UTC (rev 337398)
+++ PKGBUILD	2018-10-27 16:49:43 UTC (rev 337399)
@@ -1,34 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Daniel Ehlers <danielehlers at mindeye.net>
-
-pkgname=alsa-plugins
-pkgver=1.1.7
-pkgrel=1
-pkgdesc="Extra alsa plugins"
-arch=(x86_64)
-url="http://www.alsa-project.org"
-license=(GPL)
-depends=(alsa-lib)
-makedepends=(libpulse jack ffmpeg)
-optdepends=('libpulse: PulseAudio plugin'
-            'jack: Jack 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")
-sha1sums=('d2f3c210ec8ef92738ded8a1931904c031b2c86a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
-}

Copied: alsa-plugins/repos/extra-x86_64/PKGBUILD (from rev 337398, alsa-plugins/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-10-27 16:49:43 UTC (rev 337399)
@@ -0,0 +1,45 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Daniel Ehlers <danielehlers at mindeye.net>
+
+pkgname=alsa-plugins
+pkgver=1.1.7
+pkgrel=2
+pkgdesc="Extra alsa plugins"
+arch=(x86_64)
+url="http://www.alsa-project.org"
+license=(GPL)
+depends=(alsa-lib)
+makedepends=(libpulse jack ffmpeg)
+optdepends=('libpulse: PulseAudio plugin'
+            'jack: Jack 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')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # https://bugs.archlinux.org/task/60586
+  patch -Np1 -i ../ffmpeg.diff
+
+  autoreconf -fvi
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
+}

Copied: alsa-plugins/repos/extra-x86_64/ffmpeg.diff (from rev 337398, alsa-plugins/trunk/ffmpeg.diff)
===================================================================
--- ffmpeg.diff	                        (rev 0)
+++ ffmpeg.diff	2018-10-27 16:49:43 UTC (rev 337399)
@@ -0,0 +1,35 @@
+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)