From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-430975-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1S0ih9-0003KY-1z
	for garchives@archives.gentoo.org; Fri, 24 Feb 2012 00:07:31 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 80401E0E01;
	Fri, 24 Feb 2012 00:07:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 42971E0DF6
	for <gentoo-commits@lists.gentoo.org>; Fri, 24 Feb 2012 00:07:23 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 824931B4003
	for <gentoo-commits@lists.gentoo.org>; Fri, 24 Feb 2012 00:07:22 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2265)
	id 552DD2004B; Fri, 24 Feb 2012 00:07:21 +0000 (UTC)
From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, chithanh@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: gnash-0.8.10.ebuild metadata.xml ChangeLog
X-VCS-Repository: gentoo-x86
X-VCS-Files: gnash-0.8.10.ebuild metadata.xml ChangeLog
X-VCS-Directories: www-plugins/gnash
X-VCS-Committer: chithanh
X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen
Content-Type: text/plain; charset=utf8
Message-Id: <20120224000721.552DD2004B@flycatcher.gentoo.org>
Date: Fri, 24 Feb 2012 00:07:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: df505e5e-aaa8-4a57-9621-f2309e92e918
X-Archives-Hash: 428ff2308674f846094698ad3ade44b3

chithanh    12/02/24 00:07:21

  Modified:             metadata.xml ChangeLog
  Added:                gnash-0.8.10.ebuild
  Log:
  Version bump, bug #403177. Force python-2 during build, bug #392969.
 =20
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 www-plugins/gnash/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
metadata.xml?rev=3D1.13&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
metadata.xml?rev=3D1.13&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
metadata.xml?r1=3D1.12&r2=3D1.13

Index: metadata.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml	24 Sep 2011 10:54:38 -0000	1.12
+++ metadata.xml	24 Feb 2012 00:07:21 -0000	1.13
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 	  <flag name=3D'agg'>Rendering based on the Anti-Grain Geometry Renderi=
ng Engine library</flag>
+	  <flag name=3D'egl'>Enable EGL support for the OpenVG, OpenGL and X11 =
renderers</flag>
 	  <flag name=3D'cygnal'>Enable building of the cygnal server</flag>
 	  <flag name=3D'openvg'>Rendering based on the OpenVG graphics accelera=
tion API</flag>
 	  <flag name=3D'sdl-sound'>Enable SDL audio output for the standalone p=
layer</flag>



1.74                 www-plugins/gnash/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
ChangeLog?rev=3D1.74&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
ChangeLog?rev=3D1.74&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
ChangeLog?r1=3D1.73&r2=3D1.74

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	1 Feb 2012 17:14:47 -0000	1.73
+++ ChangeLog	24 Feb 2012 00:07:21 -0000	1.74
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.73 20=
12/02/01 17:14:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.74 20=
12/02/24 00:07:21 chithanh Exp $
+
+*gnash-0.8.10 (24 Feb 2012)
+
+  24 Feb 2012; Ch=C3=AD-Thanh Christopher Nguy=E1=BB=85n <chithanh@gento=
o.org>
+  +gnash-0.8.10.ebuild, +files/gnash-0.8.10-amf-include.patch,
+  +files/gnash-0.8.10-gettext-macro.patch, metadata.xml:
+  Version bump, bug #403177. Force python-2 during build, bug #392969.
=20
   01 Feb 2012; Brent Baude <ranger@gentoo.org> gnash-0.8.9-r2.ebuild:
   Mistakenly commited. Back to ~ppc gnash-0.8.9-r2



1.1                  www-plugins/gnash/gnash-0.8.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
gnash-0.8.10.ebuild?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/=
gnash-0.8.10.ebuild?rev=3D1.1&content-type=3Dtext/plain

Index: gnash-0.8.10.ebuild
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10.ebuild,=
v 1.1 2012/02/24 00:07:21 chithanh Exp $

EAPI=3D4
CMAKE_REQUIRED=3D"never"
KDE_REQUIRED=3D"optional"
AT_M4DIR=3D"cygnal"
PYTHON_DEPEND=3D"python? 2"
RESTRICT_PYTHON_ABIS=3D"3.*"

inherit autotools eutils kde4-base multilib nsplugins python flag-o-matic

DESCRIPTION=3D"GNU Flash movie player that supports many SWF v7,8,9 featu=
res"
HOMEPAGE=3D"http://www.gnu.org/software/gnash/"

if [[ ${PV} =3D 9999* ]]; then
	SRC_URI=3D""
	EGIT_REPO_URI=3D"git://git.savannah.gnu.org/gnash.git"
	inherit git-2
else
# Release tarball is b0rked, upstream #35612
#	SRC_URI=3D"mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
	SRC_URI=3D"http://git.savannah.gnu.org/cgit/gnash.git/snapshot/gnash-0.8=
.10.tar.gz"
fi

LICENSE=3D"GPL-3"
SLOT=3D"0"
KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=3D"X +agg cairo cygnal dbus directfb doc egl fbcon +ffmpeg gnome gst=
reamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sou=
nd ssh ssl test vaapi"
REQUIRED_USE=3D"fbcon? ( agg )
	nsplugin? ( gtk )
	python? ( gtk )
	vaapi? ( agg ffmpeg )
	|| ( agg cairo opengl openvg )
	|| ( fbcon kde gtk sdl )
	"

