diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-09-26 15:36:50 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-09-26 15:36:50 +0200 |
| commit | 3d95be043e9a5bde335138e8c591ba22aee8a6a3 (patch) | |
| tree | 7606beaa7fba470f6aafd2a0024656a790b15e48 /libre | |
| parent | 02170671405860bdf43fdea9b7d098e8b3bac34c (diff) | |
Fix building gstreamer0.10-plugins-bad-libre with newer mjpegtools.
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/gstreamer0.10-bad-libre/PKGBUILD | 7 | ||||
| -rw-r--r-- | libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch | 26 |
2 files changed, 31 insertions, 2 deletions
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index b76c4a0b9..c5dfd46d1 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -11,10 +11,12 @@ license=('LGPL' 'GPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' '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') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2) +source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2 + mpeg2enc-mjpegtools-2.0.patch) build() { cd "${srcdir}/gst-plugins-bad-${pkgver}" + patch -Np1 -i "${srcdir}/mpeg2enc-mjpegtools-2.0.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Bad Plugins (Parabola)" \ @@ -51,4 +53,5 @@ package_gstreamer0.10-bad-libre-plugins() { make -C sys DESTDIR="${pkgdir}" install make -C gst-libs DESTDIR="${pkgdir}" uninstall } -md5sums=('9a2acee1f386f71247003d0d7090fb1c') +md5sums=('9a2acee1f386f71247003d0d7090fb1c' + 'e3068957abab56b474abf183adce7da3') diff --git a/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch b/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch new file mode 100644 index 000000000..771d75743 --- /dev/null +++ b/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch @@ -0,0 +1,26 @@ +From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001 +From: Götz Waschk <waschk@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. +--- +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 |