diff options
author | Romain Perier <mrpouet@gentoo.org> | 2009-09-25 15:38:05 +0000 |
---|---|---|
committer | Romain Perier <mrpouet@gentoo.org> | 2009-09-25 15:38:05 +0000 |
commit | 6b7bf35432a73337d8dc67fcfc12804ac8a6e0cd (patch) | |
tree | eced854ad1f695d4564e1b3c8ff3a951fb7ae690 | |
parent | Marked ~hppa (again). (diff) | |
download | gentoo-2-6b7bf35432a73337d8dc67fcfc12804ac8a6e0cd.tar.gz gentoo-2-6b7bf35432a73337d8dc67fcfc12804ac8a6e0cd.tar.bz2 gentoo-2-6b7bf35432a73337d8dc67fcfc12804ac8a6e0cd.zip |
Version bump. remove old revision
(Portage version: 2.2_rc41/cvs/Linux x86_64)
-rw-r--r-- | www-plugins/gnash/ChangeLog | 9 | ||||
-rw-r--r-- | www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch | 25 | ||||
-rw-r--r-- | www-plugins/gnash/gnash-0.8.4.ebuild | 264 | ||||
-rw-r--r-- | www-plugins/gnash/gnash-0.8.6.ebuild | 262 | ||||
-rw-r--r-- | www-plugins/gnash/metadata.xml | 1 |
5 files changed, 296 insertions, 265 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 8471918d86e4..c7280fea46b7 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.12 2009/09/25 08:28:21 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.13 2009/09/25 15:38:05 mrpouet Exp $ + +*gnash-0.8.6 (25 Sep 2009) + + 25 Sep 2009; Romain Perier <mrpouet@gentoo.org> + -gnash-0.8.4.ebuild, +gnash-0.8.6.ebuild, + +files/gnash-0.8.6-libcore-as3-headers.patch, metadata.xml: + Version bump, remove old revision. 25 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> gnash-0.8.5.ebuild: Fix kde4-base inheritance to work without cmake. diff --git a/www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch b/www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch new file mode 100644 index 000000000000..bb2cc3c79948 --- /dev/null +++ b/www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch @@ -0,0 +1,25 @@ +From ff5404812aaf33b64ce8d4d2efedee3c8099ce9e Mon Sep 17 00:00:00 2001 +From: Romain Perier <mrpouet@gentoo.org> +Date: Fri, 25 Sep 2009 17:12:53 +0200 +Subject: [PATCH] Fix missing headers sub-directory for libcore when AS3 is enabled + +--- + libcore/asClass.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libcore/asClass.h b/libcore/asClass.h +index 0fe0e17..4f67c9c 100644 +--- a/libcore/asClass.h ++++ b/libcore/asClass.h +@@ -33,7 +33,7 @@ + + #ifdef ENABLE_AVM2 + # include "CodeStream.h" +-# include "AbcBlock.h" ++# include "parser/AbcBlock.h" + #endif + + namespace gnash { +-- +1.6.5.rc1 + diff --git a/www-plugins/gnash/gnash-0.8.4.ebuild b/www-plugins/gnash/gnash-0.8.4.ebuild deleted file mode 100644 index 742f1ff0f581..000000000000 --- a/www-plugins/gnash/gnash-0.8.4.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# 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.3 2009/09/05 17:51:10 mrpouet 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 ~hppa ~ppc ~sparc ~x86" -IUSE="+agg -cairo dbus -fbcon -ffmpeg +gstreamer +gtk +kde +nsplugin -opengl -qt3 -sdl video_cards_intel" - -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/giflib - 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 ) - " -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 - if has_version '<sys-devel/libtool-2' - then - sed -i \ - -e 's:libltdl.*Makefile::' configure.ac \ - || die "Sedding configure.ac failed." - fi - 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 - 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" -} diff --git a/www-plugins/gnash/gnash-0.8.6.ebuild b/www-plugins/gnash/gnash-0.8.6.ebuild new file mode 100644 index 000000000000..65be30f9743a --- /dev/null +++ b/www-plugins/gnash/gnash-0.8.6.ebuild @@ -0,0 +1,262 @@ +# 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.6.ebuild,v 1.1 2009/09/25 15:38:05 mrpouet Exp $ + +EAPI="2" +WANT_CMAKE="false" +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 dbus doc +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin +opengl python +sdl +speex ssh ssl test video_cards_intel" + +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 + ) + 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] ) + sys-libs/zlib + >=sys-devel/libtool-2.2 + mysql? ( dev-db/mysql ) + lirc? ( app-misc/lirc ) + dbus? ( sys-apps/dbus ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( sys-devel/gettext ) + gnome? ( app-text/rarian )" + +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 + + if use sdl; then + ewarn "Enable SDL as gui frontend and sound handler" + fi + + if use lirc; then + ewarn "Enable LIRC daemon support and lirc extension" + 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}"/${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.5-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.5-klash.patch + + # Fix build failure due to missing headers sub-directory in libcore/asClass.h + # when AS3 support is enabled (as default) + epatch "${FILESDIR}"/${P}-libcore-as3-headers.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 myext gui + + # 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-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/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" + + if use sdl; then + gui="${gui},sdl" + 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" + + if [ -z "$gui" ]; then + gui="sdl" + fi + + # Strip extra comma from gui and myext. + gui=$( echo $gui | sed -e 's/,//' ) + myext=$( echo $myext | sed -e 's/,//' ) + + econf \ + --disable-dependency-tracking \ + --disable-kparts3 \ + --enable-nspr \ + --enable-expat \ + --enable-jpeg \ + --enable-png \ + --enable-gif \ + --enable-ungif \ + --enable-avm2 \ + $(use_enable cygnal) \ + $(use_enable cygnal cgibins) \ + $(use_enable doc docbook) \ + $(use_enable gnome ghelp) \ + $(use_enable gtk xpcom) \ + $(use_enable gtk npapi) \ + $(use_enable kde kparts4) \ + $(use_enable lirc) \ + $(use_enable nls) \ + $(use_enable nsplugin npapi) \ + $(use_enable python) \ + $(use_enable speex) \ + $(use_enable speex speexdsp) \ + $(use_enable ssh) \ + $(use_enable ssl) \ + $(use_enable test testsuite) \ + $(use_enable video_cards_intel i810-lod-bias) \ + --enable-z \ + --enable-gui=${gui} \ + --enable-extensions=${myext} \ + ${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 /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 ); 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 "" + 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 739fc7321f18..5f9c4f2ecf84 100644 --- a/www-plugins/gnash/metadata.xml +++ b/www-plugins/gnash/metadata.xml @@ -9,5 +9,6 @@ <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='ssh'>Enable using SSH for network authentication in libnet</flag> </use> </pkgmetadata> |