From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- www-plugins/gnash/Manifest | 8 - .../gnash/files/gnash-0.8.10-amf-include.patch | 45 ---- .../files/gnash-0.8.10_p20150316-boost-1.60.patch | 24 -- .../gnash/files/gnash-0.8.9-external-dejagnu.patch | 24 -- .../gnash/files/gnash-0.8.9-kde4-libdir.patch | 12 - www-plugins/gnash/files/gnash-0.8.9-klash.patch | 12 - www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild | 256 --------------------- www-plugins/gnash/metadata.xml | 20 -- 8 files changed, 401 deletions(-) delete mode 100644 www-plugins/gnash/Manifest delete mode 100644 www-plugins/gnash/files/gnash-0.8.10-amf-include.patch delete mode 100644 www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch delete mode 100644 www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch delete mode 100644 www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch delete mode 100644 www-plugins/gnash/files/gnash-0.8.9-klash.patch delete mode 100644 www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild delete mode 100644 www-plugins/gnash/metadata.xml (limited to 'www-plugins/gnash') diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest deleted file mode 100644 index a99b611d8d5f..000000000000 --- a/www-plugins/gnash/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX gnash-0.8.10-amf-include.patch 1245 BLAKE2B f73c74329ae848e6dc1674d58179d5c04cb30dd7b4dcfe30b0e09ed350ad2ceabc7d5b1fde2866fc691f558cbe277bde3f594b6b5e11609b404998312a8b3d49 SHA512 46c2b9d4a57a1180626760ebcdbcbdc10c01fba4e01d8c45378ad26da3bf1181daaa54a2c88419452b6e691467c1ccb77374d8e926776b5f1b93ee2baa875986 -AUX gnash-0.8.10_p20150316-boost-1.60.patch 746 BLAKE2B cdb98c9424940aa5b2596bd94f037708211323f2fa1d371ba923d12f1279644e517bd4eccaa42528b13e452e915b8ebd7e6f032e8add1be7590a76e9a02f7599 SHA512 302946a47710978471837a8ddacd4be0eaf116cd6d1389f98155a939df774d61557eaafcec473cfdb37c06439b6f7cc5de8a5494fb880aa62669df5d951feb5d -AUX gnash-0.8.9-external-dejagnu.patch 700 BLAKE2B c01f515259aa96076cf47f0f3a5553b405dae0ce997dc50310207189fc3aacd89a6f3158bb8ec47ff6a30072d872884f159c7e3c35176929639bb0222775887a SHA512 1b6714e0d44d3d43dcef53622cb6a8c153a1e336a99ef5ee13de1a092e54dc1b1c346e4468e9ea66035762195bd45b84dd185370bb726427472e5b5d6b470556 -AUX gnash-0.8.9-kde4-libdir.patch 498 BLAKE2B ae7d071ef8026e134415481b613c343fea78e038ba7568a6b05e319eaf7c02ec6a20502a7486e560beec30f05d50716ec468456f5a0fd5b88c94c64f71bc5c1a SHA512 df1a6faf5b3cae8a519b590ee3e26009b5a194a01f5dacc5b1862751118d1172f0babf85f7641d6b8e898d5013b6c11002c593df589c57312d842930ab964341 -AUX gnash-0.8.9-klash.patch 471 BLAKE2B 0006bfe83a78dd923766972b44138ceea36befaaf5e9b09560e2a06b0d902791a8d7645e32d357196264fc126c34d448585672647cf800085e07a48138fd5980 SHA512 4a57310522ac2323eee26bb027432b12606d91add6d528b31afd69e172c73aa9f80bafc7c0a84fed4214773f901b65ddea4a7de67865f82a2984ac1dfe274c4d -DIST gnash-0.8.10_p20160329.tar.xz 4079572 BLAKE2B 4d5f4799add9d2e00a9b9322dc48be0b8b3c9f790dc5881d9fba6e4d9646537786f7644d3dbbf3bd259d1975062438af071eb2ab28c661de2b5510368c9d218e SHA512 e8956d6277dde29a22bfe5af4279b40f80dad5659961d042e0bb57505b084f3ef1b489cf6fdf06730a8f3e2f9fdb737d7b1bc015a0255a80b167b98e686aa245 -EBUILD gnash-0.8.10_p20160329-r2.ebuild 6437 BLAKE2B 39440995a62854e1fdfcf72915f79f4b8970d6a4fe088ffa3f36376e09a59a519ae0a9b7e13c6e98226eeb5bbac1e67a38bed258bcac61b38b5a456a0a3a5cd9 SHA512 03ffb5419c74b676701bdb69a69be0536df793f40883de1d7fae056f1ed8d7f936f4ca3ae4dad5f4a8fcc9ed22d8b74fe0889df55651656c98aeedcc66de3585 -MISC metadata.xml 1139 BLAKE2B 9734261c64faac7dd8d8326bb939f154577ae0540e9b259bad40e871249b3878bdee4ef941b6e8c787e11779a7ef793f3505d2207d7166d0c1db4b098f5895f8 SHA512 10fea436cf59f26ccf534d869379a101ee0e3fb1a47950b58e12a0e3027314b0f4ac1bc4f72817dd1be0ca64f18b2463ef89587dd8d45b7a20929218dccef41e 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 - #include - -+#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 - } - -+#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 - #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 - #include -+#include - #include - #include - #include -@@ -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 - #include "../../testsuite/check.h" - #include - -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 - - #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 @@ - - - - - chithanh@gentoo.org - Chí-Thanh Christopher Nguyễn - - - Rendering based on the Anti-Grain Geometry Rendering Engine library - Enable building of the cygnal server - Enable dump output module for creating video from SWF - Enable EGL support for the OpenVG, OpenGL and X11 renderers - Enable upstream recommended hardening build flags (may conflict with system ones) - Use dev-libs/jemalloc for allocations - Rendering based on the OpenVG graphics acceleration API - Enable SDL audio output for the standalone player - Enable using SSH for network authentication in libnet - Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support) - - -- cgit v1.2.3