[arch-commits] Commit in alsa-plugins/trunk (2 files)

[Anatol Pomozov]

    Date: Tuesday, February 16, 2016 @ 02:52:05
  Author: anatolik
Revision: 259367

upgpkg: alsa-plugins 1.1.0-2

Add ffmpeg 3.0 compat patch

Added:
  alsa-plugins/trunk/0001-Do-not-use-deprecated-FFmpeg-API.patch
Modified:
  alsa-plugins/trunk/PKGBUILD

---------------------------------------------+
 0001-Do-not-use-deprecated-FFmpeg-API.patch |   26 ++++++++++++++++++++++++++
 PKGBUILD                                    |   10 ++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

Added: 0001-Do-not-use-deprecated-FFmpeg-API.patch
===================================================================
--- 0001-Do-not-use-deprecated-FFmpeg-API.patch	                        (rev 0)
+++ 0001-Do-not-use-deprecated-FFmpeg-API.patch	2016-02-16 01:52:05 UTC (rev 259367)
@@ -0,0 +1,26 @@
+From a257818815ce00349a76aaf6c7826070a57c06f7 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date: Mon, 15 Feb 2016 17:40:41 -0800
+Subject: [PATCH] Do not use deprecated FFmpeg API
+
+This API as been removed in ffmpeg 3.0 (commit 2d40968dd3ff17b12f7)
+---
+ a52/pcm_a52.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
+index 88529eb..6fad77d 100644
+--- a/a52/pcm_a52.c
++++ b/a52/pcm_a52.c
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/mem.h>
+ #define USE_AVCODEC_FRAME
+ #endif
+-- 
+2.7.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-16 01:48:42 UTC (rev 259366)
+++ PKGBUILD	2016-02-16 01:52:05 UTC (rev 259367)
@@ -5,7 +5,7 @@
 
 pkgname=alsa-plugins
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64)
 url="http://www.alsa-project.org"
@@ -17,11 +17,14 @@
             '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")
+source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
+        0001-Do-not-use-deprecated-FFmpeg-API.patch)
+sha1sums=('1436db17989468d082691b817b338e44ba932c4b'
+          '6b032eb20ea1222e78dc862e61e5dad70a8ef2bb')
 
 prepare() {
   cd $pkgname-$pkgver
-  sed -i 's/ && LIBAVCODEC_VERSION_MINOR >= 34//' a52/pcm_a52.c
+  patch -p1 < ../0001-Do-not-use-deprecated-FFmpeg-API.patch
 }
 
 build() {
@@ -38,4 +41,3 @@
   install -d "$pkgdir/usr/share/doc/$pkgname"
   install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
 }
-md5sums=('b123e42ed881b9adbc99e4040f257c39')