Version bump, bug #359533. Fixes bug #332755, bug #332757, bug #339610, bug #344069 and bug #356859.

(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

7 files changed, 358 insertions, 1 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index cab20e9d2c4f..614c750716b4 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.55 2011/03/04 09:22:48 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.56 2011/03/21 01:30:13 chithanh Exp $
+
+*gnash-0.8.9 (21 Mar 2011)
+
+  21 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +gnash-0.8.9.ebuild, +files/gnash-0.8.9-documentation-paths.patch,
+  +files/gnash-0.8.9-external-dejagnu.patch,
+  +files/gnash-0.8.9-find-openvg.patch, +files/gnash-0.8.9-klash.patch,
+  metadata.xml:
+  Version bump, bug #359533. Fixes bug #332755, bug #332757, bug #339610,
+  bug #344069 and bug #356859.
 
   04 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.8.ebuild:
diff --git a/www-plugins/gnash/files/gnash-0.8.9-documentation-paths.patch b/www-plugins/gnash/files/gnash-0.8.9-documentation-paths.patch
new file mode 100644
index 000000000000..dc56805fec6d
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-documentation-paths.patch
@@ -0,0 +1,19 @@
+diff -ur a/doc/C/Makefile.am b/doc/C/Makefile.am
+--- a/doc/C/Makefile.am	2011-03-13 17:47:36.000000000 +0100
++++ b/doc/C/Makefile.am	2011-03-20 23:50:03.560998121 +0100
+@@ -19,13 +19,13 @@
+ 
+ # Building a PDF using Apache FOP only works with fop-0.20.5 for now.
+ 
+-infodir = ${prefix}/share/info
++# infodir = ${prefix}/share/info
+ man1dir = ${mandir}/man1
+ docname = gnash
+ lang = C
+ omffile = gnash-C.omf
+ 
+-docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
++# docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
+ omf_dest_dir=$(datadir)/omf/$(PACKAGE)
+ scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+ 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch b/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
new file mode 100644
index 000000000000..eaffda77bc00
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
@@ -0,0 +1,24 @@
+diff -ur a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
+--- a/plugin/npapi/test.cpp	2011-03-13 17:47:36.000000000 +0100
++++ b/plugin/npapi/test.cpp	2011-03-20 23:52:20.369998096 +0100
+@@ -35,7 +35,7 @@
+ #include "npfunctions.h"
+ #endif
+ #include "pluginbase.h"
+-#include "dejagnu.h"
++#include <dejagnu.h>
+ #include "../../testsuite/check.h"
+ #include <regex.h>
+ 
+diff -ur a/testsuite/check.h b/testsuite/check.h
+--- a/testsuite/check.h	2011-02-26 19:11:08.000000000 +0100
++++ b/testsuite/check.h	2011-03-20 23:52:32.570998094 +0100
+@@ -29,7 +29,7 @@
+ 
+ #define HAVE_DEJAGNU_H 1 // we ship our own now...
+ #ifdef HAVE_DEJAGNU_H
+-#include "dejagnu.h"
++#include <dejagnu.h>
+ 
+ #define info(x) note x
+ 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-find-openvg.patch b/www-plugins/gnash/files/gnash-0.8.9-find-openvg.patch
new file mode 100644
index 000000000000..dfd6914ba320
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-find-openvg.patch
@@ -0,0 +1,12 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2011-03-18 14:49:55.000000000 +0100
++++ b/configure.ac	2011-03-21 01:54:41.058996609 +0100
+@@ -2393,7 +2393,7 @@
+ 
+ if test x"${build_ogv}" = xyes; then
+   GNASH_PKG_FIND(EGL, [EGL/egl.h], [EGL library], eglGetDisplay)
+-  GNASH_PKG_FIND(OpenVG, [vg/openvg.h], [OpenVG library], vgDrawImage)
++  GNASH_PKG_FIND(OpenVG, [VG/openvg.h], [OpenVG library], vgDrawImage)
+ fi
+ 
+ if test x"${build_gtk}" = xyes; then
diff --git a/www-plugins/gnash/files/gnash-0.8.9-klash.patch b/www-plugins/gnash/files/gnash-0.8.9-klash.patch
new file mode 100644
index 000000000000..e6afec04d293
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-klash.patch
@@ -0,0 +1,12 @@
+diff -ur a/macros/kde4.m4 b/macros/kde4.m4
+--- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
++++ b/macros/kde4.m4	2011-03-21 00:04:38.845997945 +0100
+@@ -210,7 +210,7 @@
+       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
+     fi
+     if test x"${KDE4_APPSDATADIR}" = x ; then 
+-      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
++      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
+     fi
+ 
+   if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/www-plugins/gnash/gnash-0.8.9.ebuild b/www-plugins/gnash/gnash-0.8.9.ebuild
new file mode 100644
index 000000000000..e0026902fb37
--- /dev/null
+++ b/www-plugins/gnash/gnash-0.8.9.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9.ebuild,v 1.1 2011/03/21 01:30:13 chithanh Exp $
+
+EAPI=3
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="optional"
+AT_M4DIR="cygnal"
+
+inherit autotools eutils kde4-base multilib nsplugins python 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://gnu/${PN}/${PV}/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python +sdl sdl-sound ssh ssl test vaapi video_cards_intel"
+
+# gnash fails if obsolete boost is installed, bug #334259
+RDEPEND=">=dev-libs/boost-1.41.0
+	!!dev-libs/boost:0
+	dev-libs/expat
+	dev-libs/libxml2
+	virtual/jpeg
+	media-libs/libpng
+	net-misc/curl
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	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 )
+	)
+	openvg? (
+		virtual/opengl
+	)
+	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? ( virtual/mysql )
+	lirc? ( app-misc/lirc )
+	dbus? ( sys-apps/dbus )
+	ssh?  ( >=net-libs/libssh-0.4[server] )
+	ssl? ( dev-libs/openssl )
+	vaapi? ( x11-libs/libva[opengl?] )
+	"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
+	gnome? ( app-text/rarian )
+	test? ( dev-util/dejagnu )"
+# Tests hang with sandbox, bug #321017
+RESTRICT="test"
+
+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 vaapi && use !agg; then
+		eerror "Support for VAAPI currently requires the agg renderer."
+		die "vaapi requires the agg USE flag."
+	fi
+
+	if use !agg && use !cairo && use !opengl && !use openvg; then
+		eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl|openvg]."
+		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 fbcon && use !agg; then
+		eerror "Building gnash with fbcon requires the agg renderer."
+		die "fbcon requires the agg USE flag."
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	# TODO: Patch no longer applies
+#	epatch "${FILESDIR}"/${PN}-0.8.7-amf-include.patch
+
+	# Look for openvg.h in correct path
+	epatch "${FILESDIR}"/${PN}-0.8.9-find-openvg.patch
+
+	# Fix paths for klash, bug #339610
+	epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
+
+	# Install documentation into the proper directories, bug #296110
+	epatch "${FILESDIR}"/${PN}-0.8.9-documentation-paths.patch
+
+	# Use external dejagnu for tests, bug #321017
+	epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
+
+	# Fix building on ppc64, bug #342535
+	use ppc64 && append-flags -mminimal-toc
+
+	eautoreconf
+}
+src_configure() {
+	local gui hwaccel input media myconf myext renderers
+
+	# Set nsplugin install directory.
+	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
+
+	# Set hardware acceleration.
+	if use vaapi; then
+		hwaccel="vaapi"
+	else
+		hwaccel="none"
+	fi
+
+	# Set rendering engine.
+	use agg && renderers+=",agg"
+	use cairo && renderers+=",cairo"
+	use opengl && renderers+=",opengl"
+	use openvg && renderers+=",openvg"
+
+	# 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"
+	fi
+
+	# Set media handler.
+	use ffmpeg || use gstreamer || media+=",none"
+	use ffmpeg && media+=",ffmpeg"
+	use gstreamer && media+=",gst"
+
+	# 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"
+	else
+		myconf="${myconf} --enable-sound=none"
+	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/,//' )
+	media=$( echo $media | 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 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} \
+		--enable-media=${media} \
+		${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 || die
+		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 19bc628e1cc4..b14b7aacd859 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -13,6 +13,7 @@
 	<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='openvg'>Rendering based on the OpenVG graphics acceleration API</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='ssl'>Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>