gstreamer0.10-bad-0.10.23-9.parabola1: rebuild against libvpx 1.4.0

3 files changed, 47 insertions, 5 deletions

diff --git a/libre/gstreamer0.10-bad/PKGBUILD b/libre/gstreamer0.10-bad/PKGBUILD
index f122dd38d..5c1a2c24c 100644
--- a/libre/gstreamer0.10-bad/PKGBUILD
+++ b/libre/gstreamer0.10-bad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 207669 2014-03-12 23:48:57Z foutrelis $
+# $Id: PKGBUILD 237819 2015-04-21 00:39:35Z foutrelis $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -6,26 +6,30 @@
 pkgbase=gstreamer0.10-bad
 pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
 pkgver=0.10.23
-pkgrel=8.parabola1
+pkgrel=9.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'git' 'spandsp' 'celt')
 url="http://gstreamer.freedesktop.org/"
 options=(!emptydirs)
 source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-bad#commit=57569a4854a0f2d14ef19a8264a4ae9a7a1d1125"
+        fix-libmodplug-include.patch
+        drop-vpx-compat-defs.patch
         disable-assrender-test.patch
         disable-camerabin-test.patch)
 sha256sums=('SKIP'
+            'd89d8f4307c7d5a143b9240467d260a1cb6bb1ab2e7ca57841ce0901f41c9cb7'
+            'eb97037b7b581d1ab994eadd144044c083975e5670a73ec827de126bf888f4b9'
             'e66642affa6c0e69837d37615010e67e59ef3d672663303d46c1e2591e2ddfc6'
             '01e780ddf1f8161a6115dded9dc5bf4bdd4d09a9eee00fa423b1330e90e76c68')
 
 prepare() {
   cd gst-plugins-bad
   sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+  patch -Np1 -i ../fix-libmodplug-include.patch
+  patch -Np1 -i ../drop-vpx-compat-defs.patch
   patch -Np1 -i ../disable-assrender-test.patch
   patch -Np1 -i ../disable-camerabin-test.patch
-
-  sed -i 's|stdafx[.]h|libmodplug/stdafx.h|' ext/modplug/gstmodplug.cc
 }
 
 build() {
@@ -34,7 +38,7 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --disable-gtk-doc \
     --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
-    --with-package-origin="https://parabolagnulinux.org/"
+    --with-package-origin="https://www.parabola.nu/"
 
   make
   sed -e 's/gst sys ext/gst/' -i Makefile
diff --git a/libre/gstreamer0.10-bad/drop-vpx-compat-defs.patch b/libre/gstreamer0.10-bad/drop-vpx-compat-defs.patch
new file mode 100644
index 000000000..c7bec44e0
--- /dev/null
+++ b/libre/gstreamer0.10-bad/drop-vpx-compat-defs.patch
@@ -0,0 +1,26 @@
+--- gst-plugins-bad.orig/ext/vp8/gstvp8utils.h	2015-04-21 03:31:33.134952881 +0300
++++ gst-plugins-bad/ext/vp8/gstvp8utils.h	2015-04-21 03:32:45.553520671 +0300
+@@ -25,23 +25,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-/* Some compatibility defines for older libvpx versions */
+-#ifndef VPX_IMG_FMT_I420
+-#define VPX_IMG_FMT_I420 IMG_FMT_I420
+-#endif
+-
+-#ifndef VPX_PLANE_Y
+-#define VPX_PLANE_Y PLANE_Y
+-#endif
+-
+-#ifndef VPX_PLANE_U
+-#define VPX_PLANE_U PLANE_U
+-#endif
+-
+-#ifndef VPX_PLANE_V
+-#define VPX_PLANE_V PLANE_V
+-#endif
+-
+ const char * gst_vpx_error_name (vpx_codec_err_t status);
+ 
+ G_END_DECLS
diff --git a/libre/gstreamer0.10-bad/fix-libmodplug-include.patch b/libre/gstreamer0.10-bad/fix-libmodplug-include.patch
new file mode 100644
index 000000000..6dc6bf177
--- /dev/null
+++ b/libre/gstreamer0.10-bad/fix-libmodplug-include.patch
@@ -0,0 +1,12 @@
+diff -uprw gst-plugins-bad.orig/ext/modplug/gstmodplug.cc gst-plugins-bad/ext/modplug/gstmodplug.cc
+--- gst-plugins-bad.orig/ext/modplug/gstmodplug.cc	2015-04-21 03:15:25.929456272 +0300
++++ gst-plugins-bad/ext/modplug/gstmodplug.cc	2015-04-21 03:18:54.624976723 +0300
+@@ -50,7 +50,7 @@
+ #define WORDS_BIGENDIAN 0
+ #endif
+ 
+-#include <stdafx.h>
++#include <libmodplug/stdafx.h>
+ #include <libmodplug/sndfile.h>
+ 
+ #include "gstmodplug.h"