Added a patch for libmpeg2 >0.3.1

5 files changed, 49 insertions, 13 deletions

diff --git a/media-libs/gst-plugins/ChangeLog b/media-libs/gst-plugins/ChangeLog
index d5d54dd74953..d9a6e0cfa76e 100644
--- a/media-libs/gst-plugins/ChangeLog
+++ b/media-libs/gst-plugins/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-libs/gst-plugins
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.34 2003/06/27 15:45:34 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.35 2003/07/06 09:51:20 raker Exp $
+
+  06 Jul 2003; Nick Hadaway <raker@gentoo.org> gst-plugins-0.6.2*.ebuild,
+  files/libmpeg2.patch:
+  Added support back for libmpeg2 higher than 0.3.1
 
   27 Jun 2003; foser <foser@gentoo.org> gst-plugins-0.*.ebuild :
   Fix libmpeg2 dep to be 0.3.1 only
diff --git a/media-libs/gst-plugins/Manifest b/media-libs/gst-plugins/Manifest
index 34abc57dd544..00f93c442425 100644
--- a/media-libs/gst-plugins/Manifest
+++ b/media-libs/gst-plugins/Manifest
@@ -1,16 +1,17 @@
-MD5 92d535daee2f9008f8103d545d84ad2b ChangeLog 6258
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 ad23ab6a4415025251b668e78025d53a gst-plugins-0.6.1.ebuild 4884
 MD5 709a266068bfc039eaa8a1bac2b63e8b gst-plugins-0.6.0-r4.ebuild 5283
+MD5 083b9717e64cf1f0194435f53dcee540 gst-plugins-0.6.2-r5.ebuild 2285
 MD5 4032bffb4f371b4f15cc055424b1a488 gst-plugins-0.5.2.ebuild 3614
-MD5 43fb6d46384e16350c29778631f7f6bb gst-plugins-0.6.2.ebuild 4818
-MD5 5d375c53aa8e9e220ae89bc45535d098 gst-plugins-0.6.2-r5.ebuild 2101
-MD5 497c4febffa64787dea6e4771fb6b72b files/digest-gst-plugins-0.6.1 71
+MD5 fab36a6100723e2c33cf9d47294b7cc2 gst-plugins-0.6.2.ebuild 5002
+MD5 b31d4b916d6969c889083e2502901c31 ChangeLog 6409
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 2af3f44c3431626eea2cb8fd2f87fe90 files/digest-gst-plugins-0.6.0-r4 71
+MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r5 71
+MD5 39565eecc2e30c6d1ea9878a944d67b6 files/gst-plugins-0.6-ogg_detection_fix.patch 1242
 MD5 19d8eb05023c45d2a1b2e7af6bb44d96 files/digest-gst-plugins-0.5.2 71
+MD5 497c4febffa64787dea6e4771fb6b72b files/digest-gst-plugins-0.6.1 71
 MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2 71
-MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r5 71
-MD5 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
+MD5 f7aac3ba492d4e54ae14ebeabc3299d4 files/libmpeg2.patch 878
 MD5 f4d299412b70de18060a4226c6fa981f files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch 923
 MD5 548125c96ab562221dc0509e485d0f5a files/gst-plugins-0.6-ffmpeg_ldflags.patch 1858
-MD5 39565eecc2e30c6d1ea9878a944d67b6 files/gst-plugins-0.6-ogg_detection_fix.patch 1242
-MD5 2af3f44c3431626eea2cb8fd2f87fe90 files/digest-gst-plugins-0.6.0-r4 71
+MD5 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
diff --git a/media-libs/gst-plugins/files/libmpeg2.patch b/media-libs/gst-plugins/files/libmpeg2.patch
new file mode 100644
index 000000000000..63f5d36236f1
--- /dev/null
+++ b/media-libs/gst-plugins/files/libmpeg2.patch
@@ -0,0 +1,21 @@
+diff -urN gst-plugins-0.6.2/ext/mpeg2dec/gstmpeg2dec.c gst-plugins-0.6.2-modified/ext/mpeg2dec/gstmpeg2dec.c
+--- gst-plugins-0.6.2/ext/mpeg2dec/gstmpeg2dec.c	2003-05-06 17:51:38.000000000 -0500
++++ gst-plugins-0.6.2-modified/ext/mpeg2dec/gstmpeg2dec.c	2003-06-29 13:51:21.000000000 -0500
+@@ -262,7 +262,7 @@
+   GstBuffer *outbuf = NULL;
+   gint size = mpeg2dec->width * mpeg2dec->height;
+   guint8 *buf[3], *out;
+-  const picture_t *picture;
++  const mpeg2_picture_t *picture;
+ 
+   if (mpeg2dec->peerpool) {
+     outbuf = gst_buffer_new_from_pool (mpeg2dec->peerpool, 0, 0);
+@@ -553,7 +553,7 @@
+ 			(info->display_fbuf ? info->display_fbuf->id : NULL));
+ 
+ 	if (info->display_fbuf && info->display_fbuf->id) {
+-          const picture_t *picture;
++          const mpeg2_picture_t *picture;
+ 	  gboolean key_frame = FALSE;
+ 	  
+ 	  outbuf = (GstBuffer *) info->display_fbuf->id;
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild
index 5a26a9c80434..a9db275439ef 100644
--- a/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild
+++ b/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild,v 1.1 2003/06/16 22:17:17 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild,v 1.2 2003/07/06 09:51:20 raker Exp $
 
 # IMPORTANT
 #
@@ -38,6 +38,11 @@ src_unpack() {
 	# using a slower but working version for now
 	epatch ${FILESDIR}/noppcasm.patch
 
+	# patch for changing types in >libmpeg-0.3.1
+        if grep -q mpeg2_picture ${ROOT}/usr/include/mpeg2dec/mpeg2.h; then
+                epatch ${FILESDIR}/libmpeg2.patch
+        fi
+
 	# fix the scripts
 	cd ${S}/tools
 	mv gst-launch-ext gst-launch-ext.old
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild
index 0e50ffeaa7df..e352ffe0fda4 100644
--- a/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild
+++ b/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild,v 1.2 2003/06/27 15:45:34 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild,v 1.3 2003/07/06 09:51:20 raker Exp $
 
 inherit eutils libtool gnome2 flag-o-matic
 
@@ -36,7 +36,7 @@ RDEPEND="=media-libs/gstreamer-${PV}*
 		media-libs/libogg )
 	encode? ( media-sound/lame )
 	quicktime? ( media-libs/openquicktime )
-	mpeg? (	=media-libs/libmpeg2-0.3.1* )
+	mpeg? (	>=media-libs/libmpeg2-0.3.1 )
 	esd? ( media-sound/esound )
 	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
 	mikmod? ( media-libs/libmikmod )
@@ -68,6 +68,11 @@ src_unpack() {
 	# ffmpeg libs fix
 	use oggvorbis && epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ffmpeg_ldflags.patch
 
+	# patch for changing types in >libmpeg-0.3.1
+        if grep -q mpeg2_picture ${ROOT}/usr/include/mpeg2dec/mpeg2.h; then
+                epatch ${FILESDIR}/libmpeg2.patch
+        fi
+
 	# fix the scripts
 	cd ${S}/tools
 	mv gst-launch-ext gst-launch-ext.old