New version

(Portage version: 2.0.53_rc7)

5 files changed, 139 insertions, 12 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 4b206ad9a477..ca513d716416 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.4 2005/10/30 19:18:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.5 2005/11/21 17:24:41 lu_zero Exp $
+
+*gpac-0.4.0 (21 Nov 2005)
+
+  21 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/gpac-0.4.0-downloader.patch, +gpac-0.4.0.ebuild:
+  New version
 
   30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> gpac-0.2.1.ebuild:
   Remove divx4linux useflag.
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 2272408c3725..c2797aed8b8e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6b2ad09c987c10fdbe966f949bb7fd73 ChangeLog 663
+MD5 69ceb2aeb1266241708cf9f8ee5336c1 ChangeLog 812
 MD5 9ad278193077b6ebdc824745ba8600c2 files/digest-gpac-0.2.1 143
+MD5 0ad24b83fa693541f7e11f96479712c7 files/digest-gpac-0.4.0 179
+MD5 1c649e710e682d92d42ffa69d945c8f1 files/gpac-0.4.0-downloader.patch 508
 MD5 b1903ea2936f4dfef488f1d3e877e2fe gpac-0.2.1.ebuild 2367
+MD5 fee1cb552db9667a731c3671847609b3 gpac-0.4.0.ebuild 2956
 MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZRytj5H05b2HAEkRAsreAJ46gxnh8GCpRbe4KLxRRZRC5FRlxgCbBoOY
-f5IGtK7kdjxCM+s+qUgADIc=
-=vEXm
------END PGP SIGNATURE-----
diff --git a/media-video/gpac/files/digest-gpac-0.4.0 b/media-video/gpac/files/digest-gpac-0.4.0
new file mode 100644
index 000000000000..009a08c09efb
--- /dev/null
+++ b/media-video/gpac/files/digest-gpac-0.4.0
@@ -0,0 +1,3 @@
+MD5 cfd9012bff83afdf5ad069b86d3063b6 26104-610.zip 292640
+MD5 e78e35eabe09eea50198f1a27b81eb60 26204-600.zip 255764
+MD5 a8b4b3206cabda946850240f1e7aea93 gpac-0.4.0.tar.gz 2836606
diff --git a/media-video/gpac/files/gpac-0.4.0-downloader.patch b/media-video/gpac/files/gpac-0.4.0-downloader.patch
new file mode 100644
index 000000000000..8acf3596c31a
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.0-downloader.patch
@@ -0,0 +1,19 @@
+--- src/utils/downloader.c.old	2005-07-28 19:57:30.000000000 +0200
++++ src/utils/downloader.c	2005-11-21 17:09:08.000000000 +0100
+@@ -118,6 +118,8 @@
+ 
+ };
+ 
++static void gf_dm_connect(GF_DownloadSession *sess);
++
+ #ifdef GPAC_HAS_SSL
+ 
+ static void init_prng (void)
+@@ -400,7 +402,6 @@
+ #define GF_WAIT_REPLY_SLEEP	20
+ static u32 gf_dm_session_thread(void *par)
+ {
+-	static void gf_dm_connect(GF_DownloadSession *sess);
+ 	GF_DownloadSession *sess = par;
+ 
+ 	sess->flags &= ~GF_DOWNLOAD_SESSION_THREAD_DEAD;
diff --git a/media-video/gpac/gpac-0.4.0.ebuild b/media-video/gpac/gpac-0.4.0.ebuild
new file mode 100644
index 000000000000..392bc1178d71
--- /dev/null
+++ b/media-video/gpac/gpac-0.4.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.0.ebuild,v 1.1 2005/11/21 17:24:41 lu_zero Exp $
+
+inherit wxwidgets flag-o-matic eutils
+
+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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-${NBV}.zip
+		http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-${WBV}.zip )"
+ECVS_SERVER="cvs.sourceforge.net:/cvsroot/gpac"
+ECVS_MODULE="gpac"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="amr debug jpeg mad ffmpeg javascript aac ogg vorbis oss png sdl theora truetype wxwindows xml2 xvid pic"
+S=${WORKDIR}/${PN}
+
+RDEPEND="jpeg? ( media-libs/jpeg )
+	mad? ( media-libs/libmad )
+	mozilla? ( dev-lang/spidermonkey )
+	aac? ( media-libs/faad2 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_pre1 )
+	vorbis? ( media-libs/libvorbis )
+	theora? ( media-libs/libtheora )
+	png? ( media-libs/libpng )
+	truetype? ( >=media-libs/freetype-2.1 )
+	sdl? ( media-libs/libsdl )
+	xml2? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.0.1 )
+	wxwindows? ( >=x11-libs/wxGTK-2.5.2 )"
+
+DEPEND="${RDEPEND}
+	amr? ( app-arch/unzip )
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-downloader.patch
+
+	# disable wxwindows entirely as we can't
+	# use it because of package masking
+	if use wxwindows; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets gtk2
+		sed -i "s:wx-config:${WX_CONFIG}:g" configure
+	fi
+
+	use !sdl && sed -i -e 's:^has_sdl=yes:has_sdl=no:' configure
+
+	# make configure to pick theora, if presented
+	use theora && sed -i -e 's:-ltheora 2:`pkg-config --libs theora` 2:' configure
+
+	if use amr; then
+		cd Plugins/amr_float_dec
+		unzip -jaq ${WORKDIR}/26104-${NBV}_ANSI_C_source_code.zip -d AMR_NB_FT
+		unzip -jaq ${WORKDIR}/26204-${WBV}_ANSI-C_source_code.zip -d AMR_WB_FT
+	fi
+}
+
+src_compile() {
+	# avoid miscompilation
+	append-flags -fno-strict-aliasing
+
+	/bin/sh ./configure \
+		--prefix=${D}/usr \
+		--host=${CHOST} \
+		--mandir=${D}/usr/share/man \
+		--infodir=${D}/usr/share/info \
+		--datadir=${D}/usr/share \
+		--sysconfdir=${D}/etc \
+		--localstatedir=${D}/var/lib \
+		$(use_enable amr) \
+		$(use_enable debug) \
+		$(use_enable aac faad) \
+		$(use_enable ffmpeg ) \
+		$(use_enable jpeg) \
+		$(use_enable mad) \
+		$(use_enable javascript js) \
+		$(use_enable oss oss-audio) \
+		$(use_enable png) \
+		$(use_enable truetype ft) \
+		$(use_enable xml2 svg) \
+		$(use_enable xvid) ||
+		die "configure failed"
+
+	use pic && make OPTFLAGS="${CFLAGS} -fPIC" -C M4Systems
+
+	make OPTFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	make DISTDIR="${D}" install || die
+
+	dodoc AUTHORS BUGS Changelog INSTALL README TODO
+	dodoc doc/*.html doc/*.txt doc/libisomedia_license doc/SGGen
+	dolib.a bin/gcc/libm4systems_static.a
+	insinto /usr/include/gpac
+	doins include/gpac/*.h
+}