Fix bug 242656 by restricting 0.8.3 to ffmpeg 20080326. Bump to 0.8.4, bug 241874, thanks to Mounir Lamouri. This version works much better than 0.8.3, but tests fail to compile.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64

4 files changed, 274 insertions, 6 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index 5a95c407e3f6..d897739e0a77 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.63 2008/10/12 16:05:34 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.64 2008/10/19 11:49:10 loki_val Exp $
+
+*gnash-0.8.4 (19 Oct 2008)
+
+  19 Oct 2008; Peter Alfredsen <loki_val@gentoo.org> gnash-0.8.3.ebuild,
+  +gnash-0.8.4.ebuild:
+  Fix bug 242656 by restricting 0.8.3 to ffmpeg 20080326. Bump to 0.8.4, bug
+  241874, thanks to Mounir Lamouri. This version works much better than
+  0.8.3, but tests fail to compile.
 
   12 Oct 2008; Friedrich Oslage <bluebird@gentoo.org> gnash-0.8.3.ebuild:
   Drop ~sparc keyword, until bug #240470 is fixed
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 1af9ea1bbb08..a52725ca2a17 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -2,8 +2,10 @@ AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65d
 AUX gnash-0.8.3-libtool-2.2.patch 1140 RMD160 b93c96309a43c8ebd0d00d79968ff9733c7aafbe SHA1 91ea72837f6796d4c9f29ac0844d5b9657092fe3 SHA256 9dc29f5e074ccc314be130aaaf4da85933b108b1618583fd84a9582701d77a17
 DIST gnash-0.8.1.tar.bz2 1983596 RMD160 8872e58fb1b2915edd62a2a48fc076a0cda3ed2d SHA1 d83280752d0cdf5c4bbeab1c2e8af3dd0113297f SHA256 30fb283e707bc209109ca313c83b069b1c482497b62f8c4cc37e9a23e0ba8993
 DIST gnash-0.8.3.tar.bz2 2902610 RMD160 f7bf4d06d35c3ad40df4419b179fc6482731854b SHA1 3cd4a0930e772a42b0155295fca292fd94be7c42 SHA256 af1fd8454472e0ac588c015b09c67449392f32aa6297d4a625b8344dce11c39a
+DIST gnash-0.8.4.tar.bz2 2887666 RMD160 0557eee847f6dd625714d6659058ff7e6c4cec56 SHA1 342d7776d06d11b964546b2b4ebec1864ee717d8 SHA256 6ffe4bdbc22de712e59205a27b46aa93a5372c67829c7f02d6b1c1778e9f9224
 EBUILD gnash-0.8.1-r1.ebuild 4394 RMD160 c046900d84de684b5e11ae61e7a43d5250132034 SHA1 479e20d10be6cc1e2fce63ec2bcc060473dd5423 SHA256 192f8aea3c27beeb7534a3f5c8ae96c9e48b58956cb1d93f74e9e81855f007f2
-EBUILD gnash-0.8.3.ebuild 7122 RMD160 d641f7c02e94766faf8300a16db0d529cc202593 SHA1 4b97731792e10679199010b2a74e88ef4d97ab7a SHA256 3352d2aa3e12ece1559379b208de7ce4878f40c18b6c694837a271d0fd702722
+EBUILD gnash-0.8.3.ebuild 7124 RMD160 f4e02907713c3ceed8ac3d642cadb938714cb107 SHA1 ae99da29e6b462d061157d56f52d34e0d4fe4538 SHA256 bc82223c52e5b1ae7313d377a17a93b4c8cb77c780e15fd0f9a4ebaeef41b17d
+EBUILD gnash-0.8.4.ebuild 5984 RMD160 d140d619a72333fb044d0518aa0ad5f0587ca48e SHA1 39e0ff64f82dd9f587f8736a8fd943ec6d20feea SHA256 b523c70e1d8e247f7ebb18206e128dd7df9dd94d154a1689caa7ba8a11c3a76b
 EBUILD gnash-9999.ebuild 505 RMD160 f7784d63cee65876d046e76d573e062cad927bee SHA1 627b71b89298059d5e3dd3872ff19de69913595a SHA256 f8d9aae6f4245160e80afbf8cebaf859a2834a715b295595fbd88e067ac034aa
