diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-05 14:34:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-05 14:34:37 +0200 |
| commit | 4d25d4d5acbcd80c6fc50529995547e80fa42fd5 (patch) | |
| tree | e09903142fc52776537fa69287438080fc7b4ac2 /libre/gstreamer0.10-bad-libre | |
| parent | 04d19e722a66cd7bcf29d0c4b63d68cb69ca54fe (diff) | |
Don't apply an unneeded patch.
Diffstat (limited to 'libre/gstreamer0.10-bad-libre')
| -rw-r--r-- | libre/gstreamer0.10-bad-libre/PKGBUILD | 1 | ||||
| -rw-r--r-- | libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch | 26 |
2 files changed, 0 insertions, 27 deletions
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 9694faf9e..d2bfa1a1f 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -17,7 +17,6 @@ md5sums=('e4822fa2cc933768e2998311a1565979') 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)" \ diff --git a/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch b/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch deleted file mode 100644 index 771d75743..000000000 --- a/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 |