gst-plugins-bad-1.9.90+20+g7dd42ae-1.parabola1: updating version

3 files changed, 33 insertions, 82 deletions

diff --git a/libre/gst-plugins-bad/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD
index 121eabbac..93d8daacc 100644
--- a/libre/gst-plugins-bad/PKGBUILD
+++ b/libre/gst-plugins-bad/PKGBUILD
@@ -1,47 +1,57 @@
-# $Id: PKGBUILD 277287 2016-09-29 19:37:59Z alucryd $
+# $Id: PKGBUILD 278157 2016-10-10 11:44:54Z heftig $
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=gst-plugins-bad
-pkgver=1.8.3
-pkgrel=2.parabola1
+pkgver=1.9.90+20+g7dd42ae
+pkgrel=1.parabola1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
+url="https://gstreamer.freedesktop.org/"
 arch=(i686 x86_64 armv7h)
 license=(LGPL)
-url="http://gstreamer.freedesktop.org/"
-depends=(mjpegtools gst-plugins-base-libs curl chromaprint libmms faad2 celt libdca
-         soundtouch spandsp libdvdnav libmodplug libgme wayland neon libofa fluidsynth
-         openjpeg2 libwebp libsrtp gnutls wildmidi glu sbc rtmpdump libgudev graphene)
+depends=(mjpegtools gst-plugins-base-libs curl chromaprint libmms faad2 celt libdca libdvdnav
+         libmodplug libgme wayland libofa openjpeg2 libwebp libsrtp gnutls glu sbc rtmpdump
+         libgudev graphene)
 makedepends=(schroedinger libexif libdvdread libvdpau libmpeg2 python valgrind wildmidi librsvg
              gobject-introspection gtk-doc gtk3 clutter libtiger ladspa openal libusb
-             qt5-declarative qt5-x11extras qt5-wayland vulkan-headers vulkan-icd-loader
-             zbar)
+             qt5-declarative qt5-x11extras qt5-wayland vulkan-headers vulkan-icd-loader zbar
+             autoconf-archive git libfdk-aac soundtouch spandsp fluidsynth neon)
 replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 options=(!emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz
-        wildmidi-0.4.patch)
-sha256sums=('7899fcb18e6a1af2888b19c90213af018a57d741c6e72ec56b133bc73ec8509b'
-            'b234c5d1a8b33342d9f807a46c26623e21f3d1b33a9b2903a41fadd53e0cac47')
+_commit=7dd42aee5b7dd0a83acfeae28aea3e8b723e1aa2  # master
+source=("git://anongit.freedesktop.org/gstreamer/gst-plugins-bad#commit=$_commit"
+        "gst-common::git://anongit.freedesktop.org/gstreamer/common")
+sha256sums=('SKIP'
+            'SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../wildmidi-0.4.patch
-  autoreconf -vi
+  cd $pkgname
+
+  git submodule init
+  git config --local submodule.common.url "$srcdir/gst-common"
+  git submodule update
+
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   # disable GL and GLX on armv7h
   [[ "$CARCH" = "armv7h" ]] && extra="--disable-gl --disable-glx --enable-gles2"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental --enable-gtk-doc \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
     --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
     --with-package-origin="https://www.parabola.nu/" \
-    --with-gtk=3.0 $extra
+    --with-gtk=3.0 \
+    --enable-experimental --enable-gtk-doc --disable-static $extra
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -50,12 +60,12 @@ build() {
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   # don't have a camera for the camerabin test
   make -k check || :
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
 }
diff --git a/libre/gst-plugins-bad/fix-faad2-version-check.patch b/libre/gst-plugins-bad/fix-faad2-version-check.patch
deleted file mode 100644
index aad0fb4b0..000000000
--- a/libre/gst-plugins-bad/fix-faad2-version-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-
diff --git a/libre/gst-plugins-bad/wildmidi-0.4.patch b/libre/gst-plugins-bad/wildmidi-0.4.patch
deleted file mode 100644
index 65aba5d0e..000000000
--- a/libre/gst-plugins-bad/wildmidi-0.4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 04199db2aeea966c2c879b1764427c87433570f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Tue, 16 Aug 2016 10:37:28 +0300
-Subject: wildmidi: Fix compilation with wildmidi 0.4
-
-Old versions used char* for the data, new versions use int8_t*. They're often
-not the same and differ in signedness.
-
-diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
-index 3e82ca2..f52ea9d 100644
---- a/ext/timidity/gstwildmidi.c
-+++ b/ext/timidity/gstwildmidi.c
-@@ -672,7 +672,7 @@ gst_wildmidi_get_buffer (GstWildmidi * wildmidi)
-   gst_buffer_map (buffer, &info, GST_MAP_READWRITE);
- 
-   GST_OBJECT_LOCK (wildmidi);
--  size = WildMidi_GetOutput (wildmidi->song, (char *) info.data,
-+  size = WildMidi_GetOutput (wildmidi->song, (gpointer) info.data,
-       (unsigned long int) info.size);
-   GST_OBJECT_UNLOCK (wildmidi);
- 
--- 
-cgit v0.10.2
-