Make sure ogg.h from system is used and remove USE="ogg" because it's not optional anymore after unbundling wrt #320775.

Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64

3 files changed, 153 insertions, 2 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 09d35d592584..e6e26fc8052d 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.81 2010/09/16 17:19:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.82 2010/11/01 17:17:34 ssuominen Exp $
+
+*gpac-0.4.5-r3 (01 Nov 2010)
+
+  01 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> +gpac-0.4.5-r3.ebuild:
+  Make sure ogg.h from system is used and remove USE="ogg" because it's not
+  optional anymore after unbundling wrt #320775.
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> gpac-0.4.5-r1.ebuild,
   gpac-0.4.5-r2.ebuild:
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 5790a82cc9ce..1019e9e33ce7 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -3,5 +3,6 @@ DIST gpac-0.4.5-patches-4.tar.bz2 4668 RMD160 3062c3473827e84ee538bee16842af44c6
 DIST gpac-0.4.5.tar.gz 4269054 RMD160 21249249a412efa5d1237907cb6b8cfe6282e86f SHA1 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
 EBUILD gpac-0.4.5-r1.ebuild 3819 RMD160 862b9ef2ac258156c748b2ea0f258f3caeb47612 SHA1 3689c29c539bb6d75295f1870fc0bc1aed28a076 SHA256 065ecceac59b566d03003a3f8b1f2a73f10e1b0bf492fcc4f118a90b970ce84a
 EBUILD gpac-0.4.5-r2.ebuild 3754 RMD160 19fb9efc9f9d0016f26dbcf9faf09630613297eb SHA1 03e59c77cce9f9ba1b70795f1b863919a4922e10 SHA256 620b0fbec620991a100272a7fbbe7f29010b8c1ddbd22ae653d462ee5ab63fe0
-MISC ChangeLog 11942 RMD160 1ddf920c04c642b8b3e15c7de4895a8fb62c3355 SHA1 cfdf6f72b8e51ad5ad9cb5f2ef4229b69b384b3f SHA256 63a2fb7b6216de169a80660bb562dcf8aede0b15103ca4fd4b673bf548c52248
+EBUILD gpac-0.4.5-r3.ebuild 3877 RMD160 9fb757d1fe27e6997b97612c1a3eda19b46b494c SHA1 21501a3244ff76a22e2769a16aa475a15c52cb01 SHA256 9b39862b8e32dcc6081cfbefecccef224f1298dfa2592ae5165733c0f444f5ec
+MISC ChangeLog 12175 RMD160 54310b6a3885abd1f2b170d0ba9a03e665f0f8b3 SHA1 406a0908c5fe8ef01e45d4be8f9d4a74c1c581d4 SHA256 7b9a3f6260ae97d128696a570271c1bdda68f0fa10f96c4946021af74ee5c332
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
diff --git a/media-video/gpac/gpac-0.4.5-r3.ebuild b/media-video/gpac/gpac-0.4.5-r3.ebuild
new file mode 100644
index 000000000000..fe2474a69ef7
--- /dev/null
+++ b/media-video/gpac/gpac-0.4.5-r3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/11/01 17:17:34 ssuominen 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="4"
+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 javascript 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? ( media-video/ffmpeg )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( media-libs/jpeg )
+	javascript? ( >=dev-lang/spidermonkey-1.5 )
+	mad? ( >=media-libs/libmad-0.15.1b )
+	opengl? ( virtual/opengl media-libs/freeglut )
+	>=media-libs/libogg-1.1
+	png? ( >=media-libs/libpng-1.2.5 )
+	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:^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
+}
+
+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 javascript js) \
+		$(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
+}