Fix flawed media and sound setting logic thanks to Harley Peters <harley@thepetersclan.com> in bug 184105 also attempt to fix as-needed bug 183714

(Portage version: 2.1.3_rc6)

7 files changed, 71 insertions, 272 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index 93a70bac9d1a..c199353e22f3 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.46 2007/06/20 02:01:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.47 2007/07/10 07:20:47 genstef Exp $
+
+  10 Jul 2007; Stefan Schweizer <genstef@gentoo.org> -gnash-0.7.2.ebuild,
+  -gnash-0.7.2_p20099999.ebuild, gnash-0.8.0.ebuild, gnash-9999.ebuild:
+  Fix flawed media and sound setting logic thanks to Harley Peters
+  <harley@thepetersclan.com> in bug 184105 also attempt to fix as-needed bug
+  183714
 
 *gnash-9999 (20 Jun 2007)
 
diff --git a/net-www/gnash/files/digest-gnash-0.7.2 b/net-www/gnash/files/digest-gnash-0.7.2
deleted file mode 100644
index 449beee42c3f..000000000000
--- a/net-www/gnash/files/digest-gnash-0.7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ccef0f45be01a4c2992b46c2363a514f gnash-0.7.2.tar.bz2 1599810
-RMD160 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198 gnash-0.7.2.tar.bz2 1599810
-SHA256 12dccb4bc69488f516e0283e988412ba7db5dfad32744425f97d641392a2e98b gnash-0.7.2.tar.bz2 1599810
diff --git a/net-www/gnash/files/digest-gnash-0.7.2_p20099999 b/net-www/gnash/files/digest-gnash-0.7.2_p20099999
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-www/gnash/files/digest-gnash-0.7.2_p20099999
+++ /dev/null
diff --git a/net-www/gnash/gnash-0.7.2.ebuild b/net-www/gnash/gnash-0.7.2.ebuild
deleted file mode 100644
index f2ede351a527..000000000000
--- a/net-www/gnash/gnash-0.7.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2.ebuild,v 1.9 2007/03/16 16:52:40 gustavoz Exp $
-
-inherit nsplugins kde-functions
-set-kdedir
-
-DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
-HOMEPAGE="http://www.gnu.org/software/gnash"
-SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810"
-#dmalloc, broken see bug 142939
-#dmalloc? ( dev-libs/dmalloc )
-#		$(use_enable dmalloc) \
-
-RDEPEND="
-	xml? ( dev-libs/libxml2 )
-	sys-libs/zlib
-	media-libs/jpeg
-	media-libs/libogg
-	media-libs/libpng
-	net-misc/curl
-	!ffmpeg? ( media-libs/libmad )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? ( media-libs/gstreamer
-		|| (
-			media-plugins/gst-plugins-ffmpeg
-			media-plugins/gst-plugins-mad
-			media-plugins/gst-plugins-lame
-		)
-	)
-	!gstreamer? ( media-libs/libsdl )
-	dev-libs/boost
-	|| (
-		( x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-proto/xproto )
-		virtual/x11
-	)
-	dev-libs/atk
-	dev-libs/glib
-	>x11-libs/gtk+-2
-	x11-libs/pango
-	!agg? ( virtual/opengl x11-libs/gtkglext )
-	kde? ( kde-base/kdelibs )
-	agg? ( x11-libs/agg )"
-	#cairo? ( x11-libs/cairo )
-
-pkg_setup() {
-	if use agg && use kde; then
-		eerror "Building klash with the agg based renderer is not supportet"
-		eerror "Please USE -kde or -agg"
-		die "kde and agg not supported at the same time"
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	use nsplugin && myconf="${myconf} --with-plugindir=/opt/netscape/plugins"
-
-	#--enable-renderer=engine Specify rendering engine:
-	#				OpenGL (default)
-	#				Cairo  (experimental)
-	#cairo: does not work for plugins yet, offers flash for non-accelerated gfx?
-	#if use cairo; then
-	#	myconf="${myconf} --enable-renderer=cairo"
-	#fi
-	if use agg; then
-		myconf="${myconf} --enable-renderer=agg"
-	fi
-	#--enable-gui=flavor Specify gui flavor:
-	#				GTK
-	#				SDL -> has no controls, we do not USE it
-	#$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010
-	#--enable-sound=gst,sdl
-	if use gstreamer; then
-		myconf="${myconf} --enable-sound=gst"
-	else
-		myconf="${myconf} --enable-sound=sdl"
-	fi
-
-	if use ffmpeg; then
-		myconf="${myconf} --with-mp3-decoder=ffmpeg"
-	fi
-
-	econf \
-		$(use_enable nsplugin plugin) \
-		$(use_enable xml) \
-		$(use_enable video_cards_i810 i810-lod-bias) \
-		--without-gcc-arch \
-		$(use_enable kde klash) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
-	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
-		|| rm -rf ${D}/opt
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "ALPHA"
-	ewarn "gnash is still in heavy development"
-	ewarn "please report gnash bugs upstream to the gnash devs"
-}
diff --git a/net-www/gnash/gnash-0.7.2_p20099999.ebuild b/net-www/gnash/gnash-0.7.2_p20099999.ebuild
deleted file mode 100644
index 9a1e7e7cc202..000000000000
--- a/net-www/gnash/gnash-0.7.2_p20099999.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.10 2007/05/13 22:12:33 genstef Exp $
-
-WANT_AUTOCONF=latest
-inherit nsplugins autotools cvs kde-functions qt3 multilib
-set-kdedir
-
-DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
-HOMEPAGE="http://www.gnu.org/software/gnash"
-#SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-ECVS_SERVER="cvs.sv.gnu.org:/sources/${PN}"
-ECVS_MODULE="${PN}"
-[ "${PV/0.7.2_p}" != "20099999" ] && ECVS_CO_OPTS="-D ${PV/0.7.2_p}"
-ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}"
-S=${WORKDIR}/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810"
-#dmalloc, broken see bug 142939
-#dmalloc? ( dev-libs/dmalloc )
-#		$(use_enable dmalloc) \
-
-RDEPEND="
-	xml? ( dev-libs/libxml2 )
-	sys-libs/zlib
-	media-libs/jpeg
-	media-libs/libogg
-	media-libs/libpng
-	net-misc/curl
-	!ffmpeg? ( media-libs/libmad )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? ( media-libs/gstreamer
-		|| (
-			media-plugins/gst-plugins-ffmpeg
-			media-plugins/gst-plugins-mad
-			media-plugins/gst-plugins-lame
-		)
-	)
-	!gstreamer? ( media-libs/libsdl )
-	dev-libs/boost
-	|| (
-		( x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-proto/xproto )
-		virtual/x11
-	)
-	dev-libs/atk
-	dev-libs/glib
-	>x11-libs/gtk+-2
-	x11-libs/pango
-	!agg? ( virtual/opengl x11-libs/gtkglext )
-	kde? ( kde-base/kdelibs )
-	agg? ( x11-libs/agg )"
-	#cairo? ( x11-libs/cairo )
-
-pkg_setup() {
-	if use agg && use kde; then
-		eerror "Building klash with the agg based renderer is not supportet"
-		eerror "Please USE -kde or -agg"
-		die "kde and agg not supported at the same time"
-	fi
-
-	if has_version '<dev-libs/boost-1.34' && ! built_with_use dev-libs/boost threads; then
-		eerror "dev-libst/boost has to be built with the 'threads' USE flag"
-		die "dev-libs/boost not built with threads"
-	fi
-}
-
-src_compile() {
-	./autogen.sh
-	local myconf
-
-	use nsplugin && myconf="${myconf} --with-plugindir=/opt/netscape/plugins"
-
-	#--enable-renderer=engine Specify rendering engine:
-	#				OpenGL (default)
-	#				Cairo  (experimental)
-	#cairo: does not work for plugins yet, offers flash for non-accelerated gfx?
-	#if use cairo; then
-	#	myconf="${myconf} --enable-renderer=cairo"
-	#fi
-	if use agg; then
-		myconf="${myconf} --enable-renderer=agg"
-	fi
-	#--enable-gui=flavor Specify gui flavor:
-	#				GTK
-	#				SDL -> has no controls, we do not USE it
-	#$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010
-	#--enable-sound=gst,sdl
-	if use gstreamer; then
-		myconf="${myconf} --enable-sound=gst"
-	else
-		myconf="${myconf} --enable-sound=sdl"
-	fi
-
-	if use ffmpeg; then
-		myconf="${myconf} --with-mp3-decoder=ffmpeg"
-	fi
-
-	if use kde; then
-		myconf="${myconf} --enable-klash --with-qt-incl=${QTDIR}/include
-			--with-qt-lib=${QTDIR}/$(get_libdir)"
-	else
-		myconf="${myconf} --disable-klash"
-	fi
-
-	econf \
-		$(use_enable nsplugin plugin) \
-		$(use_enable xml) \
-		$(use_enable video_cards_i810 i810-lod-bias) \
-		--without-gcc-arch \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
-	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
-		|| rm -rf ${D}/opt
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "ALPHA"
-	ewarn "gnash is still in heavy development"
-	ewarn "please report gnash bugs upstream to the gnash devs"
-}
diff --git a/net-www/gnash/gnash-0.8.0.ebuild b/net-www/gnash/gnash-0.8.0.ebuild
index eeec61b89777..52414adb5c53 100644
--- a/net-www/gnash/gnash-0.8.0.ebuild
+++ b/net-www/gnash/gnash-0.8.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.0.ebuild,v 1.2 2007/06/12 11:15:09 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.0.ebuild,v 1.3 2007/07/10 07:20:47 genstef Exp $
 