# gnash fails if obsolete boost is installed, bug #334259
RDEPEND=3D">=3Ddev-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 )
	directfb? (
		dev-libs/DirectFB
	)
	doc? (
		>=3Dapp-text/docbook2X-0.8.8
		app-text/docbook-sgml-utils
	)
	egl? (
		media-libs/mesa[egl]
	)
	fbcon? (
		x11-libs/tslib
	)
	ffmpeg? (
		virtual/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? ( $(add_kdebase_dep kdebase-startkde) )
	opengl? (
		virtual/opengl
		gtk? ( x11-libs/gtkglext )
	)
	openvg? (
		virtual/opengl
	)
	nsplugin? ( >=3Dnet-libs/xulrunner-1.9.2:1.9 )
	sdl? ( media-libs/libsdl[X] )
	sdl-sound? ( media-libs/libsdl )
	media-libs/speex[ogg]
	sys-libs/zlib
	>=3Dsys-devel/libtool-2.2
	mysql? ( virtual/mysql )
	lirc? ( app-misc/lirc )
	dbus? ( sys-apps/dbus )
	ssh?  ( >=3Dnet-libs/libssh-0.4[server] )
	ssl? ( dev-libs/openssl )
	vaapi? ( x11-libs/libva[opengl?] )
	"
DEPEND=3D"${RDEPEND}
	dev-util/pkgconfig
	nls? ( sys-devel/gettext )
	gnome? ( app-text/rarian )
	test? ( dev-util/dejagnu )"
# Tests hang with sandbox, bug #321017
RESTRICT=3D"test"

pkg_setup() {
	kde4-base_pkg_setup

	if has_version ">=3Ddev-libs/boost-1.46" && has_version "<dev-libs/boost=
-1.46"; then
		ewarn "If you have multiple versions of boost installed, gnash may atte=
mpt to"
		ewarn "compile against the older version and link against newer version=
, which can"
		ewarn "cause the build to fail. Unmerge of the old version of boost is =
recommended."
	fi

	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

	# won't build with python-3, bug #392969
	if use python; then
		python_set_active_version 2
	fi
}

src_prepare() {
	# Fix paths for klash, bug #339610
	epatch "${FILESDIR}"/${PN}-0.8.9-klash.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

	# Fix kde multilib library path, bug #391283
	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch

	# Fix gettext macros build failure
	epatch "${FILESDIR}"/${PN}-0.8.10-gettext-macro.patch

	# Fix libamf includes
	epatch "${FILESDIR}"/${PN}-0.8.10-amf-include.patch

	eautoreconf
}
src_configure() {
	local device gui input media myconf myext renderers

	# Set nsplugin install directory.
	use nsplugin && myconf=3D"${myconf} --with-npapi-plugindir=3D/usr/$(get_=
libdir)/gnash/npapi/"

	# Set hardware acceleration.
	use X && device+=3D",x11"
	use directfb && device+=3D",directfb"
	use egl && device+=3D",egl"
	use fbcon && device+=3D",rawfb"
	use vaapi && device+=3D",vaapi"
	[[ "${device}x" =3D=3D "x" ]] && device+=3D",none"

	# Set rendering engine.
	use agg && renderers+=3D",agg"
	use cairo && renderers+=3D",cairo"
	use opengl && renderers+=3D",opengl"
	use openvg && renderers+=3D",openvg"

	# Set kde and konqueror plugin directories.
	if use kde; then
		myconf=3D"${myconf}
			--with-plugins-install=3Dsystem
			--with-kde4-incl=3D${KDEDIR}/include
			--with-kde4-configdir=3D${KDEDIR}/share/config
			--with-kde4-prefix=3D${KDEDIR}
			--with-kde4-lib=3D${KDEDIR}/$(get_libdir)
			--with-kde-appsdatadir=3D${KDEDIR}/share/apps/klash
			--with-kde4-servicesdir=3D${KDEDIR}/share/kde4/services"
	fi

	# Set media handler.
	use ffmpeg || use gstreamer || media+=3D",none"
	use ffmpeg && media+=3D",ffmpeg"
	use gstreamer && media+=3D",gst"

	# Set gui.
	use gtk && gui=3D",gtk"
	use fbcon && gui=3D"${gui},fb"
	use kde && gui=3D"${gui},kde4"
	use sdl && gui=3D"${gui},sdl"

	if use sdl-sound; then
		myconf=3D"${myconf} --enable-sound=3Dsdl"
	else
		myconf=3D"${myconf} --enable-sound=3Dnone"
	fi

	# Set extensions
	use mysql && myext=3D",mysql"
	use gtk && myext=3D"${myext},gtk"
	use lirc && myext=3D"${myext},lirc"
	use dbus && myext=3D"${myext},dbus"

	# Strip extra comma from gui, myext, hwaccel and renderers.
	device=3D$( echo $device | sed -e 's/,//' )
	gui=3D$( echo $gui | sed -e 's/,//' )
	myext=3D$( echo $myext | sed -e 's/,//' )
	renderers=3D$( echo $renderers | sed -e 's/,//' )
	media=3D$( echo $media | sed -e 's/,//' )

	econf \
		--docdir=3D/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 nls) \
		$(use_enable nsplugin npapi) \
		$(use_enable python) \
		$(use_enable ssh) \
		$(use_enable ssl) \
		$(use_enable test testsuite) \
		--enable-gui=3D${gui} \
		--enable-device=3D${device} \
		--enable-extensions=3D${myext} \
		--enable-renderer=3D${renderers} \
		--enable-media=3D${media} \
		${myconf}
}
src_test() {
	local log=3Dtestsuite-results.txt
	cd testsuite
	emake check || die "make check failed"
	./anaylse-results.sh > $log || die "results analyze failed"
	cat $log
}
src_install() {
	emake DESTDIR=3D"${D}" install || die "emake install failed"

	# Install nsplugin in directory set by --with-npapi-plugindir.
	if use nsplugin; then
		emake DESTDIR=3D"${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=3D"${D}" install-plugin || die "install kde plugins faile=
d"
		popd >& /dev/null
	fi
	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplug=
in install directory.
	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugi=
n.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
}