Add --as-need patch from Gergan Penkov, fixes bug #129472

(Portage version: 2.1.2.2)

4 files changed, 298 insertions, 1 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 0e5562da969d..071a24697d0c 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.49 2007/03/10 12:11:24 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.50 2007/04/17 21:28:36 tester Exp $
+
+*mpeg4ip-1.5.0.1-r2 (17 Apr 2007)
+
+  17 Apr 2007; <tester@gentoo.org> +files/mpeg4ip-1.5.0.1-as-needed.patch,
+  +mpeg4ip-1.5.0.1-r2.ebuild:
+  Add --as-need patch from Gergan Penkov, fixes bug #129472
 
   10 Mar 2007; Matti Bickel <mabi@gentoo.org> mpeg4ip-1.5.0.1-r1.ebuild:
   ppc stable (bug #166539)
diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r2 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r2
new file mode 100644
index 000000000000..c15cf36b860f
--- /dev/null
+++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r2
@@ -0,0 +1,3 @@
+MD5 f53b06c62e914ab724bda9d9af041e08 mpeg4ip-1.5.0.1.tar.gz 4826180
+RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a mpeg4ip-1.5.0.1.tar.gz 4826180
+SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6 mpeg4ip-1.5.0.1.tar.gz 4826180
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-as-needed.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-as-needed.patch
new file mode 100644
index 000000000000..6cc9dbaa8430
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-as-needed.patch
@@ -0,0 +1,132 @@
+--- lib/mpeg2ps/Makefile.am.orig	2005-09-28 22:38:27.000000000 +0200
++++ lib/mpeg2ps/Makefile.am	2006-06-10 21:08:09.000000000 +0200
+@@ -11,11 +11,10 @@
+ AM_CXXFLAGS = -D_REENTRANT @BILLS_CPPWARNINGS@
+ 
+ bin_PROGRAMS = mpeg_ps_info mpeg_ps_extract
+-prog_libadd = \
+-	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
++prog_libadd = libmpeg2_program.la \
+ 	$(top_builddir)/lib/mp4av/libmp4av.la \
+ 	$(top_builddir)/lib/mp4v2/libmp4v2.la \
+-	libmpeg2_program.la 
++	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la
+ 
+ mpeg_ps_info_SOURCES = ps_info.cpp
+ mpeg_ps_info_LDADD = $(prog_libadd)
+@@ -25,10 +24,9 @@
+ 
+ mpeg2ps_test_SOURCES = test.cpp
+ mpeg2ps_test_LDADD = libmpeg2_program.la \
+-	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ 	$(top_builddir)/lib/mp4av/libmp4av.la \
+ 	$(top_builddir)/lib/mp4v2/libmp4v2.la \
+-	libmpeg2_program.la 
++	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la
+ 
+ EXTRA_DIST=libmpeg2ps.dsp
+ 
+--- lib/mp4av/Makefile.am.orig	2006-05-11 20:17:56.000000000 +0200
++++ lib/mp4av/Makefile.am	2006-06-10 23:00:01.000000000 +0200
+@@ -49,5 +49,8 @@
+ 	rfch264.cpp
+ 
+ 
++libmp4av_la_LIBADD = \
++	$(top_builddir)/lib/mp4v2/libmp4v2.la
++
+ EXTRA_DIST = libmp4av.dsp
+ 
+--- lib/Makefile.am.orig	2006-03-21 00:08:20.000000000 +0100
++++ lib/Makefile.am	2006-06-10 23:44:39.000000000 +0200
+@@ -8,4 +8,4 @@
+ endif
+ endif
+ 
+-SUBDIRS = utils audio avi fposrec gnu ismacryp mp4av mp4 mp4v2 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir) 
++SUBDIRS = utils audio avi fposrec gnu ismacryp mp4 mp4v2 mp4av mp4v2/util msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir) 
+--- lib/mp4v2/Makefile.am	2006-06-11 00:02:16.000000000 +0200
++++ lib/mp4v2/Makefile.am.orig	2006-05-11 20:17:56.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = . test util
++SUBDIRS = . test
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
+--- configure.in.orig	2006-05-11 20:18:04.000000000 +0200
++++ configure.in	2006-06-11 02:15:47.000000000 +0200
+@@ -351,6 +351,21 @@
+ [player=true])
+ AM_CONDITIONAL(PLAYER, [test x$player = xtrue])
+ 
++dnl We need -lX11 as they are using XMoveWindow from it
++if test $player=true ; then
++    dnl Xorg or XFree86
++    AC_PATH_XTRA
++    
++    if test "$no_x" = "yes" ; then
++        AC_MSG_WARN([--enable-player was passed to configure, but we will not build it because the X11 headers/libraries were not found])
++	player=false
++    else
++        XLIB_LIBS='$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)'
++    fi
++    
++    AC_SUBST([XLIB_LIBS])
++fi
++
+ #autoconf is slightly confusing here: 
+ #enableval will be 'no' if --disable-* is present and '' if it isn't
+ AC_ARG_ENABLE(srtp,[AC_HELP_STRING([--disable-srtp],[disable use of installed SRTP library])],
+--- server/mp4live/Makefile.am.orig	2006-03-21 00:08:29.000000000 +0100
++++ server/mp4live/Makefile.am	2006-06-11 02:51:43.000000000 +0200
+@@ -151,12 +151,8 @@
+ 	-D_REENTRANT -DNOCONTROLS -fexceptions @BILLS_CPPWARNINGS@ 
+ 
+ mp4live_LDADD = \
+-	@GTK_LIBS@ @GLIB_LIBS@ \
+-	@FAAC_LIB@ \
+-	@LAME_LIB@ \
+-	./h261/libmp4live_h261.la \
+ 	$(GUIADD) \
+ 	libmp4live.la \
+ 	$(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \
+ 	$(top_builddir)/lib/msg_queue/libmsg_queue.la \
+ 	$(top_builddir)/lib/mp4v2/libmp4v2.la \
+@@ -166,9 +160,14 @@
+ 	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ 	$(top_builddir)/lib/utils/libutils.la \
+ 	$(top_builddir)/lib/srtp/libsrtpif.la \
+-	@SRTPLIB@ \
+-	-lpthread \
++	./h261/libmp4live_h261.la \
+ 	@SDL_LIBS@ $(GUILIBS) @FFMPEG_LIB@ @LIBVORBIS_LIB@ $(XVID_LIB) \
+-	@X264_LIB@ 
++	@GTK_LIBS@ @GLIB_LIBS@ \
++	@FAAC_LIB@ \
++	@LAME_LIB@ \
++	@SRTPLIB@ \
++	@X264_LIB@ \
++	-lpthread
++
+ 
+ EXTRA_DIST = $(ed2) video_v4l_source.cpp 
+--- player/src/Makefile.am.orig	2007-04-17 16:58:13.000000000 -0400
++++ player/src/Makefile.am	2007-04-17 17:03:27.000000000 -0400
+@@ -196,7 +196,6 @@
+ 
+ mp4player_LDFLAGS = $(SDL_AUDIO_FLAGS)
+ mp4player_LDADD = \
+-	-lm $(SDL_AUDIO_LIB) \
+ 	libmp4player.la \
+ 	libmp4syncbase.la \
+ 	libmp4syncsdl.la \
+@@ -206,7 +205,8 @@
+ 	$(top_builddir)/lib/audio/libaudio.la \
+ 	$(top_builddir)/lib/ismacryp/libismacryp.la \
+ 	$(top_builddir)/lib/srtp/libsrtpif.la \
+-	@SDL_LIBS@ -lX11 @SRTPLIB@
++	$(SDL_AUDIO_LIB) -lm \
++	@SDL_LIBS@ @XLIB_LIBS@ @SRTPLIB@
+ 
+ gmp4player_LDFLAGS= $(SDL_AUDIO_FLAGS)
+ gmp4player_LDADD = $(mp4player_LDADD) \
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
new file mode 100644
index 000000000000..b1a05be14fb8
--- /dev/null
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/04/17 21:28:36 tester 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.7 )
+		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.7 )
+		x264? ( media-libs/x264-svn )
+	)
+	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
+	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"
+	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-as-needed.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	cd ${S}
+
+	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 () {
+	cd ${S}
+	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
+
+}