Date: Friday, April 1, 2016 @ 20:49:21 Author: anatolik Revision: 263730
upgpkg: alsa-plugins 1.1.1-1 Modified: alsa-plugins/trunk/PKGBUILD Deleted: alsa-plugins/trunk/0001-Do-not-use-deprecated-FFmpeg-API.patch alsa-plugins/trunk/0002-replace-avcodec_alloc_free_frame.patch ---------------------------------------------+ 0001-Do-not-use-deprecated-FFmpeg-API.patch | 26 --------------------- 0002-replace-avcodec_alloc_free_frame.patch | 32 -------------------------- PKGBUILD | 18 +++----------- 3 files changed, 4 insertions(+), 72 deletions(-) Deleted: 0001-Do-not-use-deprecated-FFmpeg-API.patch =================================================================== --- 0001-Do-not-use-deprecated-FFmpeg-API.patch 2016-04-01 18:43:25 UTC (rev 263729) +++ 0001-Do-not-use-deprecated-FFmpeg-API.patch 2016-04-01 18:49:21 UTC (rev 263730) @@ -1,26 +0,0 @@ -From a257818815ce00349a76aaf6c7826070a57c06f7 Mon Sep 17 00:00:00 2001 -From: Anatol Pomozov <[email protected]> -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 - Deleted: 0002-replace-avcodec_alloc_free_frame.patch =================================================================== --- 0002-replace-avcodec_alloc_free_frame.patch 2016-04-01 18:43:25 UTC (rev 263729) +++ 0002-replace-avcodec_alloc_free_frame.patch 2016-04-01 18:49:21 UTC (rev 263730) @@ -1,32 +0,0 @@ ---- a/a52/pcm_a52.c.orig 2016-03-04 18:21:12.606805770 +0100 -+++ b/a52/pcm_a52.c 2016-03-04 18:34:22.653240501 +0100 -@@ -62,6 +62,11 @@ - #define AV_CODEC_ID_AC3 CODEC_ID_AC3 - #endif - -+#if LIBAVCODEC_VERSION_INT < 0x371c01 -+#define av_frame_alloc avcodec_alloc_frame -+#define av_frame_free avcodec_free_frame -+#endif -+ - struct a52_ctx { - snd_pcm_ioplug_t io; - snd_pcm_t *slave; -@@ -513,7 +518,7 @@ - rec->inbuf = NULL; - } - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) -- avcodec_free_frame(&rec->frame); -+ av_frame_free(&rec->frame); - #else - av_freep(&rec->frame); - #endif -@@ -557,7 +562,7 @@ - { - struct a52_ctx *rec = io->private_data; - #ifdef USE_AVCODEC_FRAME -- rec->frame = avcodec_alloc_frame(); -+ rec->frame = av_frame_alloc(); - if (!rec->frame) - return -ENOMEM; - if (av_samples_alloc(rec->frame->data, rec->frame->linesize, Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-01 18:43:25 UTC (rev 263729) +++ PKGBUILD 2016-04-01 18:49:21 UTC (rev 263730) @@ -4,8 +4,8 @@ # Contributor: Daniel Ehlers <[email protected]> pkgname=alsa-plugins -pkgver=1.1.0 -pkgrel=3 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org"; @@ -17,19 +17,9 @@ '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"; - 0001-Do-not-use-deprecated-FFmpeg-API.patch - 0002-replace-avcodec_alloc_free_frame.patch) -sha1sums=('1436db17989468d082691b817b338e44ba932c4b' - '6b032eb20ea1222e78dc862e61e5dad70a8ef2bb' - 'dc42d1b9ada91d26fbddad2aaf42931edf0b8e9d') +source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2";) +sha1sums=('280eb0d9810e463059747d01760a5ac3f44d7057') -prepare() { - cd $pkgname-$pkgver - patch -p1 < ../0001-Do-not-use-deprecated-FFmpeg-API.patch - patch -p1 < ../0002-replace-avcodec_alloc_free_frame.patch -} - build() { cd $pkgname-$pkgver CFLAGS+=' -DHAVE_STDINT_H' # We have issue similar to this one https://code.google.com/p/cantata/issues/detail?id=627
