commit: 45208dbc1764ac2a17270b4cb8e40b3d5e94e44c
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:17:46 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45208dbc
www-plugins/gnash: Remove old
Acked-by: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-plugins/gnash/Manifest | 1 -
.../gnash/files/gnash-0.8.10-npapi-sdk.patch | 29 ---
www-plugins/gnash/gnash-0.8.10_p20131019.ebuild | 259 ---------------------
www-plugins/gnash/metadata.xml | 1 -
4 files changed, 290 deletions(-)
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index aa256f5..c49d14a 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,2 +1 @@
-DIST gnash-0.8.10_p20131019.tar.xz 3868156 SHA256
93e5c82c9f5e326b8ddba3cb4c4178fb9428e92987b3b8e6ef59b201ef37782a SHA512
79b4e86275b6b11774212315ea3b4a6192177d297d4ebe93c39d69734dbaa4c893845dc606e724e03f6409f0695794ade0f2544e30cf2d291a42d0cf3d674dcc
WHIRLPOOL
fb9a9b9f00c10af75c595147ce3d9bdf18f5cfde907fa69c9d0e28a278ff4fa835eba4d1e19ea72ac65e6e0f769da30f5790c652e2df723c36db6e3ef4436851
DIST gnash-0.8.10_p20160329.tar.xz 4079572 SHA256
851ccba805a90a2e21ced841ae70cf55c0ba53c95f2b8b9bc729385a5b49bbb7 SHA512
e8956d6277dde29a22bfe5af4279b40f80dad5659961d042e0bb57505b084f3ef1b489cf6fdf06730a8f3e2f9fdb737d7b1bc015a0255a80b167b98e686aa245
WHIRLPOOL
58734701ff4d9a6aa9536a1fa7feb75a8357775fb11857ecaf1a678ac7eca590a00b8af76f3723e8bbdf03b1fdf01cb193d870d505b8cc5767fdaf29fff1d7ee
diff --git a/www-plugins/gnash/files/gnash-0.8.10-npapi-sdk.patch
b/www-plugins/gnash/files/gnash-0.8.10-npapi-sdk.patch
deleted file mode 100644
index eb54295..00000000
--- a/www-plugins/gnash/files/gnash-0.8.10-npapi-sdk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 983a675c94ecec54ae14593744aa9a2198466499 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
-Date: Thu, 15 Sep 2011 12:59:55 +0200
-Subject: [PATCH] Support building against NPAPI-SDK as well.
-
----
- macros/npapi.m4 | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/macros/npapi.m4 b/macros/npapi.m4
-index e3bde2f..522bbb1 100644
---- a/macros/npapi.m4
-+++ b/macros/npapi.m4
-@@ -34,7 +34,11 @@ AC_DEFUN([GNASH_PATH_NPAPI],
-
- if test x$cross_compiling = xno; then
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_npapi_incl}" = x; then
-- $PKG_CONFIG --exists mozilla-plugin && NPAPI_CFLAGS="`$PKG_CONFIG
--cflags mozilla-plugin`"
-+ if $PKG_CONFIG --exists npapi-sdk; then
-+ NPAPI_CFLAGS="`$PKG_CONFIG --cflags npapi-sdk`"
-+ elif $PKG_CONFIG --exists mozilla-plugin; then
-+ NPAPI_CFLAGS="`$PKG_CONFIG --cflags mozilla-plugin`"
-+ fi
- fi
- fi
-
---
-1.7.3.4
-
diff --git a/www-plugins/gnash/gnash-0.8.10_p20131019.ebuild
b/www-plugins/gnash/gnash-0.8.10_p20131019.ebuild
deleted file mode 100644
index 2d5654e..00000000
--- a/www-plugins/gnash/gnash-0.8.10_p20131019.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AT_M4DIR="cygnal"
-# won't build with python-3, bug #392969
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib nsplugins python-any-r1 flag-o-matic
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="https://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 jemalloc 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 sdl )
- "
-
-RDEPEND=">=dev-libs/boost-1.41.0: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 )
- )
- jemalloc? ( dev-libs/jemalloc )
- 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() {
- python-any-r1_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
-}
-
-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 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
-
- 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 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 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 \
- --disable-kparts4 \
- $(use_enable cygnal) \
- $(use_enable cygnal cgibins) \
- $(use_enable doc docbook) \
- $(use_enable gnome ghelp) \
- $(use_enable harden) \
- $(use_enable jemalloc) \
- $(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
-
- # 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"
-}
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
index 20881f9..31d3016 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -10,7 +10,6 @@
<flag name="cygnal">Enable building of the cygnal server</flag>
<flag name="dump">Enable dump output module for creating video from
SWF</flag>
<flag name="egl">Enable EGL support for the OpenVG, OpenGL and X11
renderers</flag>
- <flag name="gconf">Enable GConf configuration backend</flag>
<flag name="harden">Enable upstream recommended hardening build flags
(may conflict with system ones)</flag>
<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
<flag name="openvg">Rendering based on the OpenVG graphics
acceleration API</flag>
