[arch-commits] Commit in gst-plugins-bad/trunk (2 files)

[Jan Steffens]

    Date: Wednesday, September 23, 2015 @ 23:58:21
  Author: heftig
Revision: 247185

1.5.91

Modified:
  gst-plugins-bad/trunk/PKGBUILD
Deleted:
  gst-plugins-bad/trunk/fix-faad2-version-check.patch

-------------------------------+
 PKGBUILD                      |   14 ++++----------
 fix-faad2-version-check.patch |   35 -----------------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-23 21:45:53 UTC (rev 247184)
+++ PKGBUILD	2015-09-23 21:58:21 UTC (rev 247185)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gst-plugins-bad
-pkgver=1.4.5
-pkgrel=4
+pkgver=1.5.91
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,17 +12,11 @@
 makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' 'librsvg'
              'gobject-introspection' 'gtk-doc' 'gtk3' 'clutter' 'opencv' 'libtiger' 'ladspa' 'openal' 'libusb')
 options=(!emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz
-        fix-faad2-version-check.patch)
-sha256sums=('152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c'
-            '741492ae7a9518603fc51d87ae331d882f075547ea7fdec19c60f399085f18cc')
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('193534a17c4338f8e8fa2f1720e6f61557e72ee6a6985d551020f63226a0c810')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=748571
-  patch -Np1 -i ../fix-faad2-version-check.patch
-
   autoreconf -vi
 }
 

Deleted: fix-faad2-version-check.patch
===================================================================
--- fix-faad2-version-check.patch	2015-09-23 21:45:53 UTC (rev 247184)
+++ fix-faad2-version-check.patch	2015-09-23 21:58:21 UTC (rev 247185)
@@ -1,35 +0,0 @@
-From 1f738ca5b8711ca5532a326cd646312e60484863 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans at 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
-