From 1d04dee46ca70572a865f131b8726d6708eed3d1 Mon Sep 17 00:00:00 2001 From: Olivier Crête Date: Fri, 11 Nov 2005 06:47:55 +0000 Subject: Version bump (Portage version: 2.0.51.22-r3) --- media-video/mpeg4ip/ChangeLog | 8 +- media-video/mpeg4ip/Manifest | 12 +-- media-video/mpeg4ip/files/digest-mpeg4ip-1.4 | 1 - media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1 | 1 + media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild | 141 +++++++++++++++++++++++++ media-video/mpeg4ip/mpeg4ip-1.4.ebuild | 141 ------------------------- 6 files changed, 151 insertions(+), 153 deletions(-) delete mode 100644 media-video/mpeg4ip/files/digest-mpeg4ip-1.4 create mode 100644 media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1 create mode 100644 media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild delete mode 100644 media-video/mpeg4ip/mpeg4ip-1.4.ebuild (limited to 'media-video/mpeg4ip') diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog index f1c50262656e..a80db0d1aea5 100644 --- a/media-video/mpeg4ip/ChangeLog +++ b/media-video/mpeg4ip/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/mpeg4ip # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.26 2005/11/10 06:15:21 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.27 2005/11/11 06:47:55 tester Exp $ + +*mpeg4ip-1.4.1 (11 Nov 2005) + + 11 Nov 2005; Olivier Crête -mpeg4ip-1.4.ebuild, + +mpeg4ip-1.4.1.ebuild: + Version bump 10 Nov 2005; Olivier Crête -files/mpeg4ip-1.2-mp4encode-template-path.patch, -mpeg4ip-1.0.ebuild, diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest index 93f290671b57..4026d2bab28d 100644 --- a/media-video/mpeg4ip/Manifest +++ b/media-video/mpeg4ip/Manifest @@ -1,20 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 31544d8d7b7e74d1dc0c885b357daa18 mpeg4ip-1.1.ebuild 1756 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255 MD5 c1f9a00878a142b8cea5dc4b1b731179 ChangeLog 4569 +MD5 47ba081d8a0cf6b169eb2309895ee6f5 mpeg4ip-1.4.1.ebuild 3306 MD5 3152b9a0685b9506c5ccd32eef11376c mpeg4ip-1.3.ebuild 3165 MD5 47ba081d8a0cf6b169eb2309895ee6f5 mpeg4ip-1.4.ebuild 3306 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844 +MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1 66 MD5 7a57c3fac558a74a94814986d16cc6dc files/digest-mpeg4ip-1.4 64 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64 MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110 MD5 9dc5a82373d611ff96499fe69690fe62 files/digest-mpeg4ip-1.3 64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDcuWLmOfEJZHYOKcRAvL4AKC4eiAOVdp8gYbU2c/m6qzdep5ZcACgpJWP -hqo8j63u+WdpSfBn2mCrZJM= -=+JDJ ------END PGP SIGNATURE----- diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.4 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.4 deleted file mode 100644 index 793608e61f35..000000000000 --- a/media-video/mpeg4ip/files/digest-mpeg4ip-1.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 69474e97e6783df4fe61fd7198638a76 mpeg4ip-1.4.tar.gz 4790940 diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1 new file mode 100644 index 000000000000..bb02c4581bae --- /dev/null +++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.4.1 @@ -0,0 +1 @@ +MD5 68968c23c7e9d23cac11f15f3bcf7ede mpeg4ip-1.4.1.tar.gz 4791075 diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild new file mode 100644 index 000000000000..01a913f0f0cd --- /dev/null +++ b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.1 2005/11/11 06:47:55 tester Exp $ + +inherit eutils multilib + +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="~x86 ~amd64" + +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.20.1 ) + ffmpeg? ( >=media-video/ffmpeg-0.4.7 ) + x264? ( media-libs/x264-svn ) + ) + nas? ( media-libs/nas virtual/x11 ) + alsa? ( media-libs/alsa-lib ) + arts? ( kde-base/arts ) + esd? ( media-sound/esound ) + !media-libs/faad2 " + +DEPEND="${RDEPEND} + sys-devel/libtool + sys-devel/autoconf + sys-devel/automake + player? ( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )" + + +pkg_setup() { + if use aac && [ -r /usr/lib/libfaac.la ] && + grep -q /usr/lib/libmp4v2.la /usr/lib/libfaac.la; then + eerror "libfaac is compiled against libmp4v2" + eerror "Please unmerge faad2 and mpeg4ip then recompile faac" + die + fi + +} + +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" + + + emake || die "make failed" +} + +src_install () { + cd ${S} + make install DESTDIR="${D}" || die "make install failed" + + 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.4.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.ebuild deleted file mode 100644 index a0a58b8d2103..000000000000 --- a/media-video/mpeg4ip/mpeg4ip-1.4.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.ebuild,v 1.2 2005/11/10 06:15:21 tester Exp $ - -inherit eutils multilib - -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="~x86 ~amd64" - -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.20.1 ) - ffmpeg? ( >=media-video/ffmpeg-0.4.7 ) - x264? ( media-libs/x264-svn ) - ) - nas? ( media-libs/nas virtual/x11 ) - alsa? ( media-libs/alsa-lib ) - arts? ( kde-base/arts ) - esd? ( media-sound/esound ) - !media-libs/faad2 " - -DEPEND="${RDEPEND} - sys-devel/libtool - sys-devel/autoconf - sys-devel/automake - player? ( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )" - - -pkg_setup() { - if use aac && [ -r /usr/lib/libfaac.la ] && - grep -q /usr/lib/libmp4v2.la /usr/lib/libfaac.la; then - eerror "libfaac is compiled against libmp4v2" - eerror "Please unmerge faad2 and mpeg4ip then recompile faac" - die - fi - -} - -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" - - - emake || die "make failed" -} - -src_install () { - cd ${S} - make install DESTDIR="${D}" || die "make install failed" - - 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 - -} -- cgit v1.2.3-65-gdbad