From 304cb25e502f86630bcf50f5b46cd5ac1a729156 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <ford_prefect@gentoo.org>
Date: Fri, 4 Nov 2011 07:30:05 +0000
Subject: Add a patch from upstream to fix compilation against mjpegtools 2.0.
 (fixes bug #369975)

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
---
 media-plugins/gst-plugins-mpeg2enc/ChangeLog       | 10 ++++++++-
 .../gst-plugins-mpeg2enc-0.10.22-compile-fix.patch | 26 ++++++++++++++++++++++
 .../gst-plugins-mpeg2enc-0.10.22-r1.ebuild         | 20 +++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch
 create mode 100644 media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild

(limited to 'media-plugins')

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/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"
+}
-- 
cgit v1.2.3-65-gdbad