diff options
| -rw-r--r-- | media-video/mpeg4ip/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/mpeg4ip/Manifest | 29 | ||||
| -rw-r--r-- | media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r3 | 3 | ||||
| -rw-r--r-- | media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-nasm-r.patch | 23 | ||||
| -rw-r--r-- | media-video/mpeg4ip/mpeg4ip-1.5.0.1-r3.ebuild | 147 |
5 files changed, 196 insertions, 16 deletions
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog index 8e0be2d557f8..7cbe5cb662f0 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.53 2007/11/27 15:10:56 zzam Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.54 2008/01/09 17:52:15 beandog Exp $ + +*mpeg4ip-1.5.0.1-r3 (09 Jan 2008) + + 09 Jan 2008; Steve Dibb <beandog@gentoo.org> + +files/mpeg4ip-1.5.0.1-nasm-r.patch, +mpeg4ip-1.5.0.1-r3.ebuild: + Fix nasm detection, bug 204505 27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> mpeg4ip-1.5.0.1-r1.ebuild, mpeg4ip-1.5.0.1-r2.ebuild: diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest index f8b45f42840e..e8827f3f6166 100644 --- a/media-video/mpeg4ip/Manifest +++ b/media-video/mpeg4ip/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX mpeg4ip-1.4.1-disable-faac-test.patch 1149 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 SHA1 a84ae2a263374edbe104c682fd2db385ff1145ca SHA256 cbe9093e82530731e4dc53973c62e3879b7297199f52f25b7d0317cfe4c0d2ba MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149 @@ -21,6 +18,10 @@ AUX mpeg4ip-1.5.0.1-lX11.patch 418 RMD160 931eac8523d5a5b594571887ab4792e9dbe544 MD5 199ffbaa7e96920c6cce6672f4102bb9 files/mpeg4ip-1.5.0.1-lX11.patch 418 RMD160 931eac8523d5a5b594571887ab4792e9dbe544f3 files/mpeg4ip-1.5.0.1-lX11.patch 418 SHA256 c34ab2bf8304fa223a20c2baacb83cc5a2ec7ef427cba8db7318f21b0f280f5a files/mpeg4ip-1.5.0.1-lX11.patch 418 +AUX mpeg4ip-1.5.0.1-nasm-r.patch 975 RMD160 802ee1fb337b4002aad354d80b1bbd74ebb7b76f SHA1 e3635c89f78324a6e38e294138c1168c393e7391 SHA256 f376560ab041a09ba128a94872419e393e06820956643b56ece3a4324a9b49cc +MD5 e1fc28a886b3612bbe8a6e3b21fe2ad9 files/mpeg4ip-1.5.0.1-nasm-r.patch 975 +RMD160 802ee1fb337b4002aad354d80b1bbd74ebb7b76f files/mpeg4ip-1.5.0.1-nasm-r.patch 975 +SHA256 f376560ab041a09ba128a94872419e393e06820956643b56ece3a4324a9b49cc files/mpeg4ip-1.5.0.1-nasm-r.patch 975 AUX mpeg4ip-1.5.0.1-newffmpeg.patch 876 RMD160 d83e4407dc5110ed506210a09f7c72e24034cf44 SHA1 de3a2ef12a3b2d57c08a8ad25c3a21310c6ed2d5 SHA256 b5f6aa63c2e711640dbf81def6b34fcafc51cac5e412ccfe0faa131e6e728281 MD5 14b5039f2e57d8d127a505f9bc228796 files/mpeg4ip-1.5.0.1-newffmpeg.patch 876 RMD160 d83e4407dc5110ed506210a09f7c72e24034cf44 files/mpeg4ip-1.5.0.1-newffmpeg.patch 876 @@ -38,10 +39,14 @@ EBUILD mpeg4ip-1.5.0.1-r2.ebuild 3751 RMD160 b0359132778198192b580cc38ada7541cbe MD5 1305e77e7711d1cf98cb77091c98f96f mpeg4ip-1.5.0.1-r2.ebuild 3751 RMD160 b0359132778198192b580cc38ada7541cbe564eb mpeg4ip-1.5.0.1-r2.ebuild 3751 SHA256 b7f3288e7309661af0672359b824bfcd9ccb9e42187adb641acccaa9078503ba mpeg4ip-1.5.0.1-r2.ebuild 3751 -MISC ChangeLog 8885 RMD160 101ec8fb1a5cf1da392e922a8e2b7a6801d227c9 SHA1 b28862bc9d00ffa2159369c12f574e48c46c308e SHA256 31b2674848b05a1aecd1a027385fc67d1a6dd8687f3ce20f1d21f30cfe4fa512 -MD5 e9839c961c5a703632b4cd2abae8c4ef ChangeLog 8885 -RMD160 101ec8fb1a5cf1da392e922a8e2b7a6801d227c9 ChangeLog 8885 -SHA256 31b2674848b05a1aecd1a027385fc67d1a6dd8687f3ce20f1d21f30cfe4fa512 ChangeLog 8885 +EBUILD mpeg4ip-1.5.0.1-r3.ebuild 3788 RMD160 97f7deaada73de35474534abd987a7ab278b5090 SHA1 23c8e4dfe851d81d3fdf7496691f27b9b72bdc99 SHA256 1913742a3e501a2e647dc6abf1773e4cd7376201cc48fc74a59bd91bb67d71bb +MD5 0d8efbf227a10a664dcf45b47ea221e9 mpeg4ip-1.5.0.1-r3.ebuild 3788 +RMD160 97f7deaada73de35474534abd987a7ab278b5090 mpeg4ip-1.5.0.1-r3.ebuild 3788 +SHA256 1913742a3e501a2e647dc6abf1773e4cd7376201cc48fc74a59bd91bb67d71bb mpeg4ip-1.5.0.1-r3.ebuild 3788 +MISC ChangeLog 9071 RMD160 26c98d2127e1d7cb56443472d0e215951c406269 SHA1 1880ab2b620f0592035d9134819045bb09e5c9fb SHA256 a276dd724344245fa7a7d552fd600cc5ad9d48c4703dbd820e9707688a60c353 +MD5 eeba68bccc09556fa75c5583c52566d3 ChangeLog 9071 +RMD160 26c98d2127e1d7cb56443472d0e215951c406269 ChangeLog 9071 +SHA256 a276dd724344245fa7a7d552fd600cc5ad9d48c4703dbd820e9707688a60c353 ChangeLog 9071 MISC metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 SHA1 ab610963bd3bcba3a951090a167f9fd5755b6cde SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 metadata.xml 255 @@ -52,10 +57,6 @@ SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/di 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 v2.0.7 (GNU/Linux) - -iD8DBQFHTDOHt2vP6XvVdOcRAsHHAKDSVCnSySzYyJ6Pzs0/ueLaLSvF5QCgyWkh -oLz6Bv7+MtVBhMjJK5hlVDA= -=lJLB ------END PGP SIGNATURE----- +MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r3 250 +RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r3 250 +SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r3 250 diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r3 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r3 new file mode 100644 index 000000000000..c15cf36b860f --- /dev/null +++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r3 @@ -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-nasm-r.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-nasm-r.patch new file mode 100644 index 000000000000..bb8ddf74bca7 --- /dev/null +++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-nasm-r.patch @@ -0,0 +1,23 @@ +diff -ru mpeg4ip-1.5.0.1-orig/configure.in mpeg4ip-1.5.0.1/configure.in +--- mpeg4ip-1.5.0.1-orig/configure.in 2006-06-08 15:15:16.000000000 -0400 ++++ mpeg4ip-1.5.0.1/configure.in 2008-01-05 19:25:01.000000000 -0500 +@@ -682,7 +682,7 @@ + + if test x$USENASM = xtrue; then + AC_MSG_CHECKING(nasm version...) +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`nasm -v | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true +diff -ru mpeg4ip-1.5.0.1-orig/util/testlame.sh mpeg4ip-1.5.0.1/util/testlame.sh +--- mpeg4ip-1.5.0.1-orig/util/testlame.sh 2002-10-07 14:47:00.000000000 -0400 ++++ mpeg4ip-1.5.0.1/util/testlame.sh 2008-01-05 21:00:44.000000000 -0500 +@@ -1,6 +1,6 @@ + # + # shell to verify nasm version +-# nasm -r has format "NASM version <foo> <extra stuff>" ++# nasm -v has format "NASM version <foo> <extra stuff>" + # + # This shell looks for version, then sees if we're 0.98.19 or greater + # diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r3.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r3.ebuild new file mode 100644 index 000000000000..831d76255509 --- /dev/null +++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r3.ebuild @@ -0,0 +1,147 @@ +# 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-r3.ebuild,v 1.1 2008/01/09 17:52:15 beandog 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 ) + 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" + epatch "${FILESDIR}/${P}-gcc42.patch" + epatch "${FILESDIR}/${P}-nasm-r.patch" + + eautoreconf +} + +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 + +} |