diff options
Diffstat (limited to 'libraries/alsa-plugins')
| -rw-r--r-- | libraries/alsa-plugins/alsa-plugins.SlackBuild | 5 | ||||
| -rw-r--r-- | libraries/alsa-plugins/alsa-plugins.info | 6 | ||||
| -rw-r--r-- | libraries/alsa-plugins/ffmpeg.patch | 28 |
3 files changed, 35 insertions, 4 deletions
diff --git a/libraries/alsa-plugins/alsa-plugins.SlackBuild b/libraries/alsa-plugins/alsa-plugins.SlackBuild index 3eed9b69b2..05da4ed6c9 100644 --- a/libraries/alsa-plugins/alsa-plugins.SlackBuild +++ b/libraries/alsa-plugins/alsa-plugins.SlackBuild @@ -5,7 +5,7 @@ # Written by crocket (crockabiscuit@gmail.com) PRGNAM=alsa-plugins -VERSION=${VERSION:-1.0.24} +VERSION=${VERSION:-1.0.26} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,6 +51,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix building with the new ffmpeg +patch -p1 < $CWD/ffmpeg.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/alsa-plugins/alsa-plugins.info b/libraries/alsa-plugins/alsa-plugins.info index 93bfcab8f3..d1037ad08f 100644 --- a/libraries/alsa-plugins/alsa-plugins.info +++ b/libraries/alsa-plugins/alsa-plugins.info @@ -1,9 +1,9 @@ PRGNAM="alsa-plugins" -VERSION="1.0.24" +VERSION="1.0.26" HOMEPAGE="http://www.alsa-project.org" -DOWNLOAD="ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.24.tar.bz2" +DOWNLOAD="http://alsa.cybermirror.org/plugins/alsa-plugins-1.0.26.tar.bz2" +MD5SUM="4facd408326ef5567a7d4ceb6589e6b0" DOWNLOAD_x86_64="" -MD5SUM="e4d4c90e11ab9d1a117afbbc1edd2b16" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="crocket" diff --git a/libraries/alsa-plugins/ffmpeg.patch b/libraries/alsa-plugins/ffmpeg.patch new file mode 100644 index 0000000000..fb8e0a95cf --- /dev/null +++ b/libraries/alsa-plugins/ffmpeg.patch @@ -0,0 +1,28 @@ +https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5587 + +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; |