diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-13 09:30:32 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-13 09:30:32 +0200 |
| commit | b2b3a3e5241f31d00189615d3a86d5e0efd2ca25 (patch) | |
| tree | 38cbc9ae8f219a9a921732d6132b50ba57ba7dab /extra/alsa-plugins | |
| parent | a4a706ff05afab9bb61870c0049aedb23072cec1 (diff) | |
| parent | 8f0418e4a239ba973834592537b474d3aac52d5b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-mozc/PKGBUILD
core/libcap/PKGBUILD
extra/ncmpc/PKGBUILD
extra/php/PKGBUILD
extra/sqlite/PKGBUILD
libre/hplip-libre/PKGBUILD
libre/icecat/PKGBUILD
Diffstat (limited to 'extra/alsa-plugins')
3 files changed, 4 insertions, 50 deletions
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index ae5b4f4e8..c03207608 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166381 2012-09-07 09:14:25Z tpowa $ +# $Id: PKGBUILD 182673 2013-04-12 14:23:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins -pkgver=1.0.26 +pkgver=1.0.27 pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64 'mips64el') @@ -18,14 +18,11 @@ optdepends=('libpulse: PulseAudio plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" - alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) +source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") +md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8') build() { cd $pkgname-$pkgver - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch ./configure --prefix=/usr make } @@ -37,6 +34,3 @@ package() { install -d "$pkgdir/usr/share/doc/$pkgname" install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" } -md5sums=('4facd408326ef5567a7d4ceb6589e6b0' - '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9') diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch deleted file mode 100644 index cce4f7e7e..000000000 --- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c ---- alsa-plugins-1.0.25/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c 2012-06-09 00:42:52.177219012 +0200 -@@ -702,7 +702,6 @@ - rec->channels = channels; - rec->format = format; - -- avcodec_init(); - avcodec_register_all(); - - rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch deleted file mode 100644 index f4ebbf466..000000000 --- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch +++ /dev/null @@ -1,29 +0,0 @@ -Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for -the AV_CH_LAYOUT_* defines. - -diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c ---- alsa-plugins-1.0.25-original/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c 2012-06-01 14:59:47.096671464 +0200 -@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t - #else - rec->avctx->sample_fmt = SAMPLE_FMT_S16; - #endif --#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) -+#if (LIBAVCODEC_VERSION_MAJOR >= 54) -+ switch (io->channels) { -+ case 2: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; -+ break; -+ case 4: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; -+ break; -+ case 6: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; -+ break; -+ default: -+ break; -+ } -+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) - switch (io->channels) { - case 2: - rec->avctx->channel_layout = CH_LAYOUT_STEREO; |