summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-10-12 18:11:56 +0200
committerMichał Górny <mgorny@gentoo.org>2018-10-12 18:15:05 +0200
commit0799f57941db232814c16abf990488330476d912 (patch)
tree8c9883bcbf1879e2314dabf7a041c562a598a9a6
parentsys-fs/bedup: Remove last-rited pkg (diff)
downloadgentoo-0799f57941db232814c16abf990488330476d912.tar.gz
gentoo-0799f57941db232814c16abf990488330476d912.tar.bz2
gentoo-0799f57941db232814c16abf990488330476d912.zip
www-plugins/gnash: Remove last-rited pkg
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--profiles/arch/sparc/package.use.mask6
-rw-r--r--profiles/base/package.use.mask10
-rw-r--r--profiles/package.mask5
-rw-r--r--www-plugins/gnash/Manifest1
-rw-r--r--www-plugins/gnash/files/gnash-0.8.10-amf-include.patch45
-rw-r--r--www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch24
-rw-r--r--www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch24
-rw-r--r--www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch12
-rw-r--r--www-plugins/gnash/files/gnash-0.8.9-klash.patch12
-rw-r--r--www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild256
-rw-r--r--www-plugins/gnash/metadata.xml20
11 files changed, 2 insertions, 413 deletions
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index b9883bf77d46..fad34bb34190 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Virgil Dupras <vdupras@gentoo.org> (08 Oct 2018)
@@ -267,10 +267,6 @@ net-im/telepathy-connection-managers sipe
# template-haskell not yet available
dev-haskell/dataenc test
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
-# dev-libs/jemalloc is not keyworded
-www-plugins/gnash jemalloc
-
# Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
# Keywords pending, bug #476710
>=gnome-base/gnome-extra-apps-3.8 games
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7e924ab8db95..94d66f4a3472 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# This file requires >=portage-2.1.1
@@ -165,10 +165,6 @@ sys-devel/clang z3
# Mask USE flag which has limited keywords for app-crypt/argon2
dev-lang/php argon2
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Jul 2017)
-# Causes build to fail with ffmpeg-3, #602786
-www-plugins/gnash vaapi
-
# Mike Gilbert <floppym@gentoo.org> (09 Jul 2017)
# Matthias Dahl <matthias.dahl@binary-island.eu> (05 Jul 2017)
# Both are not your typical garden-variety Linux programs and are
@@ -455,10 +451,6 @@ dev-python/pypy3 sandbox
# gentoo bugs.
media-libs/libsdl2 custom-cflags
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
-# Causes build to fail, issue is being discussed with upstream
->=www-plugins/gnash-0.8.10_p20130822 openvg
-
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
# GL/GLES support in cairo is mutually exclusive, bug #428770.
x11-libs/cairo gles2
diff --git a/profiles/package.mask b/profiles/package.mask
index 9046fc062efc..d6ed058d041c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -190,11 +190,6 @@ dev-lang/solidity
~dev-lang/julia-0.7.0
~dev-lang/julia-1.0.1
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (29 Aug 2018)
-# Masked for removal in 30 days. Multiple build failures. Upstream inactive.
-# (bugs #321017, #581284, #588692, #602786, #649006, #654140)
-www-plugins/gnash
-
# Virgil Dupras <vdupras@gentoo.org> (23 Aug 2018)
# Vulnerable and can't be removed yet because of alpha. Bug #664346
<dev-python/paramiko-2.4.1
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
deleted file mode 100644
index f9f8b50ee227..000000000000
--- a/www-plugins/gnash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnash-0.8.10_p20160329.tar.xz 4079572 BLAKE2B 4d5f4799add9d2e00a9b9322dc48be0b8b3c9f790dc5881d9fba6e4d9646537786f7644d3dbbf3bd259d1975062438af071eb2ab28c661de2b5510368c9d218e SHA512 e8956d6277dde29a22bfe5af4279b40f80dad5659961d042e0bb57505b084f3ef1b489cf6fdf06730a8f3e2f9fdb737d7b1bc015a0255a80b167b98e686aa245
diff --git a/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch b/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
deleted file mode 100644
index 983fa6b70eb1..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur a/cygnal/libnet/cque.h b/cygnal/libnet/cque.h
---- a/cygnal/libnet/cque.h 2012-01-19 20:17:47.000000000 +0100
-+++ b/cygnal/libnet/cque.h 2012-02-23 20:13:39.000000000 +0100
-@@ -25,8 +25,9 @@
- #include <boost/thread/condition.hpp>
- #include <deque>
-
-+#include "../libamf/amf.h"
- #include "getclocktime.hpp"
--#include "buffer.h"
-+#include "../libamf/buffer.h"
- #include "network.h"
- #include "dsodefs.h" //For DSOEXPORT.
-
-diff -ur a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
---- a/cygnal/libnet/sshclient.h 2012-01-19 20:17:47.000000000 +0100
-+++ b/cygnal/libnet/sshclient.h 2012-02-23 20:13:09.000000000 +0100
-@@ -32,9 +32,10 @@
- #include <libssh/sftp.h>
- }
-
-+#include "../libamf/amf.h"
- #include "cque.h"
- #include "network.h"
--#include "buffer.h"
-+#include "../libamf/buffer.h"
-
- namespace gnash
- {
-diff -ur a/cygnal/libnet/sslclient.h b/cygnal/libnet/sslclient.h
---- a/cygnal/libnet/sslclient.h 2012-01-19 20:17:47.000000000 +0100
-+++ b/cygnal/libnet/sslclient.h 2012-02-23 20:13:21.000000000 +0100
-@@ -36,10 +36,11 @@
- #include <openssl/err.h>
- #endif
-
-+#include "../libamf/amf.h"
- #include "dsodefs.h"
- #include "cque.h"
- #include "network.h"
--#include "buffer.h"
-+#include "../libamf/buffer.h"
-
-
- namespace gnash
diff --git a/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
deleted file mode 100644
index 6671d361e325..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git i/libbase/accumulator.h w/libbase/accumulator.h
-index 694cbd2..876c669 100644
---- i/libbase/accumulator.h
-+++ w/libbase/accumulator.h
-@@ -22,6 +22,7 @@
-
- #include <boost/program_options/value_semantic.hpp>
- #include <boost/any.hpp>
-+#include <boost/version.hpp>
- #include <functional>
- #include <vector>
- #include <string>
-@@ -61,6 +62,11 @@ public:
- virtual unsigned min_tokens() const { return 0; }
- virtual unsigned max_tokens() const { return 0; }
-
-+#if BOOST_VERSION >= 105900
-+ /// There are no tokens, so this is indifferent.
-+ virtual bool adjacent_tokens_only() const { return false; }
-+#endif
-+
- /// Accumulating from different sources is silly.
- virtual bool is_composing() const { return false; }
-
diff --git a/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch b/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
deleted file mode 100644
index eaffda77bc00..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
---- a/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100
-+++ b/plugin/npapi/test.cpp 2011-03-20 23:52:20.369998096 +0100
-@@ -35,7 +35,7 @@
- #include "npfunctions.h"
- #endif
- #include "pluginbase.h"
--#include "dejagnu.h"
-+#include <dejagnu.h>
- #include "../../testsuite/check.h"
- #include <regex.h>
-
-diff -ur a/testsuite/check.h b/testsuite/check.h
---- a/testsuite/check.h 2011-02-26 19:11:08.000000000 +0100
-+++ b/testsuite/check.h 2011-03-20 23:52:32.570998094 +0100
-@@ -29,7 +29,7 @@
-
- #define HAVE_DEJAGNU_H 1 // we ship our own now...
- #ifdef HAVE_DEJAGNU_H
--#include "dejagnu.h"
-+#include <dejagnu.h>
-
- #define info(x) note x
-
diff --git a/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
deleted file mode 100644
index b3279441d2f0..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4 2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4 2011-11-25 18:09:25.000000000 +0100
-@@ -198,7 +198,7 @@
- if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then
- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
- else
-- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-+ KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4"
- fi
- fi
- if test x"${with_kde4_servicesdir}" != x ; then
diff --git a/www-plugins/gnash/files/gnash-0.8.9-klash.patch b/www-plugins/gnash/files/gnash-0.8.9-klash.patch
deleted file mode 100644
index e6afec04d293..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-klash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4 2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4 2011-03-21 00:04:38.845997945 +0100
-@@ -210,7 +210,7 @@
- KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
- fi
- if test x"${KDE4_APPSDATADIR}" = x ; then
-- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
- fi
-
- if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild b/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild
deleted file mode 100644
index 1d167f04709a..000000000000
--- a/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 xdg-utils
-
-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 doc dump egl fbcon +ffmpeg libav libressl gnome 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:2
- virtual/jpeg:0
- media-libs/libpng:0=
- net-misc/curl
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXt
- media-libs/giflib:=
- agg? ( x11-libs/agg )
- cairo? ( x11-libs/cairo )
- doc? (
- >=app-text/docbook2X-0.8.8
- app-text/docbook-sgml-utils
- )
- egl? (
- media-libs/mesa[egl]
- )
- fbcon? (
- x11-libs/tslib
- )
- ffmpeg? (
- libav? ( media-video/libav:0=[vaapi?] )
- !libav? ( media-video/ffmpeg:0=[vaapi?] )
- )
- 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-1.2.0
- media-libs/speexdsp
- 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? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- )
- 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 )
- ${PYTHON_DEPS}
-"
-# Tests hang with sandbox, bug #321017
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-
- if use !ffmpeg; 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() {
- default
-
- xdg_environment_reset # 591014
-
- # Fix paths for klash, bug #339610
- eapply "${FILESDIR}"/${PN}-0.8.9-klash.patch
-
- # Use external dejagnu for tests, bug #321017
- eapply "${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
- eapply "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
-
- # Fix libamf includes
- eapply "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
-
- # Fix new adjacent_tokens_only() in >=boost-1.59 (bug 579142)
- # See https://savannah.gnu.org/bugs/?46148
- eapply "${FILESDIR}"/${PN}-0.8.10_p20150316-boost-1.60.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 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 || media+=",none"
- use ffmpeg && media+=",ffmpeg"
-
- # Set gui.
- use dump && gui+=",dump"
- use fbcon && gui+=",fb"
- use gtk && gui+=",gtk"
- use sdl && 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 \
- --disable-kparts3 \
- --disable-kparts4 \
- --without-gconf \
- $(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) \
- --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
-
- einstalldocs
-}
-pkg_postinst() {
- if use !gnome || 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 the ffmpeg 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
deleted file mode 100644
index 66ccd5f77743..000000000000
--- a/www-plugins/gnash/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>chithanh@gentoo.org</email>
- <name>Chí-Thanh Christopher Nguyễn</name>
- </maintainer>
- <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="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="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>
- <flag name="sdl-sound">Enable SDL audio output for the standalone player</flag>
- <flag name="ssh">Enable using SSH for network authentication in libnet</flag>
- <flag name="ssl">Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
- </use>
-</pkgmetadata>