commit 4a88e81d48315d776338a1fd632eab651fde6203
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sat Sep 8 21:51:00 2012 +0200
- updated to 1.0.26
- added ffmpeg patch to fix build with ffmpeg 0.11+
alsa-plugins-ffmpeg.patch | 25 +++++++++++++++++++++++++
alsa-plugins.spec | 6 ++++--
2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index 35cea8e..f56bfc7 100644
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -1,13 +1,14 @@
Summary: Advanced Linux Sound Architecture - plugins
Summary(pl.UTF-8): Advanced Linux Sound Architecture - wtyczki
Name: alsa-plugins
-Version: 1.0.25
+Version: 1.0.26
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
-# Source0-md5: 038c023eaa51171f018fbf7141255185
+# Source0-md5: 4facd408326ef5567a7d4ceb6589e6b0
Source1: %{name}-pulse.conf
+Patch0: %{name}-ffmpeg.patch
URL: http://www.alsa-project.org/
BuildRequires: alsa-lib-devel >= 1.0.18
BuildRequires: automake
@@ -192,6 +193,7 @@ Wtyczka wejścia-wyjścia PCM usb_stream dla systemu ALSA.
%prep
%setup -q
+%patch0 -p1
%build
cp -f /usr/share/automake/config.sub .
diff --git a/alsa-plugins-ffmpeg.patch b/alsa-plugins-ffmpeg.patch
new file mode 100644
index 0000000..a4d5f09
--- /dev/null
+++ b/alsa-plugins-ffmpeg.patch
@@ -0,0 +1,25 @@
+--- alsa-plugins-1.0.26/a52/pcm_a52.c.orig 2012-09-06 09:52:58.000000000
+0200
++++ alsa-plugins-1.0.26/a52/pcm_a52.c 2012-09-08 20:42:43.420501233 +0200
+@@ -441,7 +441,21 @@
+ #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 == 52 &&
LIBAVCODEC_VERSION_MINOR >= 3)
+ switch (io->channels) {
+ case 2:
+ rec->avctx->channel_layout = CH_LAYOUT_STEREO;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/alsa-plugins.git/commitdiff/4a88e81d48315d776338a1fd632eab651fde6203
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
