added ~arch build with javascript flag removed, due to broken support for spidermonkey-1.8.5; bug 363575

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 164 insertions, 14 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 754627e2f2db..a140a865cd6b 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,13 @@
 # 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.95 2011/11/20 20:59:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.96 2011/11/22 14:17:57 axs Exp $
+
+*gpac-0.4.5-r5 (22 Nov 2011)
+
+  22 Nov 2011; Ian Stakenvicius <axs@gentoo.org> gpac-0.4.5-r4.ebuild,
+  +gpac-0.4.5-r5.ebuild:
+  added ~arch build with javascript flag removed, due to broken support for
+  spidermonkey-1.8.5; bug 363575
 
   20 Nov 2011; Tim Harder <radhermit@gentoo.org> -gpac-0.4.5-r1.ebuild:
   Remove old.
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 6c5e5521c569..69e3a1cec05d 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST gpac-0.4.5-patches-8.tar.bz2 7263 RMD160 503aeb443746f7b955c553f12f0ed69d6979500a SHA1 c4d7a23b12610567fff4d09c5d2dd815d093fced SHA256 ed2b1bda99cd4a3dda49473876f36983ac3b7310e87f7f04cd2757de86515e57
 DIST gpac-0.4.5.tar.gz 4269054 RMD160 21249249a412efa5d1237907cb6b8cfe6282e86f SHA1 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
-EBUILD gpac-0.4.5-r4.ebuild 4015 RMD160 9156859ca9132793d52a12fe848e4f76923b4c50 SHA1 fd98d4f5b2722a1c27699911985549f1b7f01ada SHA256 5586e09015ee6702932bc37ce6b6ff5993de0f328436764cb505bae31382e990
-MISC ChangeLog 13919 RMD160 1741e684ae6e78bbd0a7f38014992090281ae17a SHA1 52c19fdb3fe1315f815187ff45cb36c4855e112f SHA256 9eb14e0e8c093bda82ce9839b413116b0d7d0443f0ae3a1337b9388fb4cda339
+EBUILD gpac-0.4.5-r4.ebuild 4040 RMD160 47cda21ffccc0bfa4a3cbf14ef59bad243a6c2a8 SHA1 60f111300c0550be15cfd91047f6760c3a448e4a SHA256 897fcc6f5033171cb06b978a778d3042ea555f7695e8c32f0b4d15beef3a7dbb
+EBUILD gpac-0.4.5-r5.ebuild 3932 RMD160 6564e9de8a540278e6cf16e4456f46fcecb6312f SHA1 6d0ac559ab46689825d9c7988408f632ff6afd91 SHA256 ac9cf2fc93a391da73e9502a36c8bae2b7a93898edece83f9fd425fdd4209c12
+MISC ChangeLog 14149 RMD160 4241c85759665249c65f1dc920d4aae82de457f2 SHA1 a7816d98b7e9494029859c4e2978e4488b5958fd SHA256 4e60a5942fd803bdca3f2f6a93d65ea0c4ee3b9d1385c7a32011b879c1c0510e
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOyWocAAoJEEqz6FtPBkyjByUH/1db3nDjO0LWmdRfDPoBDEa6
-vVkA/Ow2vLgPtQxdOIfKoWMcihy3MNcs8zeZAXmZSEccyvLHaKjLixhajxXdg5rc
-/t2+S3SsCvVsH1MlW1UQna5Do4Xv3FSyfo8L9DrAAnttmaumExEy6GcWEQD49ikc
-JfSauC8yQSwQ12jWikIT033bFZtkywmJQb7qHqKrjTFMNc/2Trl9AsS1jDdE/Fvu
-tJYuLuWcZ8eHIzr7EmmUG6Kwn9aDmMPxYqxrF1n+NVZD1G3TS27fnOumY3kS9Tds
-vJ50njXYP/BGV7CbnMJyseucToKVA5wVLGg8G4WagEyXK9x4RbaAY6j89Ef65GY=
-=H+Ii
+iF4EAREIAAYFAk7LrwgACgkQAJxUfCtlWe3HtQEAxZKfPl4w8Fxu+WZYZBMhyq9k
+zKmV6qG80LbHVL1YjbYBALIVvC/+ad9C0vTXTWnCwFRz3sApwASnHVCbqWPvfOJP
+=q4+k
 -----END PGP SIGNATURE-----
diff --git a/media-video/gpac/gpac-0.4.5-r4.ebuild b/media-video/gpac/gpac-0.4.5-r4.ebuild
index a101a2bc78f9..e4e5cddc7f7b 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.12 2011/07/24 18:18:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r4.ebuild,v 1.13 2011/11/22 14:17:57 axs Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -26,7 +26,7 @@ RDEPEND="
 	ffmpeg? ( virtual/ffmpeg )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( virtual/jpeg )
