diff options
| -rw-r--r-- | libre/gst-plugins-bad/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/gst-plugins-bad/fix-faad2-version-check.patch | 35 |
2 files changed, 51 insertions, 5 deletions
diff --git a/libre/gst-plugins-bad/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD index d14d5fe38..a5876946b 100644 --- a/libre/gst-plugins-bad/PKGBUILD +++ b/libre/gst-plugins-bad/PKGBUILD @@ -1,22 +1,33 @@ -# $Id: PKGBUILD 235984 2015-04-09 19:37:04Z heftig $ +# $Id: PKGBUILD 241157 2015-06-21 13:22:01Z foutrelis $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=gst-plugins-bad pkgver=1.4.5 -pkgrel=2.parabola1 +pkgrel=4.parabola1 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls' 'wildmidi' 'glu' 'sbc') +depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls' 'wildmidi' 'glu' 'sbc' 'rtmpdump' 'libgudev') makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' 'librsvg' 'gobject-introspection' 'gtk-doc' 'gtk3' 'clutter' 'opencv' 'libtiger' 'ladspa' 'openal' 'libusb') replaces=("${pkgname}-libre" "${pkgname}-parabola") conflicts=("${pkgname}-libre" "${pkgname}-parabola") options=(!emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c') +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz + fix-faad2-version-check.patch) +sha256sums=('152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c' + '741492ae7a9518603fc51d87ae331d882f075547ea7fdec19c60f399085f18cc') + +prepare() { + cd $pkgname-$pkgver + + # https://bugzilla.gnome.org/show_bug.cgi?id=748571 + patch -Np1 -i ../fix-faad2-version-check.patch + + autoreconf -vi +} build() { cd $pkgname-$pkgver diff --git a/libre/gst-plugins-bad/fix-faad2-version-check.patch b/libre/gst-plugins-bad/fix-faad2-version-check.patch new file mode 100644 index 000000000..aad0fb4b0 --- /dev/null +++ b/libre/gst-plugins-bad/fix-faad2-version-check.patch @@ -0,0 +1,35 @@ +From 1f738ca5b8711ca5532a326cd646312e60484863 Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Wed, 13 May 2015 16:23:26 +0200 +Subject: fix faad2 version check + +On fedora 22, the output of cpp inserts extra debug comments, which +makes our regexp for the faad2 version check fail. This in turn causes +it to compile with the wrong arguments passed which then causes stack +corruption and crashes. + +Fix this by only checking for the version (which should be by itself on +a single line). This is potentially less safe, it might be possible that +a similar string would appear in a later version in the header file. + +Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571 + +diff --git a/configure.ac b/configure.ac +index f5ce28c..d295253 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2008,9 +2008,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [ + AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr]) + for minor in 10 9 8 7 6 5 0; do + if test x$faad2_minor_version = "x"; then +- AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [ ++ AC_EGREP_CPP([\"2\.$minor\"$], [ + #include <$faad_hdr> +- GST_CHECK_FAAD_VERSION FAAD2_VERSION ++ FAAD2_VERSION + ], [ + faad2_minor_version=$minor + ]) +-- +cgit v0.10.2 + |