Date: Tuesday, March 8, 2016 @ 23:30:56 Author: anatolik Revision: 261234
archrelease: copy trunk to testing-i686, testing-x86_64 Added: alsa-plugins/repos/testing-i686/ alsa-plugins/repos/testing-i686/0001-Do-not-use-deprecated-FFmpeg-API.patch (from rev 261233, alsa-plugins/trunk/0001-Do-not-use-deprecated-FFmpeg-API.patch) alsa-plugins/repos/testing-i686/0002-replace-avcodec_alloc_free_frame.patch (from rev 261233, alsa-plugins/trunk/0002-replace-avcodec_alloc_free_frame.patch) alsa-plugins/repos/testing-i686/PKGBUILD (from rev 261233, alsa-plugins/trunk/PKGBUILD) alsa-plugins/repos/testing-x86_64/ alsa-plugins/repos/testing-x86_64/0001-Do-not-use-deprecated-FFmpeg-API.patch (from rev 261233, alsa-plugins/trunk/0001-Do-not-use-deprecated-FFmpeg-API.patch) alsa-plugins/repos/testing-x86_64/0002-replace-avcodec_alloc_free_frame.patch (from rev 261233, alsa-plugins/trunk/0002-replace-avcodec_alloc_free_frame.patch) alsa-plugins/repos/testing-x86_64/PKGBUILD (from rev 261233, alsa-plugins/trunk/PKGBUILD) ------------------------------------------------------------+ testing-i686/0001-Do-not-use-deprecated-FFmpeg-API.patch | 26 ++++++ testing-i686/0002-replace-avcodec_alloc_free_frame.patch | 32 +++++++ testing-i686/PKGBUILD | 46 +++++++++++ testing-x86_64/0001-Do-not-use-deprecated-FFmpeg-API.patch | 26 ++++++ testing-x86_64/0002-replace-avcodec_alloc_free_frame.patch | 32 +++++++ testing-x86_64/PKGBUILD | 46 +++++++++++ 6 files changed, 208 insertions(+) Copied: alsa-plugins/repos/testing-i686/0001-Do-not-use-deprecated-FFmpeg-API.patch (from rev 261233, alsa-plugins/trunk/0001-Do-not-use-deprecated-FFmpeg-API.patch) =================================================================== --- testing-i686/0001-Do-not-use-deprecated-FFmpeg-API.patch (rev 0) +++ testing-i686/0001-Do-not-use-deprecated-FFmpeg-API.patch 2016-03-08 22:30:56 UTC (rev 261234) @@ -0,0 +1,26 @@ +From a257818815ce00349a76aaf6c7826070a57c06f7 Mon Sep 17 00:00:00 2001 +From: Anatol Pomozov <anatol.pomo...@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 + Copied: alsa-plugins/repos/testing-i686/0002-replace-avcodec_alloc_free_frame.patch (from rev 261233, alsa-plugins/trunk/0002-replace-avcodec_alloc_free_frame.patch) =================================================================== --- testing-i686/0002-replace-avcodec_alloc_free_frame.patch (rev 0) +++ testing-i686/0002-replace-avcodec_alloc_free_frame.patch 2016-03-08 22:30:56 UTC (rev 261234) @@ -0,0 +1,32 @@ +--- 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, Copied: alsa-plugins/repos/testing-i686/PKGBUILD (from rev 261233, alsa-plugins/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-03-08 22:30:56 UTC (rev 261234) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Daniel Ehlers <danielehl...@mindeye.net> + +pkgname=alsa-plugins +pkgver=1.1.0 +pkgrel=3 +pkgdesc="Extra alsa plugins" +arch=(i686 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" + 0001-Do-not-use-deprecated-FFmpeg-API.patch + 0002-replace-avcodec_alloc_free_frame.patch) +sha1sums=('1436db17989468d082691b817b338e44ba932c4b' + '6b032eb20ea1222e78dc862e61e5dad70a8ef2bb' + 'dc42d1b9ada91d26fbddad2aaf42931edf0b8e9d') + +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 + ./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/testing-x86_64/0001-Do-not-use-deprecated-FFmpeg-API.patch (from rev 261233, alsa-plugins/trunk/0001-Do-not-use-deprecated-FFmpeg-API.patch) =================================================================== --- testing-x86_64/0001-Do-not-use-deprecated-FFmpeg-API.patch (rev 0) +++ testing-x86_64/0001-Do-not-use-deprecated-FFmpeg-API.patch 2016-03-08 22:30:56 UTC (rev 261234) @@ -0,0 +1,26 @@ +From a257818815ce00349a76aaf6c7826070a57c06f7 Mon Sep 17 00:00:00 2001 +From: Anatol Pomozov <anatol.pomo...@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 + Copied: alsa-plugins/repos/testing-x86_64/0002-replace-avcodec_alloc_free_frame.patch (from rev 261233, alsa-plugins/trunk/0002-replace-avcodec_alloc_free_frame.patch) =================================================================== --- testing-x86_64/0002-replace-avcodec_alloc_free_frame.patch (rev 0) +++ testing-x86_64/0002-replace-avcodec_alloc_free_frame.patch 2016-03-08 22:30:56 UTC (rev 261234) @@ -0,0 +1,32 @@ +--- 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, Copied: alsa-plugins/repos/testing-x86_64/PKGBUILD (from rev 261233, alsa-plugins/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-03-08 22:30:56 UTC (rev 261234) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Daniel Ehlers <danielehl...@mindeye.net> + +pkgname=alsa-plugins +pkgver=1.1.0 +pkgrel=3 +pkgdesc="Extra alsa plugins" +arch=(i686 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" + 0001-Do-not-use-deprecated-FFmpeg-API.patch + 0002-replace-avcodec_alloc_free_frame.patch) +sha1sums=('1436db17989468d082691b817b338e44ba932c4b' + '6b032eb20ea1222e78dc862e61e5dad70a8ef2bb' + 'dc42d1b9ada91d26fbddad2aaf42931edf0b8e9d') + +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 + ./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/" +}