-	javascript? ( >=dev-lang/spidermonkey-1.5 )
+	javascript? ( >=dev-lang/spidermonkey-1.5 <dev-lang/spidermonkey-1.8.5 )
 	mad? ( >=media-libs/libmad-0.15.1b )
 	opengl? ( virtual/opengl media-libs/freeglut )
 	>=media-libs/libogg-1.1
diff --git a/media-video/gpac/gpac-0.4.5-r5.ebuild b/media-video/gpac/gpac-0.4.5-r5.ebuild
new file mode 100644
index 000000000000..cd3880d045aa
--- /dev/null
+++ b/media-video/gpac/gpac-0.4.5-r5.ebuild
@@ -0,0 +1,146 @@
+# 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-r5.ebuild,v 1.1 2011/11/22 14:17:57 axs Exp $
+
+inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C."
+HOMEPAGE="http://gpac.sourceforge.net/"
+NBV="610"
+WBV="600"
+PATCHLEVEL="8"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 aac alsa debug ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png pulseaudio sdl ssl theora truetype vorbis wxwidgets xml xvid"
+
+S=${WORKDIR}/${PN}
+
+RDEPEND="
+	a52? ( media-libs/a52dec )
+	aac? ( >=media-libs/faad2-2.0 )
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( virtual/ffmpeg )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	mad? ( >=media-libs/libmad-0.15.1b )
+	opengl? ( virtual/opengl media-libs/freeglut )
+	>=media-libs/libogg-1.1
+	png? ( >=media-libs/libpng-1.4 )
+	vorbis? ( >=media-libs/libvorbis-1.1 )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2.1.4 )
+	wxwidgets? ( =x11-libs/wxGTK-2.8* )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.0.1 )
+	sdl? ( media-libs/libsdl )
+	jpeg2k? ( media-libs/openjpeg )
+	ssl? ( dev-libs/openssl )
+	pulseaudio? ( media-sound/pulseaudio )
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXext"
+
+DEPEND="${RDEPEND}"
+
+my_use() {
+	local flag="$1" pflag="${2:-$1}"
+	if use ${flag}; then
+		echo "--use-${pflag}=system"
+	else
+		echo "--use-${pflag}=no"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	sed -ie '/ldconfig / d' "${S}/Makefile"
+
+	cd "${S}"
+
+	# remove last of internal ogg
+	sed -i \
+		-e 's:<gpac/internal/ogg.h>:<ogg/ogg.h>:' \
+		src/media_tools/{av_parsers,gpac_ogg,media_import,media_export}.c || die
+	rm -f include/gpac/internal/ogg.h || die
+
+	chmod +x configure
+	# make sure configure looks for wx-2.6
+	if use wxwidgets; then
+		WX_GTK_VER=2.8
+		need-wxwidgets unicode
+		sed -i -e "s:wx-config:${WX_CONFIG}:g" configure
+	else
+		sed -i -e "s:wx-config:false:g" configure
+		sed -i -e 's:^has_wx="yes:has_wx="no:' configure
+	fi
+
+	use sdl  || sed -i 's:^has_sdl=yes:has_sdl=no:' configure
+	use alsa || sed -i 's:^has_alsa="yes":has_alsa=no:' configure
+
+	# make sure mozilla won't be used
+	sed -i -e 's/osmozilla//g' applications/Makefile
+
+	# use this to cut down on the warnings noise
+	append-flags -fno-strict-aliasing
+
+	# multilib libdir fix
+	sed -i -e 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile
+	sed -i -e 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure
+
+	# --warn-common is linker option, not gcc's one
+	sed -i 's/-Wl --warn-common/-Wl,--warn-common/g' configure
+}
+
+src_compile() {
+	myconf="${myconf} --use-ogg=system"
+	if use vorbis; then
+		myconf="${myconf} --use-vorbis=system"
+	fi
+	if use theora; then
+		myconf="${myconf} --use-theora=system"
+	fi
+
+	tc-export CC CXX
+
+	econf \
+		--enable-svg \
+		--enable-pic \
+		--disable-amr \
+		$(use_enable debug) \
+		$(use_enable opengl) \
+		$(use_enable oss oss-audio) \
+		$(use_enable ssl) \
+		$(use_enable ipv6) \
+		$(use_enable jack)=yes \
+		$(use_enable pulseaudio)=yes \
+		$(my_use ffmpeg) \
+		$(my_use aac faad) \
+		$(my_use jpeg) \
+		$(my_use mad) \
+		$(my_use png) \
+		$(my_use truetype ft) \
+		$(my_use xvid) \
+		$(my_use jpeg2k openjpeg) \
+		$(my_use a52) \
+		--cc="$(tc-getCC)" \
+		${myconf} || die "configure died"
+
+	emake -j1 OPTFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install || die
+	emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib || die
+	dodoc AUTHORS BUGS Changelog README TODO
+	dodoc doc/*.txt
+	dohtml doc/*.html
+}