New snapshot. Make SDL entirely optional, and split GUI and sound flags, bug #325445. Ebuild now doubles as live ebuild, bug #300466. Add fbcon USE flag for the framebuffer GUI. Disable defunct avm2 support. Rename ssl USE flag to openssl after discussion with upstream.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 291 insertions, 3 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 3821d5257510..5df6b9c4e226 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.36 2010/08/09 12:55:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.37 2010/08/13 19:02:06 chithanh Exp $
+
+*gnash-0.8.7_p20100812 (13 Aug 2010)
+
+  13 Aug 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +gnash-0.8.7_p20100812.ebuild, metadata.xml:
+  New snapshot. Make SDL entirely optional, and split GUI and sound flags,
+  bug #325445. Ebuild now doubles as live ebuild, bug #300466. Add fbcon USE
+  flag for the framebuffer GUI. Disable defunct avm2 support. Rename ssl USE
+  flag to openssl after discussion with upstream.
 
   09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> gnash-0.8.5.ebuild,
   gnash-0.8.6.ebuild, gnash-0.8.7.ebuild, gnash-0.8.7_p20100706.ebuild:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index c9be8346dd96..eca89f625db2 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -15,9 +15,11 @@ DIST gnash-0.8.5.tar.bz2 3335797 RMD160 8ef599237c3162f9f28459855e4729d400bd4304
 DIST gnash-0.8.6.tar.bz2 3571055 RMD160 987342b6cc46e94d5684d917bebbe6f6da6033bf SHA1 11c115f45b3803b157f65f30f1f65d26fea34328 SHA256 05f4b75eb2a5bc543fcd743641825147ce5e1b0bf675896e01401556a85332ea
 DIST gnash-0.8.7.tar.bz2 3617298 RMD160 809e5dcf6f11567f7463d1e772053aa54f7170ed SHA1 bba6245ce251730fd58a59b37609ca4b8898ae01 SHA256 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
 DIST gnash-0.8.7_p20100706.tar.xz 3923900 RMD160 2b8d2fd3a108a9163b3ba96bc245f5f275213b81 SHA1 817bbf050624e119c7b84d45739ec0d28c78906e SHA256 ff993a256a2c5e12727f635951d4426eb79418b80bd94db978fcee6c1778e034
+DIST gnash-0.8.7_p20100812.tar.xz 3813288 RMD160 22d7f28f69adcf473a4d752e2f0c430d35d118ac SHA1 097ec82fad255021a9c326a1b68f1c8ddb319b0d SHA256 d6da2e336f3f3d297df21fbedabdfe32dec1e81191c6ba5dc1054e944b605866
 EBUILD gnash-0.8.5.ebuild 6847 RMD160 a5c919db8f2000ccdd69c506a3e1e4c38575d899 SHA1 cca2bff47f3e59042b7b09b0d1c6963d54964a77 SHA256 5bc8619c682951efa4b796aabf1c365b0180bfd8599c9551468dbee2dc37b5ab
 EBUILD gnash-0.8.6.ebuild 7734 RMD160 54bd6b432b08a227025c81ac45d3dce6f954dd47 SHA1 1451d7b0ecbda031d6caae2f55e8dea79a8b1c15 SHA256 8976a9da33c75dcd304680f0ebb890f0edb57ad728146445230ff407282efa39
 EBUILD gnash-0.8.7.ebuild 7999 RMD160 bbfaeeca8b37cf17c191e3716b71ab69666f724e SHA1 09647562aeb72c43fffa1b1e4e2fcddd8a0bf8cc SHA256 e19effc6f1676e74521d032b24c2b4482da4cc650888477294eebd2e88063bfa
 EBUILD gnash-0.8.7_p20100706.ebuild 7755 RMD160 3206440dd3d01ec5e080522176e627ce84944fbc SHA1 d99a890972bbf55b8fd37a78511198861156ef11 SHA256 85210eb3caade0bed69e1d55de9043e11b09e538b5e921eedbf6928f7687cb68
