Apply swscale and lavc patchset from bug 242094, thanks to Alexis Ballier and Thomas S. Howard.

(Portage version: 2.1.6/cvs/Linux 2.6.27.7 i686)

4 files changed, 77 insertions, 154 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 64791b4f7a66..cd78f97c1114 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.64 2008/11/30 17:36:42 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.65 2008/12/12 05:01:59 ssuominen Exp $
+
+*mpeg4ip-1.5.0.1-r6 (12 Dec 2008)
+
+  12 Dec 2008; <ssuominen@gentoo.org>
+  +files/mpeg4ip-1.5.0.1-swscale_and_lavc.patch, +mpeg4ip-1.5.0.1-r6.ebuild:
+  Apply swscale and lavc patchset from bug 242094, thanks to Alexis Ballier
+  and Thomas S. Howard.
 
   30 Nov 2008; Robert Buchholz <rbu@gentoo.org>
   files/mpeg4ip-1.5.0.1-x264.patch:
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-swscale_and_lavc.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-swscale_and_lavc.patch
new file mode 100644
index 000000000000..dbd4f65dace4
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-swscale_and_lavc.patch
@@ -0,0 +1,65 @@
+--- mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.cpp.orig	2008-10-15 20:28:08.000000000 -0700
++++ mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.cpp	2008-10-15 20:31:06.000000000 -0700
+@@ -214,7 +214,8 @@
+   uint32_t freq_ts = pts->audio_freq_timestamp;
+ 
+   do {
+-    used = avcodec_decode_audio(ffmpeg->m_c, (short *)ffmpeg->m_outbuf,
++    outsize=AVCODEC_MAX_AUDIO_FRAME_SIZE;
++    used = avcodec_decode_audio2(ffmpeg->m_c, (short *)ffmpeg->m_outbuf,
+ 				&outsize, buffer, left);
+     if (used < 0) {
+       ffmpeg_message(LOG_DEBUG, "ffmpeg", "failed to decode at "U64, 
+--- mpeg4ip-1.5.0.1/configure.in.orig	2008-10-15 12:39:56.000000000 -0700
++++ mpeg4ip-1.5.0.1/configure.in	2008-10-15 12:42:39.000000000 -0700
+@@ -509,7 +509,7 @@
+      if test x$have_ffmpeg = xtrue; then
+         AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
+         FFMPEG_INC=
+-        FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
++        FFMPEG_LIB="-lavcodec -lswscale -lz $ffmpeg_add_libs"
+         AC_CHECK_TYPES([AVRational], , , [#include <libavcodec/avcodec.h>])
+ 	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <libavcodec/avcodec.h>])
+         AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])
+--- mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h.orig	2008-10-15 12:33:59.000000000 -0700
++++ mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h	2008-10-15 12:34:10.000000000 -0700
+@@ -27,6 +27,7 @@
+ #ifdef HAVE_FFMPEG_INSTALLED
+ extern "C" {
+ #include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+ }
+ #else
+ extern "C" {
+--- mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.cpp.orig	2008-10-15 12:16:22.000000000 -0700
++++ mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.cpp	2008-10-15 12:27:22.000000000 -0700
+@@ -565,10 +565,25 @@
+ 	from.data[ix] = ffmpeg->m_picture->data[ix];
+ 	from.linesize[ix] = ffmpeg->m_picture->linesize[ix];
+       }
+-      
+-      img_convert(&to, PIX_FMT_YUV420P,
+-		  &from, ffmpeg->m_c->pix_fmt,
+-		  ffmpeg->m_c->width, ffmpeg->m_c->height);
++
++      SwsContext *img_cvt_ctx;
++      img_cvt_ctx = sws_getContext(ffmpeg->m_c->width,
++		      		   ffmpeg->m_c->height,
++ 			           ffmpeg->m_c->pix_fmt,
++		      	           ffmpeg->m_c->width,
++				   ffmpeg->m_c->height, 
++	                           PIX_FMT_YUV420P,
++				   SWS_BICUBIC,
++				   0, 0, 0);
++      sws_scale(img_cvt_ctx,
++		from.data,
++		from.linesize,
++		0,
++		ffmpeg->m_c->height,
++		to.data,
++		to.linesize);
++      sws_freeContext(img_cvt_ctx);
++
+       ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr,
+ 					 ffmpeg->have_cached_ts ?
+ 					 ffmpeg->cached_ts : ts);
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
deleted file mode 100644
index 0b6da789c564..000000000000
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2008 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.12 2008/07/13 16:37:51 loki_val Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="MPEG 4 implementation library"
-
-HOMEPAGE="http://www.mpeg4ip.net/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
-
-SLOT="0"
-
-KEYWORDS="amd64 ppc x86"
-
-IUSE="ipv6 mmx v4l2 xvid nas alsa esd arts ffmpeg a52 mpeg2 lame aac id3 player mp4live x264"
-
-RDEPEND=" media-libs/libsdl
-	player? (
-		>=x11-libs/gtk+-2
-		ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
-		mpeg2? ( media-libs/libmpeg2 )
-		id3? ( media-libs/libid3tag )
-		a52? ( media-libs/a52dec )
-	)
-	xvid? ( >=media-libs/xvid-0.9.8 )
-	mp4live? (
-		>=x11-libs/gtk+-2
-		lame? ( >=media-sound/lame-3.92 )
-		aac? ( >=media-libs/faac-1.24-r1 )
-		ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
-		x264? ( media-libs/x264 )
-	)
-	nas? ( media-libs/nas x11-libs/libXt )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	esd? ( media-sound/esound )
-	=media-libs/libmp4v2-1.5.0.1*
-	!<media-libs/faad2-2.0-r9 "
-
-DEPEND="${RDEPEND}
-	player? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )"
-
-pkg_setup() {
-	if ! built_with_use media-libs/libsdl X;
-	then
-		eerror "media-libs/libsdl does not has X support"
-		eerror "You need to rebuild media-libs/libsdl with USE=X"
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	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() {
-	local myconf
-	myconf=" --datadir=/usr/share/mpeg4ip
-			$(use_enable ipv6)
-			$(use_enable ppc)
-			$(use_enable player)
-			$(use_enable mp4live)
-			$(use_enable xvid)
-			$(use_enable nas)
-			$(use_enable esd)
-			$(use_enable alsa)
-			$(use_enable arts)
-			--disable-srtp" # need ot add libsrtp to portage
-
-	# Those are possible for both player and mp4live
-	if use player || use mp4live ; then
-		myconf="${myconf} --enable-gtk-glib
-			$(use_enable ffmpeg)"
-	fi
-
-	# Those are only relevant for the player
-	use player && myconf="${myconf}
-			$(use_enable mmx)
-			$(use_enable a52 a52dec)
-			$(use_enable mpeg2 mpeg2dec)
-			$(use_enable id3 id3tags)"
-	use player || myconf="${myconf}
-			--disable-a52
-			--disable-mmx
-			--disable-mpeg2dec
-			--disable-id3tags"
-
-	# those can only be used for mp4live
-	use mp4live && myconf="${myconf}
-			$(use_enable v4l2)
-			$(use_enable lame mp3lame)
-			$(use_enable aac faac)
-			$(use_enable x264)"
-			# $(use_enable alsa mp4live-alsa)
-	use mp4live || myconf="${myconf}
-			--disable-v4l2
-			--disable-mp3lame
-			--disable-faac
-			--disable-mp4live-alsa
-			--disable-x264"
-
-	./bootstrap --prefix=/usr \
-		--host=${CHOST} \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var/lib \
-		--disable-warns-as-err \
-		--enable-server \
-		${EXTRA_ECONF} \
-		${myconf} || die "configure failed"
-
-	sed -i -e 's:-Werror::' common/video/iso-mpeg4/src/Makefile || die "sed failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	rm -f "${D}"/usr/include/mp4.h
-	rm -f "${D}"/usr/$(get_libdir)/libmp4v2*
-
-	dodoc doc/MPEG4IP_Guide.pdf doc/*txt AUTHORS TODO
-
-	dohtml doc/*.html FEATURES.html || die
-
-	docinto ietf
-	dodoc doc/ietf/*.txt || die
-
-	docinto mcast
-	dodoc doc/mcast/mcast.txt doc/mcast/mcast_example doc/mcast/playlist_example || die
-
-}
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r5.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r6.ebuild
index d9c2bb3af2fd..9517ee1b1054 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r5.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r5.ebuild,v 1.2 2008/07/13 16:37:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r6.ebuild,v 1.1 2008/12/12 05:01:59 ssuominen Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -17,7 +17,7 @@ IUSE="ipv6 mmx v4l2 xvid nas alsa esd arts ffmpeg a52 mpeg2 lame aac id3 player
 RDEPEND=" media-libs/libsdl
 	player? (
 		>=x11-libs/gtk+-2
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20081014 )
 		mpeg2? ( media-libs/libmpeg2 )
 		id3? ( media-libs/libid3tag )
 		a52? ( media-libs/a52dec )
@@ -27,7 +27,7 @@ RDEPEND=" media-libs/libsdl
 		>=x11-libs/gtk+-2
 		lame? ( >=media-sound/lame-3.92 )
 		aac? ( >=media-libs/faac-1.24-r1 )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20081014 )
 		x264? ( media-libs/x264 )
 	)
 	nas? ( media-libs/nas x11-libs/libXt )
@@ -67,6 +67,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-nasm-r.patch"
 	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-avcodec_extern_c-2.patch"
 	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+	epatch "${FILESDIR}/${P}-swscale_and_lavc.patch"
 
 	find "${S}" -name Makefile.am -print0 | xargs -0 \
 		sed -i -e 's:-Werror::'