[arch-commits] Commit in alsa-plugins/repos (8 files)
Jan Steffens
heftig at nymeria.archlinux.org
Fri Apr 12 14:24:00 UTC 2013
Date: Friday, April 12, 2013 @ 16:23:59
Author: heftig
Revision: 182673
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
alsa-plugins/repos/extra-i686/PKGBUILD
(from rev 182672, alsa-plugins/trunk/PKGBUILD)
alsa-plugins/repos/extra-x86_64/PKGBUILD
(from rev 182672, alsa-plugins/trunk/PKGBUILD)
Deleted:
alsa-plugins/repos/extra-i686/PKGBUILD
alsa-plugins/repos/extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
alsa-plugins/repos/extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
alsa-plugins/repos/extra-x86_64/PKGBUILD
alsa-plugins/repos/extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
alsa-plugins/repos/extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
------------------------------------------------------------------------------+
/PKGBUILD | 72 ++++++++++
extra-i686/PKGBUILD | 42 -----
extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch | 11 -
extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch | 29 ----
extra-x86_64/PKGBUILD | 42 -----
extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch | 11 -
extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch | 29 ----
7 files changed, 72 insertions(+), 164 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-04-12 14:23:23 UTC (rev 182672)
+++ extra-i686/PKGBUILD 2013-04-12 14:23:59 UTC (rev 182673)
@@ -1,42 +0,0 @@
-# $Id$
-# 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.0.26
-pkgrel=1
-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'
- '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)
-
-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
-}
-
-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/"
-}
-md5sums=('4facd408326ef5567a7d4ceb6589e6b0'
- '50d9adcda20756d063e676a563c201d9'
- '697c6275f678d86ded2e5092d8a154c9')
Copied: alsa-plugins/repos/extra-i686/PKGBUILD (from rev 182672, alsa-plugins/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-04-12 14:23:59 UTC (rev 182673)
@@ -0,0 +1,36 @@
+# $Id$
+# 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.0.27
+pkgrel=1
+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'
+ 'libsamplerate: libsamplerate resampling plugin'
+ 'speex: libspeexdsp resampling plugin')
+options=('!libtool')
+source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
+md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8')
+
+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/"
+}
Deleted: extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
===================================================================
--- extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch 2013-04-12 14:23:23 UTC (rev 182672)
+++ extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch 2013-04-12 14:23:59 UTC (rev 182673)
@@ -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");
Deleted: extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
===================================================================
--- extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch 2013-04-12 14:23:23 UTC (rev 182672)
+++ extra-i686/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch 2013-04-12 14:23:59 UTC (rev 182673)
@@ -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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-04-12 14:23:23 UTC (rev 182672)
+++ extra-x86_64/PKGBUILD 2013-04-12 14:23:59 UTC (rev 182673)
@@ -1,42 +0,0 @@
-# $Id$
-# 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.0.26
-pkgrel=1
-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'
- '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)
-
-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
-}
-
-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/"
-}
-md5sums=('4facd408326ef5567a7d4ceb6589e6b0'
- '50d9adcda20756d063e676a563c201d9'
- '697c6275f678d86ded2e5092d8a154c9')
Copied: alsa-plugins/repos/extra-x86_64/PKGBUILD (from rev 182672, alsa-plugins/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-04-12 14:23:59 UTC (rev 182673)
@@ -0,0 +1,36 @@
+# $Id$
+# 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.0.27
+pkgrel=1
+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'
+ 'libsamplerate: libsamplerate resampling plugin'
+ 'speex: libspeexdsp resampling plugin')
+options=('!libtool')
+source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
+md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8')
+
+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/"
+}
Deleted: extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
===================================================================
--- extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch 2013-04-12 14:23:23 UTC (rev 182672)
+++ extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch 2013-04-12 14:23:59 UTC (rev 182673)
@@ -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");
Deleted: extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
===================================================================
--- extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch 2013-04-12 14:23:23 UTC (rev 182672)
+++ extra-x86_64/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch 2013-04-12 14:23:59 UTC (rev 182673)
@@ -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;
More information about the arch-commits
mailing list