Add a patch from upstream to fix compilation against mjpegtools 2.0. (fixes bug #369975)

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 68 insertions, 2 deletions

diff --git a/media-plugins/gst-plugins-mpeg2enc/ChangeLog b/media-plugins/gst-plugins-mpeg2enc/ChangeLog
index 06c7e8c3346c..3048434cc9fd 100644
--- a/media-plugins/gst-plugins-mpeg2enc/ChangeLog
+++ b/media-plugins/gst-plugins-mpeg2enc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/gst-plugins-mpeg2enc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mpeg2enc/ChangeLog,v 1.3 2011/07/29 08:46:04 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mpeg2enc/ChangeLog,v 1.4 2011/11/04 07:30:05 ford_prefect Exp $
+
+*gst-plugins-mpeg2enc-0.10.22-r1 (04 Nov 2011)
+
+  04 Nov 2011; Arun Raghavan <ford_prefect@gentoo.org>
+  +gst-plugins-mpeg2enc-0.10.22-r1.ebuild,
+  +files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch:
+  Add a patch from upstream to fix compilation against mjpegtools 2.0. (fixes
+  bug #369975)
 
 *gst-plugins-mpeg2enc-0.10.22 (29 Jul 2011)
 
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index 7d652ef6f567..f6e0dbc8b95f 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gst-plugins-mpeg2enc-0.10.22-compile-fix.patch 827 RMD160 400d465b0c96ef3c3675f6040273e0efaf3a2b9f SHA1 de8f40b7613b4334db2b4aeda8d83c403eab0fa8 SHA256 3a41e046100bfd2f8df310cc9bafa211bbda836e95646f5452de99b4ac41f39b
 DIST gst-plugins-bad-0.10.19.tar.bz2 3009513 RMD160 f28beddcfc33d02da590271403385f06eacfe1c4 SHA1 3d5ca09f99371fb569ed029dcaef8119f0841821 SHA256 7b6c49f22caad3b573aee481381355b38ac9f2077f291d9f33a9a808a2568888
 DIST gst-plugins-bad-0.10.21.tar.bz2 3429224 RMD160 b12f7a26fdbef06a1914d9a4192d2114855f41a1 SHA1 5bc4e5a1edff4bf22cbabc32cb87dc055b55c65a SHA256 422badacbda37ac33cb446c6751dabcd0b223c308dbb01024a34ded682fa47e3
 DIST gst-plugins-bad-0.10.22.tar.bz2 3539722 RMD160 a3cf707a42d49b4285a57adaa07dc87591f18403 SHA1 66f4b9c40eb2ea43f093802e673effabee600a9b SHA256 d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c
 EBUILD gst-plugins-mpeg2enc-0.10.19.ebuild 467 RMD160 cccad78b25a771169146df310b63af3231e0bad6 SHA1 a3f93ab78ccd99c152dd23272b8e119afff3ebf2 SHA256 cef876450dee09d6ad4e1a7cc91699f261d83014fea8b1a22d8f1c2b73a04027
 EBUILD gst-plugins-mpeg2enc-0.10.21.ebuild 467 RMD160 803deb4c8749c23f56bf48c2e2bf84461c6e7e1c SHA1 ebebd3490ddb207e9c7677f211cc11943b7157c5 SHA256 9908dda15b8eb4b1b942c225b0d921b301bee031635a057e4295d49d8c809412
+EBUILD gst-plugins-mpeg2enc-0.10.22-r1.ebuild 600 RMD160 98b7bd88b1b8090e3ff0689ebe3a4adafddcf998 SHA1 c7538c10db9ad5831252bb73397a205ddd6e8685 SHA256 411ca3797b9f6eec374e8f205855ba95a76c7439b888d519c89e3d65f51310c8
 EBUILD gst-plugins-mpeg2enc-0.10.22.ebuild 467 RMD160 e328b67718223cc6b7e2d819344f45967ca50a13 SHA1 173a4b53be5a8f04b98587cce5cbff2fdcb462d7 SHA256 d208110e966fac71e0c6e0c71bbd84eac1c57e2dfbef65765de30d389b891647
-MISC ChangeLog 872 RMD160 561d447a54534a133461d2f5d5170a5be6ccfc16 SHA1 8eb687d55259472aee9a6d0d2e3632f0145811e8 SHA256 030078ad926bdfaa44d1c6e9df8e277299a95d36cab220d80c32ec9a0ff27561
+MISC ChangeLog 1177 RMD160 aaf0da7a8b602b494f58dba292c395555691e5be SHA1 d9d7d5ee587ff287ac5c03bc380874c17992c04c SHA256 31b13197e0a879e638e87b4e37f9963df8d1efd991b5e33eee247dfdfb184beb
 MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk6zlIYACgkQ+Vqt1inD4uwe+QCeNaZNhSxwLGkYazcveRFHnCNo
+J1oAoK7MqeUtHcdOtqff6RaZw1YfkFon
+=cVHD
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch b/media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch
new file mode 100644
index 000000000000..771d75743806
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.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
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild
new file mode 100644
index 000000000000..a92daee9da7d
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild,v 1.1 2011/11/04 07:30:05 ford_prefect Exp $
+
+EAPI=2
+
+inherit gst-plugins-bad
+
+DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-1.9.0
+	>=media-libs/gst-plugins-base-0.10.33"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Upstream patch to build against mjpegtools 2.0
+	epatch "${FILESDIR}/${P}-compile-fix.patch"
+}