-inherit nsplugins kde-functions qt3 multilib
+inherit nsplugins kde-functions qt3 multilib flag-o-matic autotools
 set-kdedir
 
 DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810"
+IUSE="agg gstreamer ffmpeg kde mad nsplugin xml video_cards_i810"
 #dmalloc, broken see bug 142939
 #dmalloc? ( dev-libs/dmalloc )
 #		$(use_enable dmalloc) \
@@ -24,7 +24,7 @@ RDEPEND="
 	media-libs/libogg
 	media-libs/libpng
 	net-misc/curl
-	!ffmpeg? ( media-libs/libmad )
+	mad? ( media-libs/libmad )
 	ffmpeg? ( media-video/ffmpeg )
 	gstreamer? ( media-libs/gstreamer
 		|| (
@@ -63,6 +63,28 @@ pkg_setup() {
 		eerror "dev-libst/boost has to be built with the 'threads' USE flag"
 		die "dev-libs/boost not built with threads"
 	fi
+
+	if use mad && ( use !ffmpeg && use !gstreamer ) && ( use nsplugin || use xml ); then
+		eerror "Building Gnash using the mad media handler is incompatible with the nsplugin or xml USE flags"
+		die "nsplugin and xml not supported with mad media handler"
+	fi
+	
+	if use !mad && use !ffmpeg && use !gstreamer; then
+		eerror "You are trying to build Gnash without choosing a media handler"
+		eerror "Please enable one of the following ffmpeg,gstreamer or mad(mp3 audio only)"
+		die "No media handler selected !"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	#as-needed breaks, see bug 183714
+	#
+	# TODO - does not work for me
+	#epatch ${FILESDIR}/gnash-no-asneeded.patch
+	#filter-ldflags -Wl,--as-needed --as-needed
+	#eautoconf
 }
 
 src_compile() {
@@ -84,15 +106,17 @@ src_compile() {
 	#				GTK
 	#				SDL -> has no controls, we do not USE it
 	#$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010
-	#--enable-sound=gst,sdl
-	if use gstreamer; then
-		myconf="${myconf} --enable-sound=gst"
-	else
-		myconf="${myconf} --enable-sound=sdl"
+	#--enable-media=gst||ffmpeg||mad
+	if use mad && use !ffmpeg && use !gstreamer; then
+		myconf="${myconf} --enable-media=mad"
+	fi
+
+	if use gstreamer && use !ffmpeg; then
+		myconf="${myconf} --enable-media=gst"
 	fi
 
 	if use ffmpeg; then
-		myconf="${myconf} --with-mp3-decoder=ffmpeg"
+		myconf="${myconf} --enable-media=ffmpeg"
 	fi
 
 	if use kde; then
@@ -106,7 +130,7 @@ src_compile() {
 		$(use_enable nsplugin plugin) \
 		$(use_enable xml) \
 		$(use_enable video_cards_i810 i810-lod-bias) \
-		--without-gcc-arch \
+		--without-gcc-arch --disable-debugger \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 }
diff --git a/net-www/gnash/gnash-9999.ebuild b/net-www/gnash/gnash-9999.ebuild
index 419d887028d2..ab2c796ebc2f 100644
--- a/net-www/gnash/gnash-9999.ebuild
+++ b/net-www/gnash/gnash-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-9999.ebuild,v 1.1 2007/06/20 02:01:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-9999.ebuild,v 1.2 2007/07/10 07:20:47 genstef Exp $
 
 WANT_AUTOCONF=latest
 inherit nsplugins autotools cvs kde-functions qt3 multilib
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810"
+IUSE="agg gstreamer ffmpeg kde mad nsplugin xml video_cards_i810"
 #dmalloc, broken see bug 142939
 #dmalloc? ( dev-libs/dmalloc )
 #		$(use_enable dmalloc) \
@@ -27,7 +27,7 @@ RDEPEND="
 	media-libs/libogg
 	media-libs/libpng
 	net-misc/curl
-	!ffmpeg? ( media-libs/libmad )
+	mad? ( media-libs/libmad )
 	ffmpeg? ( media-video/ffmpeg )
 	gstreamer? ( media-libs/gstreamer
 		|| (
@@ -66,10 +66,26 @@ pkg_setup() {
 		eerror "dev-libst/boost has to be built with the 'threads' USE flag"
 		die "dev-libs/boost not built with threads"
 	fi
+
+	if use mad && ( use !ffmpeg && use !gstreamer ) && ( use nsplugin || use xml ); then
+		eerror "Building Gnash using the mad media handler is incompatible with the nsplugin or xml USE flags"
+		die "nsplugin and xml not supported with mad media handler"
+	fi
+	
+	if use !mad && use !ffmpeg && use !gstreamer; then
+		eerror "You are trying to build Gnash without choosing a media handler"
+		eerror "Please enable one of the following ffmpeg,gstreamer or mad(mp3 audio only)"
+		die "No media handler selected !"
+	fi
 }
 
-src_compile() {
+src_unpack() {
+	cvs_src_unpack
+	cd ${S}
 	./autogen.sh
+}
+
+src_compile() {
 	local myconf
 
 	use nsplugin && myconf="${myconf} --with-plugindir=/opt/netscape/plugins"
@@ -88,15 +104,17 @@ src_compile() {
 	#				GTK
 	#				SDL -> has no controls, we do not USE it
 	#$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010
-	#--enable-sound=gst,sdl
-	if use gstreamer; then
-		myconf="${myconf} --enable-sound=gst"
-	else
-		myconf="${myconf} --enable-sound=sdl"
+	#--enable-media=gst||ffmpeg||mad
+	if use mad && use !ffmpeg && use !gstreamer; then
+		myconf="${myconf} --enable-media=mad"
+	fi
+
+	if use gstreamer && use !ffmpeg; then
+		myconf="${myconf} --enable-media=gst"
 	fi
 
 	if use ffmpeg; then
-		myconf="${myconf} --with-mp3-decoder=ffmpeg"
+		myconf="${myconf} --enable-media=ffmpeg"
 	fi
 
 	if use kde; then
@@ -110,7 +128,7 @@ src_compile() {
 		$(use_enable nsplugin plugin) \
 		$(use_enable xml) \
 		$(use_enable video_cards_i810 i810-lod-bias) \
-		--without-gcc-arch \
+		--without-gcc-arch --disable-debugger \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 }