From 162d12b878fec35c807bf8c135cd21167daa13c4 Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Tue, 16 Oct 2012 00:25:36 +0000 Subject: New snapshot to address gcc-4.7 and boost-1.50 build failures, bug #425442, bug #432874 and bug #432876. Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64 --- www-plugins/gnash/ChangeLog | 10 +- www-plugins/gnash/Manifest | 7 +- .../gnash/files/gnash-0.8.10-boost-1.50.patch | 24 ++ www-plugins/gnash/gnash-0.8.10_p20120903.ebuild | 289 +++++++++++++++++++++ www-plugins/gnash/metadata.xml | 1 + 5 files changed, 328 insertions(+), 3 deletions(-) create mode 100644 www-plugins/gnash/files/gnash-0.8.10-boost-1.50.patch create mode 100644 www-plugins/gnash/gnash-0.8.10_p20120903.ebuild (limited to 'www-plugins') diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 48550afba8e0..503b1e583a38 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-plugins/gnash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.88 2012/09/18 21:26:35 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.89 2012/10/16 00:25:32 chithanh Exp $ + +*gnash-0.8.10_p20120903 (16 Oct 2012) + + 16 Oct 2012; Chí-Thanh Christopher Nguyễn + +files/gnash-0.8.10-boost-1.50.patch, +gnash-0.8.10_p20120903.ebuild, + metadata.xml: + New snapshot to address gcc-4.7 and boost-1.50 build failures, bug #425442, + bug #432874 and bug #432876. 18 Sep 2012; Chí-Thanh Christopher Nguyễn gnash-0.8.10-r2.ebuild: diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest index 1e3c65c8da0d..2b9b5adeece4 100644 --- a/www-plugins/gnash/Manifest +++ b/www-plugins/gnash/Manifest @@ -1,4 +1,5 @@ AUX gnash-0.8.10-amf-include.patch 1245 SHA256 81f0cdf8246689614b1deaf36cf9c3e09d3501a55691ef95130d08ab1f6bc2e6 SHA512 46c2b9d4a57a1180626760ebcdbcbdc10c01fba4e01d8c45378ad26da3bf1181daaa54a2c88419452b6e691467c1ccb77374d8e926776b5f1b93ee2baa875986 WHIRLPOOL a6bc2db921b0e4cca443a0fe2b309d6e83409b93749241eeff600ae41977bcb07a8e16add81aabbf458e4a034eb8a5ed40198d7085152a2eabbd6ab742c62e89 +AUX gnash-0.8.10-boost-1.50.patch 1138 SHA256 d52ee4016c9bd764ad0eb416de7ea5fe97e543f2e04e84461d5a04f5cce52e5a SHA512 f9dcfe2dfa5f6135418e7f0b96ef0b81d9b350c62adc07935308dcb60e3c9b1df2784ee5d3b8bfee7ec0c75185a621314e3de540da27bc4af92b17b9ce87349e WHIRLPOOL b6933f8bdcad6a6fdfd1d17f3925604d2e48f60ee8ce93b45a7ae96751fa604fed6e2d369ce6fbd72975fedf1204c2d63c26ab9998f10374130468c74d75ea80 AUX gnash-0.8.10-cve-2012-1175.patch 1934 SHA256 610b33797162481eb907ead375aa520f0ca745f3b709fd18af20f69df0aafebc SHA512 261c530f61436fda65e9eb249214878113bc2ef388f7cd21f135e301a03914ab6e5eb31ac070b56be8f03e65be35de91b3874a95249326356275bf4ce82cd213 WHIRLPOOL 3e5ac65faaefd07a16ad6dae91b632dc910248a7e44096dcf55f7b0ca26f81a14aea59af2533197e5d2145529aec6bdce78d9f94ba16b00bab6c64fbd637e848 AUX gnash-0.8.10-gettext-macro.patch 6296 SHA256 ddacc3823ec0b87ceee618f48fbab87a083bf8047b4080bb8872b7bd19b07125 SHA512 6b1c06166b545a7cb430801db90d413dce78c2ad46239abc664ebcc24930acef4057380e7e0358b13ec8f41f48e0d277ce528e10b39dfba71ca302d0509f5b04 WHIRLPOOL 91dead0e4b9bb0a36a46b25b51b7ccdc55d5979ca837ae87485726743fde4597a4b8d5dbdebff7375de0d91cb9d7b50445672564968abccb994ebaf2232ad32e AUX gnash-0.8.10-jemalloc-aslr-fix.patch 1763 SHA256 00a8a9996ce6648639041309a98fe467419afd19271a557304eb5fffe981fb23 SHA512 ba15684ed94b78baf663bd1fecab873ddf903a420dfcd4bf4fd81f0d9479b20246a8b8f0c48b6f02a48dc1b57bf103ac806a2d02e88cb83dd72424f86af491fd WHIRLPOOL e331d72ac6caeded2f376b5073a2c5cadc8d948a7f73531e787b00af8b3b6432540c8cd7838192c9c5dbfb7903b1b8fd4846937bb57e216745555cd5902bdbee @@ -7,6 +8,8 @@ AUX gnash-0.8.9-external-dejagnu.patch 700 SHA256 b838af0304d41165557dff2538031e AUX gnash-0.8.9-kde4-libdir.patch 498 SHA256 43a74367b0f7452bed23577ddda2bde692b6ce4d2bd1d56e480c4d37380af80d SHA512 df1a6faf5b3cae8a519b590ee3e26009b5a194a01f5dacc5b1862751118d1172f0babf85f7641d6b8e898d5013b6c11002c593df589c57312d842930ab964341 WHIRLPOOL 57ed37224e2c02de8ca648dc1ac172905384a254c537787d1d393e5f0b441654f74c1bd1efacf2178146ddcbfcbf11b453fc9aa4579c177168b659f69e20225f AUX gnash-0.8.9-klash.patch 471 SHA256 779f4be4eb25f654010b380fea4d6b092310d1f850acb040a203a7b8caf02bb8 SHA512 4a57310522ac2323eee26bb027432b12606d91add6d528b31afd69e172c73aa9f80bafc7c0a84fed4214773f901b65ddea4a7de67865f82a2984ac1dfe274c4d WHIRLPOOL a27cec3d6e62d86a42452cffad3ac376bd5a04de53818371bffa45c71c5f70e23962c0ab79293048e9358e46124352de191a5e82125069bffd8e8dbb20438696 DIST gnash-0.8.10.tar.gz 6099894 SHA256 61fbeec6826c89e6f3fc520336a152b17901e6d0e9db207d7c4db27eeb5ceb2b SHA512 71444eedfdefc5eae14b405dea0388f94d7804fe76006ae762e8a422a2a2976bc8e7775062b052449f083c7244c53eb1e50233d1b2ee5df0efe3668e5e065578 WHIRLPOOL 2391f4425af84347f2a3b3353640cbe744d6edbbdb83040d7beed83d351145172825b85e7be5414910ce95feba6f33dc030111404473b51beeff181e2e55e3b2 +DIST gnash-0.8.10_p20120903.tar.xz 3898504 SHA256 fc250a62ad96a631a111d8439145a2f738a13adca89b6dab86f6333d4fcc4ceb SHA512 1927bd20b09240f7ffbaf62cea5944bcf86196cfb91af28edc4440ed9d1494258167f1807d49f5e72a08d28deeef17fb7e7191a5a5acc986af9cc31cf38912a7 WHIRLPOOL a1f091ca2241f9b962e45b46517f195e8b997992fbf35097cac2f5ca34fa1a4b3ed338282890ef6b2d7d0e31bf0d143577c2d9d5d25e961123dc465a78a98a55 EBUILD gnash-0.8.10-r2.ebuild 7983 SHA256 d8d932096934af229187c4e2c1e95410cadd03e01eea54f6ddb8488bb5e90a23 SHA512 d67e4affa84f26d9619ee9082b2787431d437703173760f8c025f71f9fc2135e09298fa80526047dc8592544ed8e85ea8cf2ea0a37c81b83c7da88cf5fc59c1a WHIRLPOOL 6a59eca6af1f1c5a5f462f2bc400d8c9f31fc5a95c04662b0a45ebd98ee639fba6ab115ada86d45094972e976d3381cb6f5febe4a1fbf143928652c45db7a0a2 -MISC ChangeLog 29659 SHA256 57e6c9a17f31ad39ab02dc58134e0bed0483b1bf30c1b4206ba1664b29d5cca1 SHA512 a3db6df7051193aca8cdca02e95dc346de767b18fd9eedc0f1050e4296088a1d3a85e973c5aea759b418670960f8416b739b687c40f73f52f6bdf58decc5673e WHIRLPOOL a3dece31a23e683158bf27a62eb762ba6b46245d471ad186264cce4fa555d92d0b874cdff754abed8fcfdd074cdc8a12d9c3d5b4b314394f123cfe2da271bc28 -MISC metadata.xml 1109 SHA256 8ef9c60bbf427e51978c5f9c4f9b4bfb5de864d0d4091812e72d723034b8444a SHA512 2422ab80dfa4114546cc067393b96ac4a3e19015f577581352e8a100f8e3944188da17ac3ec2f83b09215f29bf0123a5058ef8ebd4aa870700316ec8bd3f5f85 WHIRLPOOL b523a4df4c53853c6c6c677a05be434d8fd055ddcacb7f54de5200501ededd369aee4385e1a35bf336fce00a615e17fe4af9868dbf2c8bc1a98164e20b344c01 +EBUILD gnash-0.8.10_p20120903.ebuild 7764 SHA256 b19e2d812dfec4c115efd444d82ff977466e383ed2074e9b09cd91b9da55dd46 SHA512 5fbf25f150289e4027e5e69bf0ebf360313a5033a9fc9cfd6a13d94432a8f5b7ae60fcc31176d0bb125345a79f4a341798ad70e34ff6b4d14c72ceaeb543d10d WHIRLPOOL 2472771f1b0e4ec758d02a83fa089ab52b071b1b98d7af959418fd5b8787f0b1219a97c69265ec51ce6cbd000566a22dd3bb69f8593db9e335862979853d5d6e +MISC ChangeLog 29965 SHA256 2cd6f88a9f889531e2ce9c5d9b6c723e68e5a386ae0f426e800279af5e0a974d SHA512 3995f5e867cc29ccf9b192e95543ffa08a0ad83c1cd96579f0386bc33db78ed4ed6dbc60f43458f7686833f31728b28475c2e62d1f057f3b1b2c4f51b4b8bed5 WHIRLPOOL c00545d051a81a59b7b9dc74a4771c36029a443af31e374a70e505261a66018c21d144e3cb31bdec2fc0628b1a9f8b403a6fa13d69e896eaa08393934a653734 +MISC metadata.xml 1221 SHA256 33790b61773b2705eaacea793b5d52b74263fa10feec4ed407062430fa12b285 SHA512 e8c9010d6133a798340ef306fbc461841966bf373756a73a0860cd276fa0c32b99cc8d22c8c682bd2bc8dfcc59badaad703ee5ac81fb014ae2b776eb3d9d801c WHIRLPOOL e9e4d0a84c30eb7ac3a5ab3044464fc587387e29796f5cad70e4d1ab4fffd074f7b09eb4b7156b19dd4fda0d898d099c25f1ab9c111bfc4fad3a3e9fa29d2e09 diff --git a/www-plugins/gnash/files/gnash-0.8.10-boost-1.50.patch b/www-plugins/gnash/files/gnash-0.8.10-boost-1.50.patch new file mode 100644 index 000000000000..ed774ed50a0b --- /dev/null +++ b/www-plugins/gnash/files/gnash-0.8.10-boost-1.50.patch @@ -0,0 +1,24 @@ +diff -ur a/macros/boost.m4 b/macros/boost.m4 +--- a/macros/boost.m4 2012-09-03 17:11:43.000000000 +0200 ++++ b/macros/boost.m4 2012-10-16 01:58:28.000000000 +0200 +@@ -37,7 +37,7 @@ + boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp" + dnl this is a list of *required* libraries. If any of these are missing, this + dnl test will return a failure, and Gnash won't build. +- boost_libs="thread program_options iostreams" ++ boost_libs="thread program_options iostreams system" + + dnl this is a list of *recommended* libraries. If any of these are missing, this + dnl test will return a warning, and Gnash will build, but testing won't work. +diff -ur a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am +--- a/plugin/npapi/Makefile.am 2012-09-03 17:11:43.000000000 +0200 ++++ b/plugin/npapi/Makefile.am 2012-10-16 01:58:57.000000000 +0200 +@@ -78,7 +78,7 @@ + + libgnashplugin_la_LIBADD = \ + $(GLIB_LIBS) \ +- -lboost_iostreams \ ++ $(BOOST_LIBS) \ + $(NULL) + + # Scriptable plugin support diff --git a/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild b/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild new file mode 100644 index 000000000000..203a2b932a9d --- /dev/null +++ b/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild @@ -0,0 +1,289 @@ +# 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_p20120903.ebuild,v 1.1 2012/10/16 00:25:32 chithanh 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.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 ) + " + +# gnash fails if obsolete boost is installed, bug #334259 +RDEPEND=">=dev-libs/boost-1.41.0 + !!dev-libs/boost: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 + + 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 \ + + 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/metadata.xml b/www-plugins/gnash/metadata.xml index 6706e79bbc6b..f19f43e315da 100644 --- a/www-plugins/gnash/metadata.xml +++ b/www-plugins/gnash/metadata.xml @@ -11,6 +11,7 @@ Enable dump output module for creating video from SWF Enable EGL support for the OpenVG, OpenGL and X11 renderers Enable GConf configuration backend + Enable upstream recommended hardening build flags (may conflict with system ones) Rendering based on the OpenVG graphics acceleration API Enable SDL audio output for the standalone player Enable using SSH for network authentication in libnet -- cgit v1.2.3-65-gdbad