6 files changed, 12 insertions, 156 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index ca513d716416..6c716a062e29 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,21 +1,6 @@
 # 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.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.
-
-  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gpac-0.2.1.ebuild:
-  Don't install INSTALL file.
-
-  28 Jul 2005; David Holm <dholm@gentoo.org> gpac-0.2.1.ebuild:
-  Added to ~ppc.
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.1 2005/03/30 17:14:02 chriswhite Exp $
 
 *gpac-0.2.1 (31 Mar 2005)
 
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index a6f93b01c029..d7fd0a2501b8 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,7 +1,2 @@
-MD5 54165dfdb61bf5616a82ce5b88ce21e7 ChangeLog 810
+MD5 280256706d5850f1a79a1121431aa46a gpac-0.2.1.ebuild 2132
 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 898f111f7783896f2476b300c000ba53 gpac-0.4.0.ebuild 3053
-MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
diff --git a/media-video/gpac/files/digest-gpac-0.4.0 b/media-video/gpac/files/digest-gpac-0.4.0
deleted file mode 100644
index 009a08c09efb..000000000000
--- a/media-video/gpac/files/digest-gpac-0.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 8acf3596c31a..000000000000
--- a/media-video/gpac/files/gpac-0.4.0-downloader.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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.2.1.ebuild b/media-video/gpac/gpac-0.2.1.ebuild
index 99544f1c769a..4f1a57ebcbab 100644
--- a/media-video/gpac/gpac-0.2.1.ebuild
+++ b/media-video/gpac/gpac-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.5 2005/10/30 19:18:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.2.1.ebuild,v 1.1 2005/03/30 17:14:02 chriswhite Exp $
 
 inherit wxwidgets flag-o-matic
 
@@ -8,12 +8,13 @@ DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed
 HOMEPAGE="http://gpac.sourceforge.net/"
 LVER=0.1.3
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	amr? ( mirror://sourceforge/${PN}/${PN}_extra_libs-${LVER}_linux.tar.gz )"
+	amr? ( mirror://sourceforge/${PN}/${PN}_extra_libs-${LVER}_linux.tar.gz )
+	divx4linux? ( mirror://sourceforge/${PN}/${PN}_extra_libs-${LVER}_linux.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="amr debug jpeg mad mozilla mpeg oss png sdl truetype xml2 xvid"
+KEYWORDS="~x86"
+IUSE="amr debug divx4linux jpeg mad mozilla mpeg oss png sdl truetype xml2 xvid"
 S=${WORKDIR}/${PN}
 
 DEPEND="jpeg? ( media-libs/jpeg )
@@ -25,10 +26,12 @@ DEPEND="jpeg? ( media-libs/jpeg )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xml2? ( >=dev-libs/libxml2-2.6.0 )
 	xvid? ( >=media-libs/xvid-1.0.1 )
-	sdl? ( media-libs/libsdl )"
+	sdl? (media-libs/libsdl)"
 
 src_unpack() {
 	unpack ${A}
+	use divx4linux && \
+		mv gpac_extra_libs/opendivx/* gpac/Plugins/OpenDivx/divx
 	# audio codec used in 3GP
 	use amr && \
 		mv gpac_extra_libs/amr_nb gpac/Plugins/amr_dec/AMR_NB
@@ -61,6 +64,7 @@ src_compile() {
 		--localstatedir=${D}/var/lib \
 		$(use_enable amr amr-nb) \
 		$(use_enable debug) \
+		$(use_enable divx4linux opendivx) \
 		$(use_enable mpeg faad) \
 		$(use_enable mpeg ffmpeg) \
 		$(use_enable jpeg) \
@@ -78,6 +82,6 @@ src_compile() {
 src_install() {
 	make OPTFLAGS="${CFLAGS}" install || die
 
-	dodoc AUTHORS BUGS Changelog README TODO
+	dodoc AUTHORS BUGS Changelog INSTALL README TODO
 	dodoc doc/*.html doc/*.txt doc/libisomedia_license doc/SGGen
 }
diff --git a/media-video/gpac/gpac-0.4.0.ebuild b/media-video/gpac/gpac-0.4.0.ebuild
deleted file mode 100644
index 392bc1178d71..000000000000
--- a/media-video/gpac/gpac-0.4.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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
-}