# 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.25 2005/11/10 05:40:29 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.26 2005/11/10 06:15:21 tester Exp $
+
+ 10 Nov 2005; Olivier Crête <tester@gentoo.org>
+ -files/mpeg4ip-1.2-mp4encode-template-path.patch, -mpeg4ip-1.0.ebuild,
+ mpeg4ip-1.1.ebuild, -mpeg4ip-1.2.ebuild, mpeg4ip-1.3.ebuild,
+ mpeg4ip-1.4.ebuild:
+ Block faad2, mpeg4ip should be made a dep of faad2
*mpeg4ip-1.4 (10 Nov 2005)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 f76a0769708a4206a63faa32b0544452 mpeg4ip-1.1.ebuild 1734
+MD5 31544d8d7b7e74d1dc0c885b357daa18 mpeg4ip-1.1.ebuild 1756
MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 182aa835148cf2bf9055a39413c51b73 ChangeLog 4307
-MD5 c399ecabe11e7d686e1e3c5d18510863 mpeg4ip-1.0.ebuild 2222
-MD5 d5e76386089bfc57a6125e7b174f617e mpeg4ip-1.2.ebuild 2631
-MD5 1853cba67e985bc2abb43482d552848c mpeg4ip-1.3.ebuild 3146
-MD5 1e2374bc5f760bc3dd51169da4e3f1b3 mpeg4ip-1.4.ebuild 3286
+MD5 c1f9a00878a142b8cea5dc4b1b731179 ChangeLog 4569
+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 e1adf5b673be8f3eede637fc5ea66aa3 files/digest-mpeg4ip-1.2 64
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 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
-MD5 5362a4e7d4ecc6778c030d2de9070f14 files/mpeg4ip-1.2-mp4encode-template-path.patch 1013
MD5 9dc5a82373d611ff96499fe69690fe62 files/digest-mpeg4ip-1.3 64
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFDct1emOfEJZHYOKcRAvNHAKC3cSxXO7mp9fB4n+eReWYVtSDp4ACgtBMm
-FbB7kd46mzVl6lMcj8nrRSQ=
-=3x+A
+iD8DBQFDcuWLmOfEJZHYOKcRAvL4AKC4eiAOVdp8gYbU2c/m6qzdep5ZcACgpJWP
+hqo8j63u+WdpSfBn2mCrZJM=
+=+JDJ
-----END PGP SIGNATURE-----
+++ /dev/null
-MD5 6ac635a1dd02d874054d6092f350157c mpeg4ip-1.0.tar.gz 5442521
+++ /dev/null
-MD5 d9c687ec1aaddf17f6462ed5bd35e5d3 mpeg4ip-1.2.tar.gz 4325118
+++ /dev/null
---- mpeg4ip-1.1/server/util/mp4encode/mp4encode.old 2004-12-15 13:29:01.387023936 +0100
-+++ mpeg4ip-1.1/server/util/mp4encode/mp4encode 2004-12-15 13:33:44.264020096 +0100
-@@ -138,7 +138,7 @@
- else
- # Create video encoder parameters file from template
- isoBitRate=`expr ${vbitRate} \* 100000`
-- sed -e "s?BASEDIR?${here}?" -e "s/FILEPREFIX/${prefix}/" -e "s/LASTFRAME/${lastframe}/" -e "s/FRAMEWIDTH/${videoWidth}/" -e "s/FRAMEHEIGHT/${videoHeight}/" -e "s/FRAMERATE/${fps}/" -e "s/BFREQUENCY/${bfrequency}/" -e "s/PFREQUENCY/${pfrequency}/" -e "s/BITRATE/${isoBitRate}/" /usr/local/share/mp4venc_template.par > ${prefix}.par
-+ sed -e "s?BASEDIR?${here}?" -e "s/FILEPREFIX/${prefix}/" -e "s/LASTFRAME/${lastframe}/" -e "s/FRAMEWIDTH/${videoWidth}/" -e "s/FRAMEHEIGHT/${videoHeight}/" -e "s/FRAMERATE/${fps}/" -e "s/BFREQUENCY/${bfrequency}/" -e "s/PFREQUENCY/${pfrequency}/" -e "s/BITRATE/${isoBitRate}/" /usr/share/mpeg4ip/mp4venc_template.par > ${prefix}.par
-
- mp4venc ${prefix}.par
- vfile=${prefix}.cmp
+++ /dev/null
-# 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.0.ebuild,v 1.10 2005/01/17 19:17:00 tester Exp $
-
-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"
-# not 64 bit safe yet
-
-IUSE="ipv6 mmx gtk"
-
-
-RDEPEND="media-libs/faac
- >=media-sound/lame-3.92
- gtk? ( >=x11-libs/gtk+-2 )
- mmx? ( >=dev-lang/nasm-0.98.19 )
- media-video/ffmpeg
- !media-libs/faad2"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool
- sys-devel/autoconf
- sys-devel/automake"
-
-
-src_unpack() {
- unpack ${A}
-
- # It searches for ffmpeg in the wrong place
- cp ${S}/configure ${S}/configure.orig
- sed 's:-I\${enable_ffmpeg}/libavcodec:-I/usr/include/ffmpeg:' \
- ${S}/configure.orig | \
- sed 's:\${enable_ffmpeg}/libavcodec/libavcodec.a:/usr/lib/libavcodec.so:' \
- > ${S}/configure
-
- # Violently rename the private SDL so it doesnt bother the normal version
- for i in lib/SDL/src/Makefile.in \
- lib/SDL/src/main/Makefile.in \
- player/src/Makefile.in \
- server/mp4live/Makefile.in \
- util/iptv/Makefile.in \
- util/yuv/Makefile.in \
- configure; do
- cd ${S}/`dirname ${i}`
- file="`basename ${i}`"
- cp ${file} ${file}.orig || die
- sed -e 's:libSDL:libSDLmpeg4ip:g' ${file}.orig > ${file} || die
- done
-}
-
-src_compile() {
-
- # Configure the private SDL
- cd ${S}/lib/SDL
- econf || die "SDL configure failed"
- cd ${S}
-
- local myconf
- myconf=" `use_enable ipv6`
- `use_enable mmx`
- ` use_enable ppc`"
-
- econf ${myconf} || die "configure failed"
-
- # making libsdl first to fix bug #38316, it seems like bug #34804
- cd ${S}/lib/SDL
- emake || die "make private libSDL failed"
- sed -i "s:-pthread::g" src/libSDLmpeg4ip.la
-
- cd ${S}
- emake || die "make failed"
-
-}
-
-src_install () {
-
- # Install only the lib from the private SDL
- cd ${S}/lib/SDL
- make install-lib DESTDIR=${D}
-
- # It has its own SDL, we have install the libs, ignore the rest
- cd ${S}/lib
- mv Makefile Makefile.orig
- sed -e 's/SDL / /' Makefile.orig > Makefile
-
- cd ${S}
- einstall || die "make install failed"
-
-}
# 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.1.ebuild,v 1.13 2005/11/04 01:05:18 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.14 2005/11/10 06:15:21 tester Exp $
inherit eutils
nas? ( media-libs/nas virtual/x11 )
alsa? ( media-libs/alsa-lib )
arts? ( kde-base/arts )
- esd? ( media-sound/esound )"
+ esd? ( media-sound/esound )
+ !media-libs/faad2"
DEPEND="${RDEPEND}
sys-devel/libtool
+++ /dev/null
-# 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.2.ebuild,v 1.7 2005/11/05 19:03:15 tester Exp $
-
-inherit eutils
-
-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 X v4l2 xvid nas alsa esd arts"
-
-RDEPEND=">=media-libs/faac-1.20.1
- >=media-sound/lame-3.92
- media-libs/libsdl
- X? ( >=x11-libs/gtk+-2 )
- media-libs/libid3tag
- xvid? ( media-libs/xvid )
- nas? ( media-libs/nas virtual/x11 )
- alsa? ( media-libs/alsa-lib )
- arts? ( kde-base/arts )
- esd? ( media-sound/esound )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool
- sys-devel/autoconf
- sys-devel/automake
- x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )"
-
-
-pkg_setup() {
- if grep -q /usr/lib/libmp4v2.la /usr/lib/libfaac.la; then
- eerror "libfaac is compiled against libmp4v2"
- eerror "Please remove faad2 and mpeg4ip and recompile faac"
- die
- fi
-
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # This will break building on gcc 3.4 and 4.0
- sed -i -e 's/-Wmissing-prototypes//g' -e 's/-Werror//g' configure
-
- epatch ${FILESDIR}/mpeg4ip-1.2-mp4encode-template-path.patch
-}
-
-src_compile() {
- cd ${S}
-
- local myconf
- myconf=" --datadir=/usr/share/mpeg4ip
- $(use_enable ipv6)
- $(use_enable mmx)
- $(use_enable ppc)
- $(use_enable nas)
- $(use_enable esd)
- $(use_enable alsa)
- $(use_enable arts)
- $(use_enable X gtk-glib)
- $(use_enable X player)
- $(use_enable X mp4live)
- $(use_enable v4l2)"
-
- # ffmpeg support doesnt build even on gcc 3.3
- # and the configure script is broken so --disable doesnt work
- sed -i -e 's/have_ffmpeg=true/have_ffmpeg=false/' configure
-
- econf ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install () {
- cd ${S}
- make install DESTDIR="${D}" || die "make install failed"
-
- # Remove version lines..
-
- grep -v '\(PACKAGE\)\|\(VERSION\)' ${D}/usr/include/mpeg4ip.h \
- > ${D}/usr/include/mpeg4ip.h.modified
- mv ${D}/usr/include/mpeg4ip.h.modified ${D}/usr/include/mpeg4ip.h
-
- grep -v '\(PACKAGE\)\|\(VERSION\)' ${D}/usr/include/mpeg4ip_config.h \
- > ${D}/usr/include/mpeg4ip_config.h.modified
- mv ${D}/usr/include/mpeg4ip_config.h.modified \
- ${D}/usr/include/mpeg4ip_config.h
-
- 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
-
-}
# 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.3.ebuild,v 1.3 2005/11/05 19:03:15 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.3.ebuild,v 1.4 2005/11/10 06:15:21 tester Exp $
inherit eutils multilib
nas? ( media-libs/nas virtual/x11 )
alsa? ( media-libs/alsa-lib )
arts? ( kde-base/arts )
- esd? ( media-sound/esound )"
+ esd? ( media-sound/esound )
+ !media-libs/faad2"
DEPEND="${RDEPEND}
sys-devel/libtool
# 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.1 2005/11/10 05:40:29 tester Exp $
+# $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
nas? ( media-libs/nas virtual/x11 )
alsa? ( media-libs/alsa-lib )
arts? ( kde-base/arts )
- esd? ( media-sound/esound )"
+ esd? ( media-sound/esound )
+ !media-libs/faad2 "
DEPEND="${RDEPEND}
sys-devel/libtool
projects / gentoo.git / commitdiff