-MISC ChangeLog 11141 RMD160 0cb59f5d97051a3d731e6eb852b8670badb29826 SHA1 e523842b6797d13d141fd42d347c15a8ae5c32b4 SHA256 e0e5fa801cbc362af3565890fa5ee22550f6f9112c4bb885feabb0d2167db3af
+MISC ChangeLog 11451 RMD160 b34ecd185afbc1dd22e8289a3ddaa0700397037f SHA1 5605fa303d497ffff612880847449282af9289fe SHA256 990aaf8292b1e8efdf0df1a7f11b2f0c4b9299bb53cc646a557b05768483d68f
 MISC metadata.xml 482 RMD160 1b5582c6f25276983aa9d37157e6b820c05c8931 SHA1 0b9c23843dcb4f810fd895b55aae9328ece8baa4 SHA256 fb9f40d9d9005bcee592a5e296b768edd81e6ebfa89a4f3dcabd41131b3f8f3f
diff --git a/net-www/gnash/gnash-0.8.3.ebuild b/net-www/gnash/gnash-0.8.3.ebuild
index 37a2d7f940e8..59b5dbce93a5 100644
--- a/net-www/gnash/gnash-0.8.3.ebuild
+++ b/net-www/gnash/gnash-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.3.ebuild,v 1.6 2008/10/12 16:05:34 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.3.ebuild,v 1.7 2008/10/19 11:49:10 loki_val Exp $
 
 EAPI=1
 
@@ -59,7 +59,7 @@ RDEPEND="
 	ffmpeg? (
 		!gstreamer? (
 			media-libs/libsdl
-			>=media-video/ffmpeg-0.4.9_p20080326
+			=media-video/ffmpeg-0.4.9_p20080326
 		)
 	)
 
