diff options
Diffstat (limited to 'www-plugins/gnash')
| -rw-r--r-- | www-plugins/gnash/ChangeLog | 6 | ||||
| -rw-r--r-- | www-plugins/gnash/files/gnash-0.8.8-klash.patch | 23 | ||||
| -rw-r--r-- | www-plugins/gnash/gnash-0.8.7_p20100706.ebuild | 274 |
3 files changed, 18 insertions, 285 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 5df6b9c4e226..7e80e14c637c 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,10 @@ # 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.37 2010/08/13 19:02:06 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.38 2010/08/13 22:40:52 chithanh Exp $ + + 13 Aug 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + -gnash-0.8.7_p20100706.ebuild, files/gnash-0.8.8-klash.patch: + Drop old snapshot. Fix klash patch, bug #332673. *gnash-0.8.7_p20100812 (13 Aug 2010) diff --git a/www-plugins/gnash/files/gnash-0.8.8-klash.patch b/www-plugins/gnash/files/gnash-0.8.8-klash.patch index f5d9c2e52b0d..c895bde65763 100644 --- a/www-plugins/gnash/files/gnash-0.8.8-klash.patch +++ b/www-plugins/gnash/files/gnash-0.8.8-klash.patch @@ -1,6 +1,6 @@ -diff -ur gnash-0.8.7_p20100706/macros/kde4.m4 gnash-0.8.7_p20100706.new/macros/kde4.m4 ---- gnash-0.8.7_p20100706/macros/kde4.m4 2010-07-06 17:01:50.987903174 +0200 -+++ gnash-0.8.7_p20100706.new/macros/kde4.m4 2010-07-12 14:05:10.859918495 +0200 +diff -ur gnash-0.8.7_p20100812.orig/macros/kde4.m4 gnash-0.8.7_p20100812/macros/kde4.m4 +--- gnash-0.8.7_p20100812.orig/macros/kde4.m4 2010-08-12 13:49:01.319789001 +0200 ++++ gnash-0.8.7_p20100812/macros/kde4.m4 2010-08-12 13:49:50.875789001 +0200 @@ -136,7 +136,7 @@ dnl Look for the libraries AC_CACHE_VAL(ac_cv_path_kde4_lib, [ @@ -10,12 +10,15 @@ diff -ur gnash-0.8.7_p20100706/macros/kde4.m4 gnash-0.8.7_p20100706.new/macros/k ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`" else AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.]) -@@ -201,7 +201,7 @@ - KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4" - KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services" - KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config" -- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash" -+ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash" +@@ -214,9 +214,9 @@ + KDE4_CONFIGDIR="${KDE4_PREFIX}}/share/kde4/config" + fi + if test x"${KDE4_APPSDATADIR}" != x ; then +- KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/kde4/apps/klash" ++ KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/apps/klash" + else +- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash" ++ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash" + fi fi dnl end of build_kparts4 - if test x"${ac_cv_path_kde4_incl}" != x ; then diff --git a/www-plugins/gnash/gnash-0.8.7_p20100706.ebuild b/www-plugins/gnash/gnash-0.8.7_p20100706.ebuild deleted file mode 100644 index 82c6e53ccbb2..000000000000 --- a/www-plugins/gnash/gnash-0.8.7_p20100706.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# 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_p20100706.ebuild,v 1.7 2010/08/09 12:55:46 scarabeus 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/" -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="+agg cairo cygnal dbus doc +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl ssh ssl 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 ) - media-libs/libsdl[X] - 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] ) - ssl? ( 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 xv && use !opengl; then - eerror "Support for xvideo currently requires the opengl renderer." - die "xv requires the opengl USE flag." - 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 ); then - eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]." - die "Please enable a renderer" - fi - - if ! ( use kde || use gtk || use sdl ); then - ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]." - ewarn "sdl enabled as default" -# 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() { - append-flags -D__STDC_CONSTANT_MACROS #324357 - - local gui hwaccel myconf myext renderers - - # Set nsplugin install directory. - use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/" - - # Set hardware acceleration - use xv && hwaccel+=",xv" - use vaapi && hwaccel+=",vaapi" - use xv || use vaapi || hwaccel="none" - - # 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 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, 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 \ - --enable-avm2 \ - $(use_enable cygnal) \ - $(use_enable cygnal cgibins) \ - $(use_enable doc docbook) \ - $(use_enable gnome ghelp) \ - $(use_enable gtk npapi) \ - $(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} \ - ${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 -} |