diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-02-16 22:55:47 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-02-16 22:55:47 +0000 |
| commit | 8f92a8640c29388abe25fcdbf3f99c0b49a485d3 (patch) | |
| tree | 955833d352cf2bbaf4b8469b586cbe2b5c4ee7bc /media-video/gpac | |
| parent | add neon useflag (diff) | |
| download | gentoo-2-8f92a8640c29388abe25fcdbf3f99c0b49a485d3.tar.gz gentoo-2-8f92a8640c29388abe25fcdbf3f99c0b49a485d3.tar.bz2 gentoo-2-8f92a8640c29388abe25fcdbf3f99c0b49a485d3.zip | |
merge spidermonkey patch in the tarball and fix build with libpng1.5
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'media-video/gpac')
| -rw-r--r-- | media-video/gpac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch | 25 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.4.5-r4.ebuild | 6 |
3 files changed, 7 insertions, 30 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index bdb3b2acf9e7..9afe56299521 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/gpac # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.84 2011/02/06 16:43:25 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.85 2011/02/16 22:55:47 aballier Exp $ + + 16 Feb 2011; Alexis Ballier <aballier@gentoo.org> gpac-0.4.5-r4.ebuild, + -files/gpac-0.4.5-spidermonkey-update.patch: + merge spidermonkey patch in the tarball and fix build with libpng1.5 06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> gpac-0.4.5-r1.ebuild, gpac-0.4.5-r4.ebuild: diff --git a/media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch b/media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch deleted file mode 100644 index 6674c93b19b9..000000000000 --- a/media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/configure 2011-01-01 14:37:30.188000001 -0600 -+++ b/configure 2011-01-01 14:40:30.409000001 -0600 -@@ -491,6 +491,13 @@ - has_js="system" - js_lib="-lmozjs" - else -+#gentoo spidermonkey (mozjs) -+js_flags="-DXP_UNIX -I/usr/include/js" -+js_inc="/usr/include/js" -+if $cc -o $TMPO $TMPC $js_flags -lmozjs 2> /dev/null ; then -+has_js="system" -+js_lib="-lmozjs" -+else - #try local - js_inc="$local_inc/js" - js_flags="-DXP_UNIX -I$local_inc/js" -@@ -499,6 +506,7 @@ - fi - fi - fi -+fi - fi - - - diff --git a/media-video/gpac/gpac-0.4.5-r4.ebuild b/media-video/gpac/gpac-0.4.5-r4.ebuild index b27e1d8a08ed..fa8709966867 100644 --- a/media-video/gpac/gpac-0.4.5-r4.ebuild +++ b/media-video/gpac/gpac-0.4.5-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r4.ebuild,v 1.2 2011/02/06 16:43:25 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r4.ebuild,v 1.3 2011/02/16 22:55:47 aballier Exp $ inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs @@ -8,7 +8,7 @@ DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed HOMEPAGE="http://gpac.sourceforge.net/" NBV="610" WBV="600" -PATCHLEVEL="4" +PATCHLEVEL="5" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2" @@ -63,8 +63,6 @@ src_unpack() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - epatch "${FILESDIR}/${P}-spidermonkey-update.patch" - sed -ie '/ldconfig / d' "${S}/Makefile" cd "${S}" |