[arch-commits] Commit in gstreamer0.10-bad/trunk (PKGBUILD mjpeg-2.0.patch)

[Jan de Groot]

    Date: Monday, December 5, 2011 @ 09:32:41
  Author: jgc
Revision: 144398

upgpkg: gstreamer0.10-bad 0.10.22-3

Rebuild for mjpegtools 2.0

Added:
  gstreamer0.10-bad/trunk/mjpeg-2.0.patch
Modified:
  gstreamer0.10-bad/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   10 ++++++----
 mjpeg-2.0.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-05 14:18:40 UTC (rev 144397)
+++ PKGBUILD	2011-12-05 14:32:41 UTC (rev 144398)
@@ -4,21 +4,23 @@
 pkgbase=gstreamer0.10-bad
 pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
 pkgver=0.10.22
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2)
-md5sums=('9a2acee1f386f71247003d0d7090fb1c')
+source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2
+        mjpeg-2.0.patch)
+md5sums=('9a2acee1f386f71247003d0d7090fb1c' '9415bdab8eb9cfba95df37aaf41c1172')
 
 build() {
   cd "${srcdir}/gst-plugins-bad-${pkgver}"
+  patch -Np1 -i "${srcdir}/mjpeg-2.0.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
     --with-package-name="GStreamer Bad Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" || return 1
+    --with-package-origin="http://www.archlinux.org/"
 
   make || return 1
   sed -e 's/gst sys ext/gst/' -i Makefile

Added: mjpeg-2.0.patch
===================================================================
--- mjpeg-2.0.patch	                        (rev 0)
+++ mjpeg-2.0.patch	2011-12-05 14:32:41 UTC (rev 144398)
@@ -0,0 +1,28 @@
+From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001
+From: Götz Waschk <waschk at mandriva.org>
+Date: Tue, 24 May 2011 13:42:44 +0000
+Subject: mpeg2enc: support mjpegtools 2.0
+
+This adds conditional includes for the renamed headers in mjpegtools 2.0.
+Fixes: #650970.
+---
+(limited to 'ext/mpeg2enc')
+
+diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc
+index acfda50..31f1a30 100644
+--- a/ext/mpeg2enc/gstmpeg2encoder.cc
++++ b/ext/mpeg2enc/gstmpeg2encoder.cc
+@@ -26,7 +26,10 @@
+ 
+ #include <mpegconsts.h>
+ #include <quantize.hh>
+-#if GST_MJPEGTOOLS_API >= 10900
++#if GST_MJPEGTOOLS_API >= 10903
++#include <ontheflyratectlpass1.hh>
++#include <ontheflyratectlpass2.hh>
++#elif GST_MJPEGTOOLS_API >= 10900
+ #include <ontheflyratectl.hh>
+ #include <pass1ratectl.hh>
+ #include <pass2ratectl.hh>
+--
+cgit v0.9.0.2-2-gbebe