@@ -183,7 +183,7 @@ src_compile() {
 		use ${gui/-*} && guis="${guis},${gui/*-}"
 	done
 	guis=${guis#,}
-	if [ -z ${gui} ]
+	if [ -z "${guis}" ]
 	then
 		guis="GTK2,KDE"
 	fi
diff --git a/net-www/gnash/gnash-0.8.4.ebuild b/net-www/gnash/gnash-0.8.4.ebuild
new file mode 100644
index 000000000000..64885f37a677
--- /dev/null
+++ b/net-www/gnash/gnash-0.8.4.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.4.ebuild,v 1.1 2008/10/19 11:49:10 loki_val Exp $
+
+EAPI=1
+
+inherit autotools nsplugins kde-functions qt3 multilib
+
+set-kdedir 3.5
+
+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-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+agg -cairo dbus -fbcon -ffmpeg +gstreamer +gtk +kde +nsplugin -opengl -qt3 -sdl video_cards_i810"
+
+RDEPEND="
+	agg? ( >=x11-libs/agg-2.5 )
+	opengl? (
+		!agg? (
+			virtual/opengl
+			gtk? ( x11-libs/gtkglext )
+		)
+	)
+	cairo? (
+		!opengl? (
+			!agg? (
+				x11-libs/cairo
+			)
+		)
+	)
+
+	!agg? ( !cairo? ( !opengl? ( >=x11-libs/agg-2.5 ) ) )
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		dev-libs/glib
+		dev-libs/atk
+	)
+	kde? ( kde-base/kdelibs:3.5 )
+	qt3? ( x11-libs/qt:3 )
+	sdl? ( media-libs/libsdl )
+	!gtk? ( !kde? ( !qt3? ( !sdl? ( !fbcon? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		dev-libs/glib
+		dev-libs/atk
+		kde-base/kdelibs:3.5
+	) ) ) ) )
+	dev-libs/libxml2
+	sys-libs/zlib
+	media-libs/jpeg
+	media-libs/libpng
+	net-misc/curl
+	ffmpeg? (
+		!gstreamer? (
+			media-libs/libsdl
+			>=media-video/ffmpeg-0.4.9_p20080326
+		)
+	)
+
+	gstreamer? (
+		media-plugins/gst-plugins-ffmpeg
+		media-plugins/gst-plugins-mad
+	)
+	>=dev-libs/boost-1.35.0
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-proto/xproto
+	dbus? ( sys-apps/dbus )
+	sys-devel/libtool
+	"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+#Tests currently not functional. Compilation fails. Use youtube instead.
+RESTRICT="test"
+
+pkg_setup() {
+	if use !gtk && use !kde && use !fbcon && use !qt3
+	then
+		einfo "No Graphical User Interface selected. Enabling kde and gtk"
+		einfo "since they are the defaults."
+		export defaultguis=1
+	fi
+
+	if use !agg && use !opengl && use cairo && use kde
+	then
+		eerror "The cairo renderer and the kde gui were selected"
+		eerror "They are incompatible with each other"
+		eerror "Disable one of them through the respective USE flag"
+		die "cairo and kde USE flags enabled at the same time"
+	fi
+
+	if use !agg && use opengl && use fbcon
+	then
+		eerror "The opengl renderer and the fbcon gui were selected"
+		eerror "They are incompatible with each other"
+		eerror "Disable one of them through the respective USE flag"
+		die "opengl and fbcon USE flags enabled at the same time"
+	fi
+
+	if use nsplugin && use !gtk && [ -z ${defaultguis} ]
+	then
+		eerror "The Firefox plugin was selected but not the GTK frontend."
+		eerror "Disable the nsplugin USE flag or enable the gtk USE flag"
+		die "nsplugin USE flag enabled with required gtk USE flag disabled"
+	fi
+
+	if use ffmpeg && use gstreamer
+	then
+		einfo "Only 1 audio output source can be compiled into ${PN}."
+		einfo "Selecting gstreamer, since that's upstream default."
+		einfo "To enable ffmpeg you must also disable gstreamer."
+	fi
+
+	if use agg
+	then
+		if use opengl || use cairo
+		then
+			einfo "Only 1 renderer can be activated at any one time."
+			einfo "If more than one renderer is activated, the order of preference is:"
+			einfo "agg > opengl > cairo"
+		fi
+	else
+		if use !opengl && use !cairo
+		then
+			einfo "No renderer selected from agg, opengl, cairo"
+			einfo "Default renderer agg selected."
+		fi
+	fi
+
+	if use !ffmpeg && use !gstreamer
+	then
+		ewarn "You did not select any media: ffmpeg gstreamer"
+		ewarn "You will not have sound!"
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	if use nsplugin ; then
+		myconf="${myconf} --enable-npapi --with-npapi-plugindir=/opt/netscape/plugins"
+	else
+		myconf="${myconf} --disable-npapi"
+	fi
+
+#Select renderer.
+	if use agg ; then
+		myconf="${myconf} --enable-renderer=agg"
+	elif use opengl ; then
+		myconf="${myconf} --enable-renderer=ogl"
+	elif use cairo ; then
+		myconf="${myconf} --enable-renderer=cairo"
+	else
+		myconf="${myconf} --enable-renderer=agg"
+	fi
+
+#Select which Graphical User Interfaces to build.
+	local	guis="" \
+		gui=""
+	for gui in fbcon-FB gtk-GTK2 kde-KDE qt3-QT sdl-SDL
+	do
+		use ${gui/-*} && guis="${guis},${gui/*-}"
+	done
+	guis=${guis#,}
+	if [ -z "${guis}" ]
+	then
+		guis="GTK2,KDE"
+	fi
+
+#Select which extensions to build.
+	local	extensions="FILEIO" \
+		extension=""
+	for extension in dbus-DBUS gtk-GTK2 test-DEJAGNU
+	do
+		use ${extension%-*} && extensions="${extensions},${extension#*-}"
+	done
+
+#Select audio output extension.
+	if use gstreamer
+	then
+		myconf="${myconf} --enable-media=gst"
+	elif use ffmpeg
+	then
+		myconf="${myconf} --enable-media=ffmpeg"
+	else
+		myconf="${myconf} --enable-media=none"
+	fi
+
+	econf \
+		$(use_enable video_cards_i810 i810-lod-bias)	\
+		--disable-testsuite				\
+		--enable-shared					\
+		--disable-allstatic				\
+		--enable-sdkinstall				\
+		--enable-gui=${guis}				\
+		--enable-extensions=${extensions}		\
+		--with-ffmpeg-incl=/usr/include			\
+		--with-kde-pluginprefix=${KDEDIR}		\
+		--without-included-ltdl				\
+		--with-ltdl-include=/usr/include		\
+		--with-ltdl-lib=/usr/$(get_libdir)		\
+		--with-plugins-install=system			\
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_test() {
+	cd testsuite
+	make check || die  "make check failed"
+	./anaylse-results.sh > TESTRESULTS.txt
+	cat TESTRESULTS.txt
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use nsplugin
+	then
+		emake DESTDIR="${D}" install-plugin \
+			|| die "emake install-plugin failed"
+		inst_plugin /opt/netscape/plugins/libgnashplugin.so
+	else
+		rm -rf "${D}/opt"
+	fi
+
+	if use kde
+	then
+		pushd plugin/klash &> /dev/null
+		make DESTDIR="${D}" install-plugin
+		popd &> /dev/null
+	fi
+
+	dodoc AUTHORS ChangeLog* NEWS README
+
+}
+
+pkg_postinst() {
+	ewarn "BETA"
+	ewarn "gnash is still in heavy development"
+	ewarn "please report gnash bugs upstream to the gnash devs"
+}