summaryrefslogtreecommitdiffstats
path: root/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'libraries')
-rw-r--r--libraries/alsa-plugins/alsa-plugins.SlackBuild13
-rw-r--r--libraries/alsa-plugins/alsa-plugins.info6
-rw-r--r--libraries/alsa-plugins/ffmpeg.patch28
3 files changed, 8 insertions, 39 deletions
diff --git a/libraries/alsa-plugins/alsa-plugins.SlackBuild b/libraries/alsa-plugins/alsa-plugins.SlackBuild
index 851eb0dbd7..94bce6e7b1 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.26}
+VERSION=${VERSION:-1.0.28}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -46,13 +46,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -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
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/libraries/alsa-plugins/alsa-plugins.info b/libraries/alsa-plugins/alsa-plugins.info
index f5ef24459d..8bd04206f6 100644
--- a/libraries/alsa-plugins/alsa-plugins.info
+++ b/libraries/alsa-plugins/alsa-plugins.info
@@ -1,8 +1,8 @@
PRGNAM="alsa-plugins"
-VERSION="1.0.26"
+VERSION="1.0.28"
HOMEPAGE="http://www.alsa-project.org"
-DOWNLOAD="http://alsa.cybermirror.org/plugins/alsa-plugins-1.0.26.tar.bz2"
-MD5SUM="4facd408326ef5567a7d4ceb6589e6b0"
+DOWNLOAD="ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.28.tar.bz2"
+MD5SUM="6fcbbb31e96f8ebc5fb926184a717aa4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/alsa-plugins/ffmpeg.patch b/libraries/alsa-plugins/ffmpeg.patch
deleted file mode 100644
index fb8e0a95cf..0000000000
--- a/libraries/alsa-plugins/ffmpeg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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;