diff options
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/mpeg4ip/ChangeLog | 9 | ||||
-rw-r--r-- | media-video/mpeg4ip/Manifest | 25 | ||||
-rw-r--r-- | media-video/mpeg4ip/files/mpeg4ip-1.2-mp4encode-template-path.patch | 11 | ||||
-rw-r--r-- | media-video/mpeg4ip/mpeg4ip-1.2.ebuild | 45 |
4 files changed, 68 insertions, 22 deletions
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog index 203cdc9e28cc..fcfc316f48c1 100644 --- a/media-video/mpeg4ip/ChangeLog +++ b/media-video/mpeg4ip/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/mpeg4ip # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.17 2004/12/06 23:12:48 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.18 2004/12/31 08:32:54 tester Exp $ + + 31 Dec 2004; Olivier Crête <tester@gentoo.org> + +files/mpeg4ip-1.2-mp4encode-template-path.patch: + Fixed compilation without the X stuff, thanks to Christian Zoffoli + <czoffoli@xmerlin.org> see bug #74189. Fixed compilation problem, bug #73761. + Fix path problem, thanks to Christian Zoffoli <czoffoli@xmerlin.org> again, + bug 74469. Another patch to install more docs from Christian (bug #74500) 06 Dec 2004; Olivier Crete <tester@gentoo.org> -files/mpeg4ip-1.2-gentoo-fixes.patch: diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest index 9257e109e7fa..cbd4458e6cff 100644 --- a/media-video/mpeg4ip/Manifest +++ b/media-video/mpeg4ip/Manifest @@ -1,20 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d3901fe672ba3d47273a123d16228c72 mpeg4ip-1.0.ebuild 2205 -MD5 d48b1efec76b7e653678882b330bf720 ChangeLog 3069 -MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255 -MD5 63571337655b8912e07a1673040f743d mpeg4ip-1.2.ebuild 1624 MD5 65f6ffc28c1d4afc6c2494d7289570d6 mpeg4ip-1.1.ebuild 1638 -MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64 -MD5 e1adf5b673be8f3eede637fc5ea66aa3 files/digest-mpeg4ip-1.2 64 +MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255 +MD5 fb7140d795e4997b69fc3c41801296cf ChangeLog 3475 +MD5 d3901fe672ba3d47273a123d16228c72 mpeg4ip-1.0.ebuild 2205 +MD5 fceab1657eb7d646f9a25b87ac3c68c8 mpeg4ip-1.2.ebuild 2646 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844 -MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64 +MD5 e1adf5b673be8f3eede637fc5ea66aa3 files/digest-mpeg4ip-1.2 64 +MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64 MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBtOeLwDHaUUJ0mYMRAh/aAJ4jKN8/JzOJqMKFiLBacqXAQiUe9gCfavid -R9RMuEJM/Bjr30kzvl/1g8Y= -=pN+a ------END PGP SIGNATURE----- +MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64 +MD5 5362a4e7d4ecc6778c030d2de9070f14 files/mpeg4ip-1.2-mp4encode-template-path.patch 1013 diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.2-mp4encode-template-path.patch b/media-video/mpeg4ip/files/mpeg4ip-1.2-mp4encode-template-path.patch new file mode 100644 index 000000000000..090ee8a71822 --- /dev/null +++ b/media-video/mpeg4ip/files/mpeg4ip-1.2-mp4encode-template-path.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/media-video/mpeg4ip/mpeg4ip-1.2.ebuild b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild index 8bdaaadcc526..81d260452868 100644 --- a/media-video/mpeg4ip/mpeg4ip-1.2.ebuild +++ b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.2 2004/12/06 23:12:48 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.2.ebuild,v 1.3 2004/12/31 08:32:54 tester Exp $ inherit eutils @@ -23,6 +23,7 @@ RDEPEND="sys-devel/libtool sys-devel/automake >=media-libs/faac-1.20.1 >=media-sound/lame-3.92 + media-libs/libsdl gtk? ( >=x11-libs/gtk+-2 ) media-libs/libid3tag xvid? ( media-libs/xvid ) @@ -34,26 +35,40 @@ RDEPEND="sys-devel/libtool DEPEND="${RDEPEND} 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=" $(use_enable ipv6) + 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 arts) + $(use_enable gtk gtk-glib) + $(use_enable gtk mp4live)" use v4l2 || myconf="${myconf} --disable-v4l2" # ffmpeg support doesnt build even on gcc 3.3 @@ -68,4 +83,26 @@ src_compile() { 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 COPYING 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 + } |