From: Olivier Crête Date: Tue, 17 Apr 2007 21:28:36 +0000 (+0000) Subject: Add --as-need patch from Gergan Penkov, fixes bug #129472 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8019ecf9427808721ff126bba083bc5e14f9c1a;p=gentoo.git Add --as-need patch from Gergan Penkov, fixes bug #129472 Package-Manager: portage-2.1.2.2 --- 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; +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 mpeg4ip-1.5.0.1-r1.ebuild: ppc stable (bug #166539) diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest index 53aa4f2eed19..e1e2ec245302 100644 --- a/media-video/mpeg4ip/Manifest +++ b/media-video/mpeg4ip/Manifest @@ -9,6 +9,10 @@ AUX mpeg4ip-1.4.1-gcc41.patch 5332 RMD160 c23b8af9f13f6fdb5e65d20276a6632464c514 MD5 75ef8fbc1d49d5a13a8f6ece3b8fff78 files/mpeg4ip-1.4.1-gcc41.patch 5332 RMD160 c23b8af9f13f6fdb5e65d20276a6632464c51416 files/mpeg4ip-1.4.1-gcc41.patch 5332 SHA256 a4ce2cfd0448c03cec335d46099fdca7b3aed7ea75395dce8b97e38f816a5219 files/mpeg4ip-1.4.1-gcc41.patch 5332 +AUX mpeg4ip-1.5.0.1-as-needed.patch 4197 RMD160 3a55f0ce40c5e771df88307cf08b8f912cfb06e1 SHA1 161b787a7be3495e498d6896c57dfc472d442d37 SHA256 b95921dbae1c4b0964b90698605a7dff1886f792e347c3ad0518b705fcf25aa9 +MD5 1377c5577684c189977dd42bcb8734c2 files/mpeg4ip-1.5.0.1-as-needed.patch 4197 +RMD160 3a55f0ce40c5e771df88307cf08b8f912cfb06e1 files/mpeg4ip-1.5.0.1-as-needed.patch 4197 +SHA256 b95921dbae1c4b0964b90698605a7dff1886f792e347c3ad0518b705fcf25aa9 files/mpeg4ip-1.5.0.1-as-needed.patch 4197 AUX mpeg4ip-1.5.0.1-lX11.patch 418 RMD160 931eac8523d5a5b594571887ab4792e9dbe544f3 SHA1 dc73ae37cb4569a7476c2cd25ba11cf96a6c0919 SHA256 c34ab2bf8304fa223a20c2baacb83cc5a2ec7ef427cba8db7318f21b0f280f5a MD5 199ffbaa7e96920c6cce6672f4102bb9 files/mpeg4ip-1.5.0.1-lX11.patch 418 RMD160 931eac8523d5a5b594571887ab4792e9dbe544f3 files/mpeg4ip-1.5.0.1-lX11.patch 418 @@ -35,10 +39,14 @@ EBUILD mpeg4ip-1.5.0.1-r1.ebuild 3687 RMD160 50b949ea63ff8148e2835020ed49239fe14 MD5 bd3d3a8e1b92b91fdafca2c49598fb2d mpeg4ip-1.5.0.1-r1.ebuild 3687 RMD160 50b949ea63ff8148e2835020ed49239fe1466d99 mpeg4ip-1.5.0.1-r1.ebuild 3687 SHA256 374fbff92fee480c612d5812a98a7f9b98d8b0c9e7cdf02491300dd422304db5 mpeg4ip-1.5.0.1-r1.ebuild 3687 -MISC ChangeLog 8172 RMD160 ae2d7a18fdb2bd91d46240dd93b17fad027abb9a SHA1 cc47a69de51b8dfc5b63ad9ce0916fe3e6466375 SHA256 fc88554a0f2a4a8e0f120dc5553bf9cd1c148d7cf03480ebca0ab32a2c738e06 -MD5 161015387e524518cf7c97d58f1a8133 ChangeLog 8172 -RMD160 ae2d7a18fdb2bd91d46240dd93b17fad027abb9a ChangeLog 8172 -SHA256 fc88554a0f2a4a8e0f120dc5553bf9cd1c148d7cf03480ebca0ab32a2c738e06 ChangeLog 8172 +EBUILD mpeg4ip-1.5.0.1-r2.ebuild 3748 RMD160 f151e19e9059e5b9e697007e9bf287ee536aeb1b SHA1 b3f5f0c5cd06a284d3cb5d3130f6066589817e22 SHA256 c7c57d6bf603ed244e22413ed943c62f8ab27773fc857d662a42e2a09430ad84 +MD5 91773b62e2b8255a3222b03e3e2982f7 mpeg4ip-1.5.0.1-r2.ebuild 3748 +RMD160 f151e19e9059e5b9e697007e9bf287ee536aeb1b mpeg4ip-1.5.0.1-r2.ebuild 3748 +SHA256 c7c57d6bf603ed244e22413ed943c62f8ab27773fc857d662a42e2a09430ad84 mpeg4ip-1.5.0.1-r2.ebuild 3748 +MISC ChangeLog 8375 RMD160 3b36813593184bfaf6c590862a52054584dce308 SHA1 7dbcb0c103c96c213187b9662bcda9d324fbdced SHA256 2e5f097e881e126fcc430f71e525afb85e7c6f07345329ec2950387eadc86214 +MD5 281fc153eaa2b3fc277a2b9609f8c346 ChangeLog 8375 +RMD160 3b36813593184bfaf6c590862a52054584dce308 ChangeLog 8375 +SHA256 2e5f097e881e126fcc430f71e525afb85e7c6f07345329ec2950387eadc86214 ChangeLog 8375 MISC metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 SHA1 ab610963bd3bcba3a951090a167f9fd5755b6cde SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 metadata.xml 255 @@ -52,10 +60,13 @@ SHA256 1ffffd6707a54c8f378bfcd9616bef82c93d6d15bb56d1e582e8297ccf887c03 files/di MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r1 250 RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r1 250 SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r1 250 +MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r2 250 +RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r2 250 +SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r2 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF8qAxfNMcoUhJ7GwRAvq/AJ9jTv9HTsCSql3YF0c4oE2Ygx81tQCgiskO -w7pEdevx44t7Zm1567AfW4g= -=m83n +iD8DBQFGJTwY+IXOQtHLm/gRAn4iAJ0Tw2BoeGzqzhJUSJ4gPbz7Iek9lQCeLtso +ILr6cBFHaD88yZWQ11T4lrU= +=FV/d -----END PGP SIGNATURE----- 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 + !