From 2158104913d4bec70c97a5e2be17acd6bca14fb2 Mon Sep 17 00:00:00 2001
From: Peter Alfredsen <loki_val@gentoo.org>
Date: Sun, 29 Jun 2008 14:13:08 +0000
Subject: Fix deps for stable gpac to not include >=ffmpeg-0.4.9_p20080326.
 Fixes bug #229889. Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

---
 media-video/gpac/ChangeLog            |   7 +-
 media-video/gpac/Manifest             |  15 +---
 media-video/gpac/gpac-0.4.2-r1.ebuild |   6 +-
 media-video/gpac/gpac-0.4.2.ebuild    | 142 ----------------------------------
 media-video/vlc/Manifest              |  10 +--
 5 files changed, 16 insertions(+), 164 deletions(-)
 delete mode 100644 media-video/gpac/gpac-0.4.2.ebuild

(limited to 'media-video')

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/Manifest b/media-video/gpac/Manifest
index b6322ea2548b..0704cb34ea45 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gpac-0.4.2-DESTDIR.patch 4467 RMD160 f84464703edc26fb70136e8cdf4343aae586f6b8 SHA1 32c8a9c31f5f58bb4bdcd94982fb357ea8fbf5f4 SHA256 036d2f787583ee7ed5998c0cf78cb2117365e1a00cabb743f08e0e8863ce7d40
 AUX gpac-0.4.2-bsd.patch 1719 RMD160 ed41bd19750ab63a77871f8eb08c34fa394276db SHA1 0914e23cc46a956ea17f350000b69652dc7acd0d SHA256 eb4eb36f06ad147881350dd8127eb534e5ec7be6b93899ddece8876234c326fa
 AUX gpac-0.4.2-configure-ogg.patch 917 RMD160 075b0adac5e3b309219bbe70dd54e2c91e149895 SHA1 6f50df996f06444f5cb90904747643e777505837 SHA256 03527ecaef5de7435bf840804447f9c323361e85db5be406c0690eb090eb3794
@@ -15,15 +12,7 @@ DIST gpac-0.4.2-patches.tar.bz2 3899 RMD160 42f9de741f27ca2a942728640582978a497e
 DIST gpac-0.4.2.tar.gz 3916608 RMD160 17d2691651b633497ae96ec71912cfafa864c90a SHA1 800db66f33849886888b24414fb580eaa034a134 SHA256 0e300b02824f12767e5fa0c70b138b6a17375c3d6000aea2568464a9bb1cd956
 DIST gpac-0.4.4-patches-5.tar.bz2 4920 RMD160 595c213dcec2431ad6696b30664bb0a6dd0a4e49 SHA1 fd06dd1120ad053854bdf573c8e324d96c250976 SHA256 ec13bb97f52ad75acbf0dbe4ad761085fb6214cfce8e58f27b69f1c954601042
 DIST gpac-0.4.4.tar.gz 4375687 RMD160 3812d236d326e70ddc601786317837c1c77517f4 SHA1 99b185966632376295f4406821223f5d60d1a32c SHA256 30417b233eaada0a467e47f852383897ad6f96327fed3defbb3dc3660b934704
-EBUILD gpac-0.4.2-r1.ebuild 4013 RMD160 0864e990a43ec3e8e5dc7512dde2afa3282fde57 SHA1 57446e0c66ee9b4f1563a14014ba37036bc8a80c SHA256 43d9ba33b9a8ae0240b597fb231d9467d53881259b33588d749c7d88f234d008
-EBUILD gpac-0.4.2.ebuild 3871 RMD160 f60d0a1612e2e79ef13fd15eebb303f0fac39cf0 SHA1 9369521cefb1dc10510e2377666d86dfaf887011 SHA256 2fcbc85118bd2d1198350fed1b7420323d437269b1844fe4e60e5c9dd4113184
+EBUILD gpac-0.4.2-r1.ebuild 4031 RMD160 2fe61ec1a2a581188ec78299d09cbfdbbb9a9ee9 SHA1 7d4c001fb9585fa2d2181069747cfc81dfbe7b6d SHA256 69580954c762965478900cbaa8547cded70bb4a52a401e4f97c043764c2ff763
 EBUILD gpac-0.4.4.ebuild 3971 RMD160 ed0035d5fb30bb5bd5d1bc6fc71f9bfb2d2fd5da SHA1 78193e4d5b56fd5b630dbff403a9408c54366f81 SHA256 2fcc7ccb71b1edbdb878e934f086d0ef4fadf269eaf4e3f51acc420443745bdc
