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

[Jan de Groot]

    Date: Monday, March 12, 2012 @ 13:29:57
  Author: jgc
Revision: 153262

upgpkg: gstreamer0.10-bad 0.10.23-1

Update to 0.10.23

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

-----------------+
 PKGBUILD        |   20 ++++++++++++--------
 mjpeg-2.0.patch |   28 ----------------------------
 2 files changed, 12 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-12 17:04:34 UTC (rev 153261)
+++ PKGBUILD	2012-03-12 17:29:57 UTC (rev 153262)
@@ -3,29 +3,33 @@
 
 pkgbase=gstreamer0.10-bad
 pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
-pkgver=0.10.22
-pkgrel=5
+pkgver=0.10.23
+pkgrel=1
 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')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' '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
-        mjpeg-2.0.patch)
-md5sums=('9a2acee1f386f71247003d0d7090fb1c' '9415bdab8eb9cfba95df37aaf41c1172')
+source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz)
+md5sums=('e4822fa2cc933768e2998311a1565979')
 
 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/"
 
-  make || return 1
+  make
   sed -e 's/gst sys ext/gst/' -i Makefile
 }
 
+# Disable for now: 2 tests fail, one of them is because of not having a camera during build.
+#check() {
+#  cd "${srcdir}/gst-plugins-bad-${pkgver}"
+#  make check
+#}
+
 package_gstreamer0.10-bad() {
   pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)"
   depends=('gstreamer0.10-base>=0.10.34')

Deleted: mjpeg-2.0.patch
===================================================================
--- mjpeg-2.0.patch	2012-03-12 17:04:34 UTC (rev 153261)
+++ mjpeg-2.0.patch	2012-03-12 17:29:57 UTC (rev 153262)
@@ -1,28 +0,0 @@
-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