-MISC ChangeLog 18823 RMD160 ffa8b4cc014dbe7b2222086e1a11a9aca3f15040 SHA1 1a7ba376d6d8ab842af11cb62809ba507b10d3e4 SHA256 afe9b33376abb1126ef8b230d3f875474d6ac459c62df2ab968c54d1cf848595
-MISC metadata.xml 719 RMD160 51a746fd8407e33d976bf8c423436c0087d74adb SHA1 a610e9c36c277a508f37e28dddb51d8ee85918dc SHA256 af8ffab2f1a5f1864cf1d02d3da9d57202235c0887e7e07054480f8ec61814c6
+EBUILD gnash-0.8.7_p20100812.ebuild 7911 RMD160 7a8e10939e954c72e9b9cb6f349933dd67c4c877 SHA1 39071d741b78a3aa561ca57b4893d7d45e609982 SHA256 ea31599036ea2165f45532244b4a568526dc8674530006af7e46d299640c6b66
+MISC ChangeLog 19256 RMD160 7cb16859d83cd6c24a507748f76eb955fecea88c SHA1 950d165e443439bbfb650b69229aa6d13c9604a1 SHA256 06f47440f014d5decefae03e1f453b18097c7d95f956878ca50df4a0ed86e718
+MISC metadata.xml 863 RMD160 62955e23fbe0b0b3e9562a143bf051fca59fbaff SHA1 85247ecf93bec762839d42f49ca663aad7d8e331 SHA256 078095b61d5b5eb1fbe87b698e8ca29fe4f64ee54a1ce4d8ae575f2e90420a13
diff --git a/www-plugins/gnash/gnash-0.8.7_p20100812.ebuild b/www-plugins/gnash/gnash-0.8.7_p20100812.ebuild
new file mode 100644
index 000000000000..ea7ad9337dd3
--- /dev/null
+++ b/www-plugins/gnash/gnash-0.8.7_p20100812.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7_p20100812.ebuild,v 1.1 2010/08/13 19:02:06 chithanh Exp $
+
+EAPI=3
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="optional"
+AT_M4DIR="cygnal"
+
+inherit autotools eutils kde4-base multilib nsplugins flag-o-matic
+
+DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
+HOMEPAGE="http://www.gnu.org/software/gnash/"
+
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
+	inherit git
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openssl python +sdl sdl-sound ssh test vaapi video_cards_intel xv"
+
+RDEPEND=">=dev-libs/boost-1.35.0
+	dev-libs/expat
+	dev-libs/libxml2
+	media-libs/jpeg
+	media-libs/libpng
+	net-misc/curl
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXv
+	media-libs/giflib
+	x11-proto/xproto
+	agg? ( x11-libs/agg )
+	cairo? ( x11-libs/cairo )
+	doc? (
+		>=app-text/docbook2X-0.8.8
+		app-text/docbook-sgml-utils
+	)
+	ffmpeg? (
+		media-video/ffmpeg[vaapi?]
+	)
+	gstreamer? (
+		media-plugins/gst-plugins-ffmpeg
+		media-plugins/gst-plugins-mad
+		media-plugins/gst-plugins-meta
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		net-libs/xulrunner:1.9
+		python? ( dev-python/pygtk:2 )
+	)
+	kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} )
+	opengl? (
+		virtual/opengl
+		gtk? ( x11-libs/gtkglext )
+	)
+	nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 )
+	sdl? ( media-libs/libsdl[X] )
+	sdl-sound? ( media-libs/libsdl )
+	media-libs/speex[ogg]
+	sys-libs/zlib
+	>=sys-devel/libtool-2.2
+	mysql? ( dev-db/mysql )
+	lirc? ( app-misc/lirc )
+	dbus? ( sys-apps/dbus )
+	ssh?  ( >=net-libs/libssh-0.4[server] )
+	openssl? ( dev-libs/openssl )
+	vaapi? ( x11-libs/libva[opengl?] )
+	xv? ( x11-libs/libXv )
+	"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
+	gnome? ( app-text/rarian )"
+
+pkg_setup() {
+	if use !ffmpeg && use !gstreamer; then
+		ewarn "You are trying to build Gnash without choosing a media handler."
+		ewarn "Sound and video playback will not work."
+	fi
+
+	if use vaapi && use !ffmpeg; then
+		eerror "Support for VAAPI currently requires the ffmpeg media handler."
+		die "vaapi requires the ffmpeg USE flag."
+	fi
+
+	if use xv && use !opengl; then
+		eerror "Support for xvideo currently requires the opengl renderer."
+		die "xv requires the opengl USE flag."
+	fi
+
+	if use !agg && use !cairo && use !opengl; then
+		eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
+		die "Please enable a renderer"
+	fi
+
+	if use !fbcon && use !kde && use !gtk && use !sdl; then
+		ewarn "You are trying to build Gnash without choosing a gui frontend [fbcon,gtk,kde,sdl]."
+		die "Please enable at least one of these USE flags."
+	fi
+
+	if use python && use !gtk; then
+		eerror "Building gnash with python support requires gtk."
+		die "python requires the gtk USE flag."
+	fi
+
+	if use nsplugin && use !gtk; then
+		eerror "Building gnash with nsplugin requires the gtk gui."
+		die "Nsplugin requires the gtk gui."
+	fi
+
+	if use sdl; then
+		einfo "Enable SDL as gui frontend and sound handler"
+	fi
+
+	if use lirc; then
+		einfo "Enable LIRC daemon support and lirc extension"
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	# TODO: Patch no longer applies
+#	epatch "${FILESDIR}"/${PN}-0.8.7-amf-include.patch
+
+	# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
+	epatch "${FILESDIR}"/${PN}-0.8.5-xpidl-sdkdir.patch
+
+	# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
+	# Fixes building against xulrunner-1.9.0, bug #284073.
+	epatch "${FILESDIR}"/${PN}-0.8.7-xpcom-idldir.patch
+
+	# Resurect patch from bug #230287
+	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
+
+	# Adapted from Alt Linux to fix klash support properly
+	epatch "${FILESDIR}"/${PN}-0.8.8-klash.patch
+
+	# Make gnash find moc and uic properly, upstream bug #25758,
+	# gentoo bug #283905
+	epatch "${FILESDIR}"/${PN}-0.8.7-moc-qt4.patch
+
+	eautoreconf
+}
+src_configure() {
+	local gui hwaccel input myconf myext renderers
+
+	# Set nsplugin install directory.
+	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
+
+	# Set hardware acceleration, "none" is always required or else vaapi and xv become automagic
+	hwaccel="none"
+	use xv && hwaccel+=",xv"
+	use vaapi && hwaccel+=",vaapi"
+
+	# Set rendering engine.
+	use agg && renderers+=",agg"
+	use cairo && renderers+=",cairo"
+	use opengl && renderers+=",opengl"
+
+	# Set kde and konqueror plugin directories.
+	if use kde; then
+		myconf="${myconf}
+			--with-plugins-install=system
+			--with-kde4-incl=${KDEDIR}/include
+			--with-kde4-configdir=${KDEDIR}/share/config
+			--with-kde4-prefix=${KDEDIR}
+			--with-kde4-lib=${KDEDIR}/$(get_libdir)
+			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
+			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
+			--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4/plugins"
+	fi
+
+	# Set media handler.
+	if use ffmpeg; then
+		myconf="${myconf} --enable-media=ffmpeg"
+	elif use gstreamer; then
+		myconf="${myconf} --enable-media=gst"
+	else
+		myconf="${myconf} --enable-media=none"
+	fi
+	# Set gui.
+	use gtk && gui=",gtk"
+	use fbcon && gui="${gui},fb"
+	use kde && gui="${gui},kde4"
+	use sdl && gui="${gui},sdl"
+
+	if use sdl-sound; then
+		myconf="${myconf} --enable-sound=sdl"
+	fi
+
+	# Set extensions
+	use mysql && myext=",mysql"
+	use gtk && myext="${myext},gtk"
+	use lirc && myext="${myext},lirc"
+	use dbus && myext="${myext},dbus"
+
+	# Strip extra comma from gui, myext, hwaccel and renderers.
+	gui=$( echo $gui | sed -e 's/,//' )
+	hwaccel=$( echo $hwaccel | sed -e 's/,//' )
+	myext=$( echo $myext | sed -e 's/,//' )
+	renderers=$( echo $renderers | sed -e 's/,//' )
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-kparts3 \
+		$(use_enable cygnal) \
+		$(use_enable cygnal cgibins) \
+		$(use_enable doc docbook) \
+		$(use_enable gnome ghelp) \
+		$(use_enable kde kparts4) \
+		$(use_enable lirc) \
+		$(use_enable nls) \
+		$(use_enable nsplugin npapi) \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable openssl ssl) \
+		$(use_enable test testsuite) \
+		$(use_enable video_cards_intel i810-lod-bias) \
+		--enable-gui=${gui} \
+		--enable-extensions=${myext} \
+		--enable-renderer=${renderers} \
+		--enable-hwaccel=${hwaccel} \
+		${myconf}
+}
+src_test() {
+	local log=testsuite-results.txt
+	cd testsuite
+	emake check || die "make check failed"
+	./anaylse-results.sh > $log || die "results analyze failed"
+	cat $log
+}
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install nsplugin in directory set by --with-npapi-plugindir.
+	if use nsplugin; then
+		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
+	fi
+
+	# Install kde konqueror plugin.
+	if use kde; then
+		pushd "${S}/plugin/klash4" >& /dev/null
+		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
+		popd >& /dev/null
+	fi
+	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so \
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
+pkg_postinst() {
+	if use !gnome || use !gstreamer && use !ffmpeg ; then
+		ewarn ""
+		ewarn "Gnash was built without a media handler and or http handler !"
+		ewarn ""
+		ewarn "If you want Gnash to support video then you will need to"
+		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
+		ewarn ""
+	fi
+	ewarn "${PN} is still in heavy development"
+	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
+	ewarn "And then report a Gentoo bug to the maintainer"
+	use kde && kde4-base_pkg_postinst
+}
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
index 6b6c8f0f866d..82cbfd175a3a 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -13,6 +13,8 @@
 	<use>
 	  <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
 	  <flag name='cygnal'>Enable building of the cygnal server</flag>
+	  <flag name='openssl'>Enable directly using OpenSSL</flag>
+	  <flag name='sdl-sound'>Enable SDL audio output for the standalone player</flag>
 	  <flag name='ssh'>Enable using SSH for network authentication in libnet</flag>
 	  <flag name='vaapi'>Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
 	</use>