diff options
Diffstat (limited to 'multimedia/gst-plugins-bad')
-rw-r--r-- | multimedia/gst-plugins-bad/README | 4 | ||||
-rw-r--r-- | multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild | 19 | ||||
-rw-r--r-- | multimedia/gst-plugins-bad/gst-plugins-bad.info | 6 | ||||
-rw-r--r-- | multimedia/gst-plugins-bad/libfdk-aac-2.0.0-1.patch | 47 | ||||
-rw-r--r-- | multimedia/gst-plugins-bad/libfdk-aac-2.0.0-2.patch | 30 |
5 files changed, 95 insertions, 11 deletions
diff --git a/multimedia/gst-plugins-bad/README b/multimedia/gst-plugins-bad/README index d71085b6fc..b9ab4588e1 100644 --- a/multimedia/gst-plugins-bad/README +++ b/multimedia/gst-plugins-bad/README @@ -5,6 +5,6 @@ a real live maintainer, or some actual wide use. This optionally depends on OpenAL, TiMidity++, amrnb, amrwb, celt, faac, faad2, flite, fluidsynth, gsm, libass, libcdaudio, libdc1394, libdca, -libkate, liblrdf, libmimic, libmodplug, libmusicbrainz, libofa, -libquicktime, libwebp, lv2, musepack-tools, opencv, rtmpdump, +libfdk-aac, libkate, liblrdf, libmimic, libmodplug, libmusicbrainz, +libofa, libquicktime, libwebp, lv2, musepack-tools, opencv, rtmpdump, schroedinger, soundtouch, swfdec, and xvidcore. diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild index c9cfb68a14..bd20aae95a 100644 --- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild +++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gst-plugins-bad -VERSION=${VERSION:-1.6.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.14.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -69,8 +69,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/libfdk-aac-2.0.0-1.patch +patch -p1 < $CWD/libfdk-aac-2.0.0-2.patch + +autoreconf -fiv CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++11" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -78,6 +82,9 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-vulkan=no \ + --disable-examples \ + --disable-opencv \ --build=$ARCH-slackware-linux make diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.info b/multimedia/gst-plugins-bad/gst-plugins-bad.info index 553c0edef7..bf31d14104 100644 --- a/multimedia/gst-plugins-bad/gst-plugins-bad.info +++ b/multimedia/gst-plugins-bad/gst-plugins-bad.info @@ -1,8 +1,8 @@ PRGNAM="gst-plugins-bad" -VERSION="1.6.2" +VERSION="1.14.4" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.2.tar.xz" -MD5SUM="7c73bec1d389f0e184ebbbbb9e9f883d" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.4.tar.xz" +MD5SUM="5d20a91d027708abcf924f6c1279dd25" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/gst-plugins-bad/libfdk-aac-2.0.0-1.patch b/multimedia/gst-plugins-bad/libfdk-aac-2.0.0-1.patch new file mode 100644 index 0000000000..1d820af3b9 --- /dev/null +++ b/multimedia/gst-plugins-bad/libfdk-aac-2.0.0-1.patch @@ -0,0 +1,47 @@ +From 19d34f6b5e1633d5ec4bb2832c58470f0c829cab Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Wed, 5 Dec 2018 10:10:39 +0100 +Subject: [PATCH] fdkaacdec: Use WAV channel mapping instead of interleave + setting + +The latter is going away in libfdk-aac 2.0.0. Instead, MPEG-style output +is always non-interleaved and WAV-style output is always interleaved. +Earlier libfdk-aac also defaults interleaving accordingly. + +Since our reordering looks at the associated PCE indices instead of the +actual channel order, we're agnostic to the mapping. + +For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825 +--- + ext/fdkaac/gstfdkaacdec.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c +index c27183752..f5136b334 100644 +--- a/ext/fdkaac/gstfdkaacdec.c ++++ b/ext/fdkaac/gstfdkaacdec.c +@@ -151,17 +151,13 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps) + gst_buffer_unref (codec_data); + } + ++ /* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0 ++ * The pChannelIndices retain the indices from the standard MPEG mapping so ++ * we're agnostic to the actual order. */ + if ((err = + aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING, +- 0)) != AAC_DEC_OK) { +- GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err); +- return FALSE; +- } +- +- if ((err = +- aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED, + 1)) != AAC_DEC_OK) { +- GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err); ++ GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err); + return FALSE; + } + +-- +2.18.1 + diff --git a/multimedia/gst-plugins-bad/libfdk-aac-2.0.0-2.patch b/multimedia/gst-plugins-bad/libfdk-aac-2.0.0-2.patch new file mode 100644 index 0000000000..1ea08f9abb --- /dev/null +++ b/multimedia/gst-plugins-bad/libfdk-aac-2.0.0-2.patch @@ -0,0 +1,30 @@ +From f4fdb9770c76113f38515245fecc5f11b3ace20d Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 4 Dec 2018 17:54:42 +0100 +Subject: [PATCH] fdkaacenc: Remove MODE_2_1 + +This is not a standard mode and no longer supported by fdk-aac 2.0.0. + +For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825 +--- + ext/fdkaac/gstfdkaacenc.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c +index ad2bcb492..8410e684c 100644 +--- a/ext/fdkaac/gstfdkaacenc.c ++++ b/ext/fdkaac/gstfdkaacenc.c +@@ -71,10 +71,6 @@ static const struct + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, { +- 3, MODE_2_1, { +- GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, +- GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, +- GST_AUDIO_CHANNEL_POSITION_LFE1}}, { + 4, MODE_1_2_1, { + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, +-- +2.18.1 + |