Fix deps for stable gpac to not include >=ffmpeg-0.4.9_p20080326. Fixes bug #229889.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

3 files changed, 9 insertions, 146 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 13c3c38ccfbf..2fcc891559fc 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.57 2008/06/21 14:11:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.58 2008/06/29 14:13:08 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> -gpac-0.4.2.ebuild,
+  gpac-0.4.2-r1.ebuild:
+  Fix deps for stable gpac to not include >=ffmpeg-0.4.9_p20080326. Fixes
+  bug #229889.
 
   21 Jun 2008; Alexis Ballier <aballier@gentoo.org> gpac-0.4.4.ebuild:
   Fix implicit declarations, bug #216848
diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild
index 7a2deb490454..614decb489c9 100644
--- a/media-video/gpac/gpac-0.4.2-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.14 2007/12/11 11:07:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.15 2008/06/29 14:13:08 loki_val Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -21,7 +21,7 @@ IUSE="aac amr debug ffmpeg jpeg javascript mad ogg opengl oss png sdl ssl theora
 S="${WORKDIR}/${PN}"
 
 RDEPEND="aac? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	jpeg? ( media-libs/jpeg )
 	javascript? ( dev-lang/spidermonkey )
 	mad? ( media-libs/libmad )
diff --git a/media-video/gpac/gpac-0.4.2.ebuild b/media-video/gpac/gpac-0.4.2.ebuild
deleted file mode 100644
index 9943a9eded36..000000000000
--- a/media-video/gpac/gpac-0.4.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.8 2007/11/27 12:08:54 zzam Exp $
-
-inherit eutils wxwidgets flag-o-matic multilib
-
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="aac amr debug ffmpeg jpeg javascript mad ogg opengl oss png sdl ssl theora truetype vorbis wxwindows xml xvid"
-
-S="${WORKDIR}/${PN}"
-
-RDEPEND="aac? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg )
-	jpeg? ( media-libs/jpeg )
-	javascript? ( dev-lang/spidermonkey )
-	mad? ( media-libs/libmad )
-	opengl? ( virtual/opengl )
-	ogg? ( media-libs/libogg )
-	png? ( media-libs/libpng )
-	vorbis? ( media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1 )
-	wxwindows? ( =x11-libs/wxGTK-2.6* )
-	xml? ( >=dev-libs/libxml2-2.6.0 )
-	xvid? ( >=media-libs/xvid-1.0.1 )
-	sdl? ( media-libs/libsdl )
-	x11-libs/libXt
-	x11-libs/libX11
-	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 "${FILESDIR}/${P}-configure-ogg.patch"
-	epatch "${FILESDIR}/${P}-DESTDIR.patch"
-	epatch "${FILESDIR}/${P}-static-defs.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	epatch "${FILESDIR}/${P}-soname.patch"
-	epatch "${FILESDIR}/${P}-ffmpeg-snapshots-compat.patch"
-	sed -ie '/ldconfig / d' "${S}/Makefile"
-
-	if use amr; then
-		cd modules/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
-
-	cd "${S}"
-
-	chmod +x configure
-}
-
-src_compile() {
-	# make sure configure looks for wx-2.6
-	if use wxwindows; then
-		sed -i -e 's/wx-config/wx-config-2.6/' configure
-	else
-		sed -i 's:^has_wx="yes:has_wx="no:' configure
-	fi
-
-	use !sdl && sed -i 's:^has_sdl=yes:has_sdl=no:' configure
-
-	# fix hardcoded paths in source
-	sed -i -e \
-		"s:\([^f]\)\ M4_PLUGIN_PATH:\1 \"/usr/$(get_libdir)\":" \
-		applications/mp4client/main.c \
-		applications/osmo4_wx/wxOsmo4.cpp \
-		|| die "path fixation failed"
-
-	# make sure mozilla won't be used
-	sed -i -e 's/osmozilla//g' applications/Makefile
-
-	# use this to cute down on the warnings noise
-	append-flags -fno-strict-aliasing
-
-	# amd64 compile
-	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
-	# multilib libdir fix
-	sed -i 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile
-	sed -i 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure
-
-	if use ogg; then
-		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
-	else
-		myconf="${myconf} --use-ogg=no"
-	fi
-
-	econf \
-		--enable-svg \
-		$(use_enable amr) \
-		$(use_enable debug) \
-		$(use_enable opengl) \
-		$(use_enable oss oss-audio) \
-		$(use_enable ssl) \
-		$(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) \
-		${myconf} || die "configure died"
-
-	make OPTFLAGS="${CFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	make OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install || die
-	make OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib || die
-	dodoc AUTHORS BUGS Changelog README TODO
-	dodoc doc/*.html doc/*.txt doc/libisomedia_license doc/SGGen
-}