diff options
author | Romain Perier <mrpouet@gentoo.org> | 2009-09-05 17:51:11 +0000 |
---|---|---|
committer | Romain Perier <mrpouet@gentoo.org> | 2009-09-05 17:51:11 +0000 |
commit | 74ae811c31038971fbcdc69024c457a18e164dff (patch) | |
tree | 6f379ffc4365f30489812dd32589708f9d643731 /www-plugins | |
parent | Bump to 1.3.14, fixes #283766 (diff) | |
download | gentoo-2-74ae811c31038971fbcdc69024c457a18e164dff.tar.gz gentoo-2-74ae811c31038971fbcdc69024c457a18e164dff.tar.bz2 gentoo-2-74ae811c31038971fbcdc69024c457a18e164dff.zip |
Version bump, Assign myself to maintainer, Fix QA errors.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
-rw-r--r-- | www-plugins/gnash/ChangeLog | 9 | ||||
-rw-r--r-- | www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch | 29 | ||||
-rw-r--r-- | www-plugins/gnash/gnash-0.8.4.ebuild | 5 | ||||
-rw-r--r-- | www-plugins/gnash/gnash-0.8.5.ebuild | 204 | ||||
-rw-r--r-- | www-plugins/gnash/metadata.xml | 9 |
5 files changed, 248 insertions, 8 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 9a48c26d7e81..9f62a8ee4c32 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-plugins/gnash # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.3 2009/09/04 20:07:30 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.4 2009/09/05 17:51:10 mrpouet Exp $ + +*gnash-0.8.5 (05 Sep 2009) + + 05 Sep 2009; Romain Perier <mrpouet@gentoo.org> + +gnash-0.8.5.ebuild, gnash-0.8.4.ebuild, + +files/gnash-0.8.5-xpidl-sdkdir.patch, metadata.xml: + Version bump, Assign myself to maintainer. Fix QA errors. 04 Sep 2009; Rémi Cardona <remi@gentoo.org> metadata.xml: assign package to maintainer-needed for removal in 60 days diff --git a/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch b/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch new file mode 100644 index 000000000000..5bb456b44222 --- /dev/null +++ b/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch @@ -0,0 +1,29 @@ +From e462e38c02b4b1a7d5fe76df3f9bcb1c5a9e8940 Mon Sep 17 00:00:00 2001 +From: Romain Perier <mrpouet@gentoo.org> +Date: Sat, 5 Sep 2009 12:46:21 +0200 +Subject: [PATCH] Fix xpidl binary path in XPIDL + +Which didn't lookup into sdkdir variable from libxul.pc + +--- + macros/xpcom.m4 | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/macros/xpcom.m4 b/macros/xpcom.m4 +index 8a5be6b..37e32a9 100644 +--- a/macros/xpcom.m4 ++++ b/macros/xpcom.m4 +@@ -103,8 +103,8 @@ AC_DEFUN([GNASH_PATH_XPCOM], + if test x"${ac_cv_path_xpcom_incl}" != x; then + XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}" + XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'` +- XPIDL=`echo ${ac_cv_path_xpidl} | sed -e 's:-L::' -e 's:sdk-::' -e 's:sdk/lib::' -e 's:-devel::' -e 's:lib$::'` +- XPIDL="${XPIDL}xpidl" ++ XPIDL=$(pkg-config libxul --variable=sdkdir) ++ XPIDL="${XPIDL}/bin/xpidl" + AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin]) + else + XPCOM_CFLAGS="" +-- +1.6.4.2 + diff --git a/www-plugins/gnash/gnash-0.8.4.ebuild b/www-plugins/gnash/gnash-0.8.4.ebuild index a77641d54c73..742f1ff0f581 100644 --- a/www-plugins/gnash/gnash-0.8.4.ebuild +++ b/www-plugins/gnash/gnash-0.8.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.4.ebuild,v 1.2 2009/05/06 20:38:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.4.ebuild,v 1.3 2009/09/05 17:51:10 mrpouet Exp $ EAPI=1 @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="+agg -cairo dbus -fbcon -ffmpeg +gstreamer +gtk +kde +nsplugin -opengl -qt3 -sdl video_cards_i810" +IUSE="+agg -cairo dbus -fbcon -ffmpeg +gstreamer +gtk +kde +nsplugin -opengl -qt3 -sdl video_cards_intel" RDEPEND=" agg? ( >=x11-libs/agg-2.5 ) @@ -74,7 +74,6 @@ RDEPEND=" x11-libs/libXt x11-proto/xproto dbus? ( sys-apps/dbus ) - sys-devel/libtool " DEPEND="${RDEPEND} dev-util/pkgconfig" diff --git a/www-plugins/gnash/gnash-0.8.5.ebuild b/www-plugins/gnash/gnash-0.8.5.ebuild new file mode 100644 index 000000000000..ca9bf3c16e0a --- /dev/null +++ b/www-plugins/gnash/gnash-0.8.5.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.1 2009/09/05 17:51:10 mrpouet Exp $ + +EAPI="2" +KDE_REQUIRED="optional" +AT_M4DIR="cygnal" + +inherit autotools eutils kde4-base multilib nsplugins + +DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features" +HOMEPAGE="http://www.gnu.org/software/gnash/" +SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="agg cairo cygnal doc +ffmpeg gnome gstreamer gtk kde neon +nls nsplugin +opengl +sdl +speex video_cards_intel +zlib" + +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 + 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-libs/libsdl[X] + >=media-video/ffmpeg-0.5 + ) + gstreamer? ( + media-plugins/gst-plugins-ffmpeg + media-plugins/gst-plugins-mad + media-plugins/gst-plugins-meta + gnome? ( media-plugins/gst-plugins-gnomevfs ) + neon? ( >=media-plugins/gst-plugins-neon-0.10.7 ) + ) + gtk? ( + x11-libs/gtk+:2 + net-libs/xulrunner:1.9 + ) + kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} ) + opengl? ( + virtual/opengl + gtk? ( x11-libs/gtkglext ) + ) + sdl? ( media-libs/libsdl[X] ) + nsplugin? ( net-libs/xulrunner:1.9 ) + speex? ( media-libs/speex[ogg] ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +# For the inherit of kde4-base +CMAKE_IN_TREE_BUILD=1 + +pkg_setup() { + if ! ( use agg || use cairo || use opengl ); then + ewarn "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]." + has_version x11-libs/cairo && ewarn "cairo enabled as default" \ + || die "Please enable a renderer" + elif use agg && use cairo && use opengl; then + ewarn "You enabled 3 renderers, agg was chosen as default." + fi + + if use cairo && use !agg && use !opengl && use kde; then + eerror "The cairo renderer and kde gui are not compatible." + die "Cairo renderer incompatible with kde gui !" + fi + + if ! ( use kde || use gtk || use sdl ); then + ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]." + has_version media-libs/libsdl[X] && ewarn "sdl enabled as default" \ + || die "Please enable at least one of these USE flags." + fi + + if use nsplugin && use !gtk; then + eerror "Building gnash with nsplugin requires the gtk gui." + die "Nsplugin requires the gtk gui." + fi + kde4-base_pkg_setup +} + +src_prepare() { + local mozsdk_incdir=${S}/plugin/mozilla-sdk/include + + # Defines $(XPIDL) correctly using sdkdir variable from libxul.pc + epatch "${FILESDIR}"/${P}-xpidl-sdkdir.patch + + # Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header + # in case where xpcom (implicitly added with gtk) is enabled, we use the system header + if use gtk; then + rm -f ${mozsdk_incdir}/npapi.h + ln -s $(pkg-config libxul-unstable --variable=includedir)/unstable/npapi.h \ + ${mozsdk_incdir}/npapi.h || die "symlink failed" + fi + eautoreconf +} +src_configure() { + local myconf jobs + local gui="sdl" + # Set nsplugin install directory. + use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins" + # Set kde and konqueror plugin directories. + if use kde; then + myconf="${myconf} + --with-qt4-incl=/usr/include/qt4 + --with-qt4-lib=/usr/$(get_libdir)/qt4 + --with-kde4-incl=${KDEDIR}/include + --with-kde4-configdir=${KDEDIR}/share/config + --with-kde4-prefix=${KDEDIR} + --with-kde4-lib=${KDEDIR}/$(get_libdir)/kde4 + --with-kde-appsdatadir=${KDEDIR}/share/apps/klash + --with-kde4-servicesdir=${KDEDIR}/share/services" + fi + # Set rendering engine. + if use agg; then + myconf="${myconf} --enable-renderer=agg" + elif use opengl; then + myconf="${myconf} --enable-renderer=ogl" + else + myconf="${myconf} --enable-renderer=cairo" + 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 kde && gui="${gui},kde4" + use sdl && gui="${gui},sdl" + # Strip extra comma from gui. + gui=$( echo $gui|sed -e 's/,//' ) + econf \ + --disable-dependency-tracking \ + --disable-kparts3 \ + --enable-nspr \ + --enable-expat \ + --enable-jpeg \ + --enable-png \ + --enable-gif \ + --enable-ungif \ + $(use_enable cygnal) \ + $(use_enable doc docbook) \ + $(use_enable gnome ghelp) \ + $(use_enable gtk xpcom) \ + $(use_enable gtk npapi) \ + $(use_enable kde kparts4) \ + $(use_enable nls) \ + $(use_enable nsplugin npapi) \ + $(use_enable speex) \ + $(use_enable speex speexdsp) \ + $(use_enable video_cards_intel i810-lod-bias) \ + $(use_enable zlib z) \ + --enable-gui=${gui} \ + ${myconf} +} +src_install() { + emake ${jobs} DESTDIR="${D}" install || die "emake install failed" + # Install nsplugin in directory set by --with-npapi-plugindir. + use nsplugin && emake DESTDIR="${D}" install-plugin || die "install plugins failed" + + # Install kde konqueror plugin. + if use kde; then + cd "${S}/plugin/klash4" + emake DESTDIR="${D}" install-plugin || die "install kde plugins failed" + fi + # Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory. + use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \ + || rm -rf "${D}/opt" + dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed" +} +pkg_postinst() { + if use !ffmpeg && use !gstreamer || use gstreamer && ( use !gnome && use !neon ); 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 use flags set." + ewarn "If you use gstreamer you will also need to set one of" + ewarn "the two http handler use flags: gnome or neon." + 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 c52d75b9b29b..1c52be974b60 100644 --- a/www-plugins/gnash/metadata.xml +++ b/www-plugins/gnash/metadata.xml @@ -3,11 +3,12 @@ <pkgmetadata> <herd>no-herd</herd> <maintainer> - <email>maintainer-needed@gentoo.org</email> - <name>Default assignee for orphaned packages</name> + <email>mrpouet@gentoo.org</email> + <name>Romain Perier</name> </maintainer> <use> - <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering - Engine library</flag> + <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering Engine library</flag> + <flag name='neon'>Add support for <pkg>media-plugins/gst-plugins-neon</pkg> if gstreamer is enabled</flag> + <flag name='cygnal'>nable building of the cygnal server</flag> </use> </pkgmetadata> |