From 7d9a5224f3783741701a9c89c153bdc08f8c83fb Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Thu, 28 Mar 2013 22:06:54 +0000 Subject: Do not install eglinfo, bug #463654. (Portage version: 2.1.11.55/cvs/Linux x86_64, unsigned Manifest commit) --- www-plugins/gnash/ChangeLog | 10 +- .../gnash/files/gnash-0.8.10-cve-2012-1175.patch | 63 ----- .../files/gnash-0.8.10-jemalloc-aslr-fix.patch | 52 ---- www-plugins/gnash/gnash-0.8.10-r2.ebuild | 282 ------------------- www-plugins/gnash/gnash-0.8.10_p20120903-r1.ebuild | 297 +++++++++++++++++++++ www-plugins/gnash/gnash-0.8.10_p20120903.ebuild | 5 +- 6 files changed, 309 insertions(+), 400 deletions(-) delete mode 100644 www-plugins/gnash/files/gnash-0.8.10-cve-2012-1175.patch delete mode 100644 www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch delete mode 100644 www-plugins/gnash/gnash-0.8.10-r2.ebuild create mode 100644 www-plugins/gnash/gnash-0.8.10_p20120903-r1.ebuild (limited to 'www-plugins/gnash') diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 53564d324302..2ebedce1e39a 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-plugins/gnash # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.95 2013/03/09 17:37:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.96 2013/03/28 22:06:54 chithanh Exp $ + +*gnash-0.8.10_p20120903-r1 (28 Mar 2013) + + 28 Mar 2013; Chí-Thanh Christopher Nguyễn + +gnash-0.8.10_p20120903-r1.ebuild, -files/gnash-0.8.10-cve-2012-1175.patch, + -files/gnash-0.8.10-jemalloc-aslr-fix.patch, -gnash-0.8.10-r2.ebuild, + gnash-0.8.10_p20120903.ebuild: + Do not install eglinfo, bug #463654. 09 Mar 2013; Agostino Sarubbo gnash-0.8.10_p20120903.ebuild: Stable for x86, wrt bug #456328 diff --git a/www-plugins/gnash/files/gnash-0.8.10-cve-2012-1175.patch b/www-plugins/gnash/files/gnash-0.8.10-cve-2012-1175.patch deleted file mode 100644 index 9a218d9216be..000000000000 --- a/www-plugins/gnash/files/gnash-0.8.10-cve-2012-1175.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527 Mon Sep 17 00:00:00 2001 -From: Benjamin Wolsey -Date: Sat, 10 Mar 2012 14:52:50 +0000 -Subject: Fix crash in GnashImage.cpp - ---- -diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp -index 11c6956..03a6939 100644 ---- a/libbase/GnashImage.cpp -+++ b/libbase/GnashImage.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #ifdef USE_PNG - # include "GnashImagePng.h" -@@ -44,6 +45,21 @@ namespace image { - - namespace { - void processAlpha(GnashImage::iterator imageData, size_t pixels); -+ bool checkValidSize(size_t width, size_t height, size_t channels) { -+ -+ if (width == 0 || height == 0) return false; -+ -+ assert(channels > 0); -+ -+ boost::uint32_t maxSize = std::numeric_limits::max(); -+ if (width >= maxSize || height >= maxSize) return false; -+ -+ maxSize /= channels; -+ maxSize /= width; -+ maxSize /= height; -+ -+ return maxSize > 0; -+ } - } - - GnashImage::GnashImage(iterator data, size_t width, size_t height, -@@ -55,6 +71,8 @@ GnashImage::GnashImage(iterator data, size_t width, size_t height, - _height(height), - _data(data) - { -+ // Callers should check dimensions -+ assert(checkValidSize(_width, _height, channels())); - } - - /// Create an image allocating a buffer of height*pitch bytes -@@ -66,8 +84,9 @@ GnashImage::GnashImage(size_t width, size_t height, ImageType type, - _width(width), - _height(height) - { -- const size_t max = std::numeric_limits::max(); -- if (size() > max) { -+ // Constructed from external input, so restrict dimensions to avoid -+ // overflow in size calculations -+ if (!checkValidSize(_width, _height, channels())) { - throw std::bad_alloc(); - } - _data.reset(new value_type[size()]); --- -cgit v0.9.0.2 diff --git a/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch b/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch deleted file mode 100644 index 413744c4b3c4..000000000000 --- a/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Naur gnash-0.8.10.alt/libbase/jemalloc.c gnash-0.8.10/libbase/jemalloc.c ---- gnash-0.8.10.alt/libbase/jemalloc.c 2012-02-07 09:39:41.000000000 +0100 -+++ gnash-0.8.10/libbase/jemalloc.c 2012-02-24 18:36:47.000000000 +0100 -@@ -429,7 +429,7 @@ - static const bool __isthreaded = true; - #endif - --#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) -+#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) || defined(MOZ_MEMORY_LINUX) - #define JEMALLOC_USES_MAP_ALIGN /* Required on Solaris 10. Might improve performance elsewhere. */ - #endif - -@@ -2238,6 +2238,7 @@ - * We don't use MAP_FIXED here, because it can cause the *replacement* - * of existing mappings, and we only want to create new mappings. - */ -+#ifdef MOZ_MEMORY_SOLARIS - #ifdef MALLOC_PAGEFILE - if (pfd != -1) { - ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | -@@ -2252,6 +2253,31 @@ - - if (ret == MAP_FAILED) - ret = NULL; -+#else /* !MOZ_MEMORY_SOLARIS */ -+#ifdef MALLOC_PAGEFILE -+ if (pfd != -1) { -+ ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | -+ MAP_NOSYNC, pfd, 0); -+ } else -+#endif -+ { -+ ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE | -+ MAP_NOSYNC | MAP_ANON, -1, 0); -+ } -+ assert(ret != NULL); -+ -+ if (ret == MAP_FAILED) -+ return NULL; -+ -+ uintptr_t aligned_ret; -+ size_t extra_size; -+ aligned_ret = (uintptr_t)ret + alignment - 1; -+ aligned_ret &= ~(alignment - 1); -+ extra_size = aligned_ret - (uintptr_t)ret; -+ munmap(ret, extra_size); -+ munmap(ret + extra_size + size, alignment - extra_size); -+ ret = (void*)aligned_ret; -+#endif /* ifdef MOZ_MEMORY_SOLARIS*/ - return (ret); - } - #endif diff --git a/www-plugins/gnash/gnash-0.8.10-r2.ebuild b/www-plugins/gnash/gnash-0.8.10-r2.ebuild deleted file mode 100644 index 94bb8a1cf8c6..000000000000 --- a/www-plugins/gnash/gnash-0.8.10-r2.ebuild +++ /dev/null @@ -1,282 +0,0 @@ -# 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-r2.ebuild,v 1.10 2012/11/04 04:38:36 flameeyes Exp $ - -EAPI=4 -CMAKE_REQUIRED="never" -KDE_REQUIRED="optional" -AT_M4DIR="cygnal" -PYTHON_DEPEND="python? 2" -RESTRICT_PYTHON_ABIS="3.*" - -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-2 -else -# Release tarball is b0rked, upstream #35612 -# SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" - SRC_URI="mirror://gentoo/${P}.tar.gz" -fi - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 ~sparc x86" -IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi" -REQUIRED_USE="dump? ( agg ffmpeg ) - fbcon? ( agg ) - nsplugin? ( gtk ) - openvg? ( egl ) - python? ( gtk ) - vaapi? ( agg ffmpeg ) - || ( agg cairo opengl openvg ) - || ( dump fbcon gtk kde sdl ) - " - -RDEPEND=">=dev-libs/boost-1.41.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? ( - >=app-text/docbook2X-0.8.8 - app-text/docbook-sgml-utils - ) - egl? ( - media-libs/mesa[egl] - ) - fbcon? ( - x11-libs/tslib - ) - ffmpeg? ( - virtual/ffmpeg[vaapi?] - ) - gconf? ( - gnome-base/gconf - ) - gstreamer? ( - media-plugins/gst-plugins-ffmpeg - media-plugins/gst-plugins-mad - media-plugins/gst-plugins-meta - ) - gtk? ( - x11-libs/gtk+:2 - python? ( dev-python/pygtk:2 ) - ) - kde? ( $(add_kdebase_dep kdebase-startkde) ) - opengl? ( - virtual/glu - virtual/opengl - gtk? ( x11-libs/gtkglext ) - ) - openvg? ( - media-libs/mesa[openvg] - ) - 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} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - gnome? ( app-text/rarian ) - nsplugin? ( net-misc/npapi-sdk ) - test? ( dev-util/dejagnu )" -# Tests hang with sandbox, bug #321017 -RESTRICT="test" - -pkg_setup() { - kde4-base_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 - - # 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 - - # Allow building against npapi-sdk, bug #383071 - epatch "${FILESDIR}"/${PN}-0.8.10-npapi-sdk.patch - - # Fix broken jemalloc, bug #405993 - epatch "${FILESDIR}"/${PN}-0.8.10-jemalloc-aslr-fix.patch - - # Fix security bug bug #408209 - epatch "${FILESDIR}"/${PN}-0.8.10-cve-2012-1175.patch - - eautoreconf -} -src_configure() { - local device gui input media myconf myext renderers - - # Set nsplugin install directory. - use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/" - - # Set hardware acceleration. - use X && device+=",x11" - use directfb && device+=",directfb" - use egl && device+=",egl" - use fbcon && device+=",rawfb" - use vaapi && device+=",vaapi" - [[ "${device}x" == "x" ]] && device+=",none" - - # 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 dump && gui="${gui},dump" - use fbcon && gui="${gui},fb" - use gtk && gui=",gtk" - 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. - device=$( echo $device | sed -e 's/,//' ) - gui=$( echo $gui | 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 nls) \ - $(use_enable nsplugin npapi) \ - $(use_enable python) \ - $(use_enable ssh) \ - $(use_enable ssl) \ - $(use_enable test testsuite) \ - $(use_with gconf) \ - --enable-gui=${gui} \ - --enable-device=${device} \ - --enable-extensions=${myext} \ - --enable-renderer=${renderers} \ - --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/gnash-0.8.10_p20120903-r1.ebuild b/www-plugins/gnash/gnash-0.8.10_p20120903-r1.ebuild new file mode 100644 index 000000000000..b8bbd2538dc9 --- /dev/null +++ b/www-plugins/gnash/gnash-0.8.10_p20120903-r1.ebuild @@ -0,0 +1,297 @@ +# Copyright 1999-2013 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_p20120903-r1.ebuild,v 1.1 2013/03/28 22:06:54 chithanh Exp $ + +EAPI=5 +CMAKE_REQUIRED="never" +KDE_REQUIRED="optional" +AT_M4DIR="cygnal" +PYTHON_DEPEND="python? 2" +RESTRICT_PYTHON_ABIS="3.*" + +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-2 +else +# Release tarball is b0rked, upstream #35612 +# SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" + SRC_URI="mirror://gentoo/${P}.tar.xz" +fi + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk harden kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi" +REQUIRED_USE="dump? ( agg ffmpeg ) + fbcon? ( agg ) + nsplugin? ( gtk ) + openvg? ( egl ) + python? ( gtk ) + vaapi? ( agg ffmpeg ) + || ( agg cairo opengl openvg ) + || ( dump fbcon gtk kde sdl ) + " + +RDEPEND=">=dev-libs/boost-1.41.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? ( + >=app-text/docbook2X-0.8.8 + app-text/docbook-sgml-utils + ) + egl? ( + media-libs/mesa[egl] + ) + fbcon? ( + x11-libs/tslib + ) + ffmpeg? ( + virtual/ffmpeg[vaapi?] + ) + gconf? ( + gnome-base/gconf + ) + gstreamer? ( + media-plugins/gst-plugins-ffmpeg + media-plugins/gst-plugins-mad + media-plugins/gst-plugins-meta + ) + gtk? ( + x11-libs/gtk+:2 + python? ( dev-python/pygtk:2 ) + ) + kde? ( $(add_kdebase_dep kdebase-startkde) ) + opengl? ( + virtual/glu + virtual/opengl + gtk? ( x11-libs/gtkglext ) + ) + openvg? ( + media-libs/mesa[openvg] + ) + 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} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + gnome? ( app-text/rarian ) + nsplugin? ( net-misc/npapi-sdk ) + test? ( dev-util/dejagnu )" +# Tests hang with sandbox, bug #321017 +RESTRICT="test" + +pkg_setup() { + kde4-base_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 + + # won't build with python-3, bug #392969 + if use python; then + python_set_active_version 2 + fi +} + +src_unpack() { + default + # rename git snapshot directory to what portage expects + mv ${PN}-*/ ${P} || die +} + +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 + + # Allow building against npapi-sdk, bug #383071 + epatch "${FILESDIR}"/${PN}-0.8.10-npapi-sdk.patch + + # Allow building against boost-1.50, bug #425442 + epatch "${FILESDIR}"/${PN}-0.8.10-boost-1.50.patch + + # fix build with ffmpeg-1 / libav-9, bug #443184 + epatch "${FILESDIR}/${P}-ffmpeg1.patch" \ + "${FILESDIR}/${P}-libav9.patch" \ + "${FILESDIR}/${P}-bytesfmt.patch" + + eautoreconf +} +src_configure() { + local device gui input media myconf myext renderers + + # Set nsplugin install directory. + use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/" + + # Set hardware acceleration. + use X && device+=",x11" + use directfb && device+=",directfb" + use egl && device+=",egl" + use fbcon && device+=",rawfb" + use vaapi && device+=",vaapi" + [[ "${device}x" == "x" ]] && device+=",none" + + # 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 + --with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4" + fi + + # Set media handler. + use ffmpeg || use gstreamer || media+=",none" + use ffmpeg && media+=",ffmpeg" + use gstreamer && media+=",gst" + + # Set gui. + use dump && gui="${gui},dump" + use fbcon && gui="${gui},fb" + use gtk && gui=",gtk" + 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. + device=$( echo $device | sed -e 's/,//' ) + gui=$( echo $gui | 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 harden) \ + $(use_enable kde kparts4) \ + $(use_enable nls) \ + $(use_enable nsplugin npapi) \ + $(use_enable python) \ + $(use_enable ssh) \ + $(use_enable ssl) \ + $(use_enable test testsuite) \ + $(use_with gconf) \ + --enable-gui=${gui} \ + --enable-device=${device} \ + --enable-extensions=${myext} \ + --enable-renderer=${renderers} \ + --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 + + # Remove eglinfo, bug #463654 + if use egl; then + rm -f "${D}"/usr/bin/eglinfo || die + fi + + 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/gnash-0.8.10_p20120903.ebuild b/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild index 7f46419a4243..3a62ad71ea1d 100644 --- a/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild +++ b/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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_p20120903.ebuild,v 1.6 2013/03/09 17:37:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild,v 1.7 2013/03/28 22:06:54 chithanh Exp $ EAPI=4 CMAKE_REQUIRED="never" @@ -61,6 +61,7 @@ RDEPEND=">=dev-libs/boost-1.41.0 ) egl? ( media-libs/mesa[egl] + !x11-apps/mesa-progs[egl] ) fbcon? ( x11-libs/tslib @@ -272,7 +273,7 @@ src_install() { 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 \ + use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed" } -- cgit v1.2.3-65-gdbad