From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- www-plugins/Manifest.gz | Bin 2099 -> 2095 bytes www-plugins/chrome-binary-plugins/Manifest | 4 +- ...chrome-binary-plugins-67.0.3396.10_alpha.ebuild | 60 ----- ...chrome-binary-plugins-67.0.3396.18_alpha.ebuild | 60 +++++ www-plugins/gnash/Manifest | 2 +- www-plugins/gnash/gnash-0.8.10_p20160329-r1.ebuild | 261 --------------------- www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild | 260 ++++++++++++++++++++ 7 files changed, 323 insertions(+), 324 deletions(-) delete mode 100644 www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.10_alpha.ebuild create mode 100644 www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.18_alpha.ebuild delete mode 100644 www-plugins/gnash/gnash-0.8.10_p20160329-r1.ebuild create mode 100644 www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild (limited to 'www-plugins') diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz index ab30bb8f2bed..4793a4123640 100644 Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 9dd398f7afe7..d062df76590e 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,7 +1,7 @@ DIST google-chrome-beta_66.0.3359.117-1_amd64.deb 53325510 BLAKE2B 376e9d2c77cc1eb10c5feebd5bdbb95c27e7160cb5cb943ca232778dd960fdad566fa8b0b3f53bb73f26107158b2ba0ed5f4e7b214a9393dd4cb997b09f70a0b SHA512 52643c393ca84d4808fb086ab1c4a4cf7f7dce00cc3b01bf11d5db920155fccb348bd53890239d9332911e06808b4ca46e4c9f06ed10a01b1b4c47cc901d4f83 DIST google-chrome-stable_66.0.3359.117-1_amd64.deb 52231002 BLAKE2B 383ae9f461283a69e2d73d4368baba755fb6ae0fa5caeb65df9e4a53b36671dd8f0d75f460bd78881a8fda0733b732acfd24d06e47bc5cff549aead1f585cb31 SHA512 15cfb49c0186961f0859cb63e3691982244b13d258b451342cdf885824ad42e023e7ead14da28927424af69173c8382f512e729607705bcfc59b1bcea22cdce2 -DIST google-chrome-unstable_67.0.3396.10-1_amd64.deb 53700484 BLAKE2B 92ec6a83635c8ceaae0487d6b72e6b0b0116e9d238909611b2cf38ea68d18707754011bad0cdaa76209ed2a05f476a8cd4bfe11d012e27b3466bea2d4c6c06cd SHA512 75343baac899b8ab69e5e4a1a4d59b27d1a042309518b4cae0e6c33a9f7c047dc62c03193ff3df2aa8a16daaa157c762f670765a2fcb5613db4c28eae212faf5 +DIST google-chrome-unstable_67.0.3396.18-1_amd64.deb 53649152 BLAKE2B 25977c69ad73bcd69e1b2340d53f5220e830ebfb67231a7d24ef4419d5e11c63cb12447d76c54e3fd79817d0b22befb504344af1e1544805135838e9e9eb9060 SHA512 98addcb042f03b3c936475bc9bc2a6a1b19507e81a62f748e4dc8c707ec6374ca977855cd5abc132e9d066733c2972e3c6916e52a33e48df218ceb6e680699a7 EBUILD chrome-binary-plugins-66.0.3359.117.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb EBUILD chrome-binary-plugins-66.0.3359.117_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f -EBUILD chrome-binary-plugins-67.0.3396.10_alpha.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be +EBUILD chrome-binary-plugins-67.0.3396.18_alpha.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.10_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.10_alpha.ebuild deleted file mode 100644 index f2cb5723b3da..000000000000 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.10_alpha.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib unpacker - -DESCRIPTION="Binary plugins from Google Chrome for use in Chromium" -HOMEPAGE="https://www.google.com/chrome" - -case ${PV} in - *_alpha*) - SLOT="unstable" - CHROMEDIR="opt/google/chrome-${SLOT}" - MY_PV=${PV%_alpha}-1 - ;; - *_beta*) - SLOT="beta" - CHROMEDIR="opt/google/chrome-${SLOT}" - MY_PV=${PV%_beta}-1 - ;; - *) - SLOT="stable" - CHROMEDIR="opt/google/chrome" - MY_PV=${PV}-1 - ;; -esac - -MY_PN="google-chrome-${SLOT}" -MY_P="${MY_PN}_${MY_PV}" - -SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" -KEYWORDS="-* ~amd64" - -LICENSE="google-chrome" -IUSE="+widevine" -RESTRICT="bindist mirror strip" - -RDEPEND="widevine? ( !=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 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 || 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/gnash-0.8.10_p20160329-r2.ebuild b/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild new file mode 100644 index 000000000000..a57919c38bc9 --- /dev/null +++ b/www-plugins/gnash/gnash-0.8.10_p20160329-r2.ebuild @@ -0,0 +1,260 @@ +# 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 directfb 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 ) + 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? ( + 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 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 || 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" +} -- cgit v1.2.3