-MISC ChangeLog 8333 RMD160 523e0b41ffd5c7e6e19a9634cc46b9eccd4d00dd SHA1 168e64e02ceb398c7c9a4320932086948508cf2a SHA256 39c786c15ea665fefc7342a489f0624b97ca08432ebf72f91cf274ada8e58144
+MISC ChangeLog 8520 RMD160 44d52c71658162ca01a3a7ed8005c73663a614fb SHA1 1f0632d6ba8c563fb959740821a0c0bed6bd8993 SHA256 58b06a90946b0f97dcee1b6e56784ea9db0843b207e167fa30b927085d62bce9
 MISC metadata.xml 347 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 SHA1 08f88c0a9437bad24a2c6655e8e370870145c833 SHA256 702b878c0a6c23d19442ee367c51725d5f7c0a61e0c7b2a57a2708f4622ba8fc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhdDGwACgkQvFcC4BYPU0qtcwCfaQW7o//AgPa6nnR29ObU6ehU
-8T8An04xLZ3ZQpRzOi9EOJXbaUdaXQEL
-=RIPj
------END PGP SIGNATURE-----
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
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 2d3ae122da1f..ab5a83ae3eae 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,13 +10,13 @@ DIST vlc-patches-56.tar.bz2 5736 RMD160 fbda37e0662e89c0452c28ea6a369e27f7b2f04f
 DIST vlc-snapshot-20080625.tar.bz2 15158559 RMD160 19caabbfce71ff5efcf5302488827a4021d3ca4f SHA1 7c61096fd2ad9a6711841ede4126e37591e70b43 SHA256 fdad2b8561de5a23e7120c94b30ad8833973accd7a0dd4000c0b3e3aac308895
 EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47
 EBUILD vlc-0.8.6h.ebuild 8989 RMD160 3f08b80bdc96d6ab57f5d5869949bf18f3a4c915 SHA1 2b9b6a353c7b467bb5468ec6770dfdb62638269b SHA256 eabf234909dfb3f9bbc36993839c00039282847cfdc580bd88ac4f6ae31cfce8
-EBUILD vlc-0.9.0_alpha20080625.ebuild 10397 RMD160 198f3050241ca26f781409d1a3c8b7c173d4bdde SHA1 2aa87a37678a1c8c68bb2f7f6b49706b9a65c873 SHA256 02b4dd386a239eaeafd736f144b3ce4a0bff6321e8c5c2c08dfa2599c5c9664f
-MISC ChangeLog 58492 RMD160 cd6c5fa8ab267efba9eccf5f91ffbb5ceb8b622c SHA1 389b1c90bd069717f3821c441d273abe1382f202 SHA256 e660c3c04beaeed166ef7e4e66003b0dd9a590902c787201a3912c25881e0075
+EBUILD vlc-0.9.0_alpha20080625.ebuild 10443 RMD160 d7a3b5db7c56072e1dd9400801b8d3030b72c384 SHA1 4ea278dd4b4ef2f706b312069dd2b8d4db727619 SHA256 faaee9c79e84cf3652940c707c8e110e18a793a733997e8f0b93fddff7970126
+MISC ChangeLog 58603 RMD160 0e9a112926f61f8581e37f58e17481b28bbd4bb1 SHA1 905c13518bd8af08e88dbe41f2bb9a2b5322943c SHA256 ce67b12e2ddf8791c5a4cef97e728418aaf925bc21759f8d94c344aa4ce52221
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhnbOQACgkQvFcC4BYPU0rRnACeL7tpL9QHfKnPzXZZ7eXS7mtK
-kqsAoLYch60YhQPWv/qHNPVJCfaySQL0
-=bTT5
+iEYEARECAAYFAkhnmRgACgkQvFcC4BYPU0o5sACeKPhu+EmxlszjRNrUdDCJM1gY
+CjgAoJJH8W6by207RJ8KNR/2HbHvDibU
+=SSpD
 -----END PGP SIGNATURE-----
-- 
cgit v1.2.3-65-gdbad