Add const_cast for newer ffmpeg and -lX11 for newer SDL

Package-Manager: portage-2.1.1-r2

4 files changed, 46 insertions, 4 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index e1aa64d1cdd9..0c657f4e87ef 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.44 2006/11/11 20:29:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.45 2006/11/18 21:11:19 tester Exp $
+
+  18 Nov 2006; Olivier Crête <tester@gentoo.org>
+  +files/mpeg4ip-1.5.0.1-lX11.patch, +files/mpeg4ip-1.5.0.1-newffmpeg.patch,
+  -mpeg4ip-1.5.0.1.ebuild, mpeg4ip-1.5.0.1-r1.ebuild:
+  Add const_cast for newer ffmpeg and -lX11 for newer SDL
 
 *mpeg4ip-1.5.0.1-r1 (11 Nov 2006)
 
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-lX11.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-lX11.patch
new file mode 100644
index 000000000000..874c6a39c214
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-lX11.patch
@@ -0,0 +1,11 @@
+--- player/src/Makefile.am.orig	2006-11-18 15:13:56.000000000 -0500
++++ player/src/Makefile.am	2006-11-18 15:14:24.000000000 -0500
+@@ -206,7 +206,7 @@
+ 	$(top_builddir)/lib/audio/libaudio.la \
+ 	$(top_builddir)/lib/ismacryp/libismacryp.la \
+ 	$(top_builddir)/lib/srtp/libsrtpif.la \
+-	@SDL_LIBS@ @SRTPLIB@
++	@SDL_LIBS@ -lX11 @SRTPLIB@
+ 
+ gmp4player_LDFLAGS= $(SDL_AUDIO_FLAGS)
+ gmp4player_LDADD = $(mp4player_LDADD) \
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-newffmpeg.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-newffmpeg.patch
new file mode 100644
index 000000000000..97678d317351
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-newffmpeg.patch
@@ -0,0 +1,22 @@
+--- player/plugin/audio/ffmpeg/ffmpeg.cpp.orig	2006-11-18 12:34:36.000000000 -0500
++++ player/plugin/audio/ffmpeg/ffmpeg.cpp	2006-11-18 12:34:50.000000000 -0500
+@@ -166,7 +166,7 @@
+     break;
+   }
+   if (userdata) {
+-    ffmpeg->m_c->extradata = (void *)userdata;
++    ffmpeg->m_c->extradata = const_cast<uint8_t*>(userdata);
+     ffmpeg->m_c->extradata_size = ud_size;
+   }
+   if (avcodec_open(ffmpeg->m_c, ffmpeg->m_codec) < 0) {
+--- player/plugin/video/ffmpeg/ffmpeg.cpp.orig	2006-11-18 14:48:11.000000000 -0500
++++ player/plugin/video/ffmpeg/ffmpeg.cpp	2006-11-18 14:49:22.000000000 -0500
+@@ -255,7 +255,7 @@
+   }
+     break;
+   case CODEC_ID_SVQ3:
+-    ffmpeg->m_c->extradata = (void *)userdata;
++    ffmpeg->m_c->extradata = const_cast<uint8_t*>(userdata);
+     ffmpeg->m_c->extradata_size = ud_size;
+     if (vinfo != NULL) {
+       ffmpeg->m_c->width = vinfo->width;
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
index 2b7b6fa196a1..be5e09ac8662 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild,v 1.1 2006/11/11 20:29:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild,v 1.2 2006/11/18 21:11:19 tester Exp $
 
-inherit eutils multilib
+inherit eutils multilib autotools
 
 DESCRIPTION="MPEG 4 implementation library"
 
@@ -60,8 +60,12 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch
+	epatch "${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch"
 	epatch "${FILESDIR}/${P}-x264.patch"
+	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-newffmpeg.patch"
+	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-lX11.patch"
+
+	eautomake
 }
 
 src_compile() {