Add workaround for gles failure, bug #440148.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 172 insertions, 4 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 6343fe5224a2..b85aeecf8841 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.46 2012/10/29 13:36:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.47 2012/11/18 13:43:34 chithanh Exp $
+
+  18 Nov 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/lightspark-0.7.0-libxmlpp-gles.patch, lightspark-0.7.0.ebuild:
+  Add workaround for gles failure, bug #440148.
 
 *lightspark-0.7.0 (29 Oct 2012)
 
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index 83a35a9374a3..3a7ffbafde32 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -5,9 +5,10 @@ AUX lightspark-0.6.0.1-gcc-4.5_0003.patch 1305 SHA256 cbe192db459165e3fc9dc2e317
 AUX lightspark-0.6.0.1-gcc-4.5_0004.patch 1290 SHA256 7fa43d388d476e8df395f794618ac5d04dec11b73446dc1ab7b366b23884bbb4 SHA512 4cc0013b57045e68e311716770f6f7542a7bedb7d95aa79a30d5563ad4f5e06f431cb864ec660b3d7ffa39560e4177f0ac968e68e0dfcfc87bcf42159f53d5d1 WHIRLPOOL df4d75df8d5945712c697997dd579ee0b3d9b813b1d653855ce9b993c37bbe1d7033601d41c6340cdbc9fde635607822e36301e931c4ccd300fcbfe5fdd1106d
 AUX lightspark-0.6.0.1-gcc-4.5_0005.patch 857 SHA256 f5fb126000fe8367ee258cdd58b0ebd5a411ef53ff7fcb09debca5fbae00cf15 SHA512 5105d6470bb175e4a95d58871810d69329ea6d4bce6750d97e951aa7f84103f69008b3824f21face58bd19d3bfaea61f311caa0fa826fbb3858483c68be234c0 WHIRLPOOL e4f78314af85f16ba7d8e7afe99900b8e15c1d0834856edae21c7053386628224e1d61131fc6335f957d26b563f76df3cfee9864441066630fa859851f957813
 AUX lightspark-0.6.0.1-gcc-4.5_0006.patch 917 SHA256 c9bdf1e5d48307eade32bfda3f6474b572b2caa6f52974c1479a1cc8923bfd04 SHA512 4a629ca021c188c7199111ca67f91b4b2cc7233c1069c3d07747447d818f10703c5aedc95c4ae5b02181c36336617f8af76b600b6ebef4cf55fa8b3d106b5764 WHIRLPOOL 9bf5e69fce593c3eb3852ec8f1e7143d93e096523fd70bcfb2b0186c8cf0787bef02707429e57f67bb62e1111c7a65e60286c5816589ffdb24b6dc25c1b4f619
+AUX lightspark-0.7.0-libxmlpp-gles.patch 5622 SHA256 455650ec8665b1178d2a77dc55151cfca027a14b1cd22d62ba48205939b6f9f8 SHA512 240fee235e27deb3568f8782e4f175424a31b632958476430e0e2b9f19a3c56aba1ff52eba9b1360f5c8586f35e8f1709c883c7df23087a349ed5a80bdcfeafe WHIRLPOOL 265ec9c2e4e08701f2ab726c7503ba5025440e73050211f5d5ebcbe0b54e05de58a4952587b5c3204655f51b5bf5f23f8a6548bde0285d3017221a8f4ac5e5d0
 DIST lightspark-0.6.0.1.tar.gz 862495 SHA256 b9d638a45bb274da046e6fd7f7300547ba81c2480ce626158af2fd62312c5b86 SHA512 bd5db376ed4cf98caa053423f136022bc36ca36c490ff30033e35ccaf72b854cbc6dcc7a38834e938fd58037c5e1a60f652e0a225368fc9483f375800fff6412 WHIRLPOOL f03ae222bb194be95baff56b7983d93f1fdcecaa3ed02b690151f0d26ef2757f2fa5b805a9d4371966d1a25cb60e033aead0414ce563724606248190deaa8e7d
 DIST lightspark-0.7.0.tar.gz 910146 SHA256 f3df63692ad8409888336a58f4db96b3344737d492df3a3f06c7359fdf26c85b SHA512 d4e25dbd60d7bc3a4a50eb0708fe8c7f5b940006f598b7a5939ff8d596e6618502793cfde62839343ac8403d76d62fc127c0262a595ff57b54932db6d50c8b70 WHIRLPOOL f124345deb5c93577b725e54f01589b97566d6d0424637c58b4c7b58c297fc95b2cdd6a69df84ec2de76b7fc9c57e022de93565dd4e39d3191ab6bad79a77b71
 EBUILD lightspark-0.6.0.1.ebuild 2907 SHA256 fad6d027c3005d1d56954a1c04966dcdaf24371ea61aeb208da8d362d8427581 SHA512 aa659902b558d62498ac37dfe3180c2a61d8fc53d03c51e68338bd7a0cdcd79e59756d05f76f405e5038ae15e1183f13bfe99e964dc8d2e8d4749b2b030dbc44 WHIRLPOOL 343f2b30743964e62a918bceb08867ce11292974e28ed58e79997b1938d43beadb01c9cd2523bd55d73f37d16d2ab7abb9204c01bf4acfcade2103d43ef818e7
-EBUILD lightspark-0.7.0.ebuild 2619 SHA256 cd87b5536e1ae806b2c168db7018f9a317f4ffcfe24303da6af51ccabc92f053 SHA512 6df04ff4bd7dd0a10051b51b3aca1fe0e4d14b985195ef62783d34d93708c6bcafc826b02364eb206a95a29c8f02708287177a2fcfbcdf4ced07accf03509b2a WHIRLPOOL a310520e44bab96732d36f66f9ee643cae9b86e0635eeeb86b2a09da87d1bd74a07877f98f913dd3ef9a119f89675da3a43275c8795a2df9cb6cf18bd358d29f
-MISC ChangeLog 10411 SHA256 dbf262dd3f5631d32478a9c829f9f1b7960e3c2dbc32b9b146b3d03846eec248 SHA512 95ade4cb91ecb3f75f440f532b5e972df89585ae41837ba11e9ccaf2f013b08454fa4601c1707f191298f474aaf6d9f729e724d9e34ffaee62c6bed8383a1629 WHIRLPOOL 6ef79a0d5f2a3bbeac325bdc2808ee4fdce7068fcee45dd70013087d4c95581b982d220dc6d5d0f7138c9ad0e3678540576c7c1bdadc0c0362a45f7da74df7dc
+EBUILD lightspark-0.7.0.ebuild 2672 SHA256 f3634b55e81b7d8a822cf73f41c31b4694263003001f7d0a5802983d6cac5335 SHA512 a8b6a242af31960f3c75327685c19d28d24a69dcba43c851b45a75c61d0688f911b5682a1f34af1b9fd04c43d8c521378847ab1eb5e11de144c0e30246b082a2 WHIRLPOOL b403e7cb3bae37dbd812651616eda1a85e846262dd6b09680e517d88a2eed8fa33fbb1f1f9928173bea4fd0602431d61db128abca9baf0057f2ef2ec8f9de6c8
+MISC ChangeLog 10601 SHA256 c0c55d2d1d04d3bbd61f38a791b923c42dcf24e9aa42e8dbf09d969f3cedd296 SHA512 04cf8f9646513c01997162e3d0a4f83fdae6c2201b3f8ef3d98ced321322d414158f4b8d54534565c136386de0f8062b491576b5c36f688025e8e9ee4c6ab6b9 WHIRLPOOL 76991f61e5fa311374c4e3a55975c92e8401a3516c154299f26066083bf06663a4100b0e0ca388daad7aab0910402d2a52ae7b04b370feefd5dd4b120956ec20
 MISC metadata.xml 416 SHA256 1a4739e3ed47fd391141b1df084195435ad9cc1ac50650eb3b45d1fccb2f87e9 SHA512 d5181074005c87614f42ddfe267092a526acfe8f49b5f621141a026d23c3c7471b5254f0edb0b88af8d8689db8effb819fe08663a904b0984ea9bc2917fc394a WHIRLPOOL 0d2788c7f2af963e5038d71cef665a58b9e49095f90dc7b339c0343974fd40142a1005972a16cfb51fd45b42703b1f2ecbd5c59ba74c6bca60bdf54821d6b8c8
diff --git a/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch b/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch
new file mode 100644
index 000000000000..523f550b189e
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch
@@ -0,0 +1,159 @@
+diff -ur a/src/backends/netutils.cpp b/src/backends/netutils.cpp
+--- a/src/backends/netutils.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/backends/netutils.cpp	2012-10-30 01:05:26.947904601 +0100
+@@ -18,13 +18,13 @@
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ **************************************************************************/
+ 
++#include "backends/security.h"
+ #include "scripting/abc.h"
+ #include "swf.h"
+ #include "backends/config.h"
+ #include "backends/netutils.h"
+ #include "backends/rtmputils.h"
+ #include "compat.h"
+-#include "backends/security.h"
+ #include <string>
+ #include <algorithm>
+ #include <cctype>
+diff -ur a/src/main.cpp b/src/main.cpp
+--- a/src/main.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/main.cpp	2012-10-30 01:29:12.446786100 +0100
+@@ -18,9 +18,9 @@
+ **************************************************************************/
+ 
+ #include "version.h"
++#include "backends/security.h"
+ #include "swf.h"
+ #include "logger.h"
+-#include "backends/security.h"
+ #include "platforms/engineutils.h"
+ #ifndef _WIN32
+ #	include <sys/resource.h>
+diff -ur a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
+--- a/src/plugin/plugin.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/plugin/plugin.cpp	2012-10-30 01:29:26.328790120 +0100
+@@ -19,6 +19,7 @@
+ **************************************************************************/
+ 
+ #include "version.h"
++#include "backends/security.h"
+ #include "plugin/plugin.h"
+ #include "logger.h"
+ #include "compat.h"
+@@ -28,7 +29,6 @@
+ #	include <gdk/gdkwin32.h>
+ #endif
+ #include "backends/urlutils.h"
+-#include "backends/security.h"
+ 
+ #include "plugin/npscriptobject.h"
+ 
+diff -ur a/src/scripting/flash/display/flashdisplay.cpp b/src/scripting/flash/display/flashdisplay.cpp
+--- a/src/scripting/flash/display/flashdisplay.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/scripting/flash/display/flashdisplay.cpp	2012-10-30 01:12:42.780140945 +0100
+@@ -19,6 +19,7 @@
+ 
+ #include <list>
+ 
++#include "backends/security.h"
+ #include "scripting/abc.h"
+ #include "scripting/flash/display/flashdisplay.h"
+ #include "swf.h"
+@@ -33,7 +34,6 @@
+ #include "scripting/flash/display/BitmapData.h"
+ #include "scripting/argconv.h"
+ #include "scripting/toplevel/Vector.h"
+-#include "backends/security.h"
+ 
+ using namespace std;
+ using namespace lightspark;
+diff -ur a/src/scripting/flash/net/flashnet.cpp b/src/scripting/flash/net/flashnet.cpp
+--- a/src/scripting/flash/net/flashnet.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/scripting/flash/net/flashnet.cpp	2012-10-30 01:15:37.158273078 +0100
+@@ -18,6 +18,7 @@
+ **************************************************************************/
+ 
+ #include <map>
++#include "backends/security.h"
+ #include "scripting/abc.h"
+ #include "scripting/flash/net/flashnet.h"
+ #include "scripting/flash/net/URLRequestHeader.h"
+@@ -27,7 +28,6 @@
+ #include "backends/audio.h"
+ #include "backends/builtindecoder.h"
+ #include "backends/rendering.h"
+-#include "backends/security.h"
+ #include "scripting/argconv.h"
+ 
+ using namespace std;
+diff -ur a/src/scripting/flash/net/URLStream.cpp b/src/scripting/flash/net/URLStream.cpp
+--- a/src/scripting/flash/net/URLStream.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/scripting/flash/net/URLStream.cpp	2012-10-30 01:20:27.202448798 +0100
+@@ -18,10 +18,10 @@
+ **************************************************************************/
+ 
+ #include <map>
++#include "backends/security.h"
+ #include "scripting/abc.h"
+ #include "scripting/flash/net/URLStream.h"
+ #include "scripting/flash/net/flashnet.h"
+-#include "backends/security.h"
+ #include "scripting/argconv.h"
+ 
+ /**
+diff -ur a/src/scripting/flash/net/XMLSocket.cpp b/src/scripting/flash/net/XMLSocket.cpp
+--- a/src/scripting/flash/net/XMLSocket.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/scripting/flash/net/XMLSocket.cpp	2012-10-30 01:23:19.454574585 +0100
+@@ -18,13 +18,13 @@
+ **************************************************************************/
+ 
+ #include "XMLSocket.h"
++#include "backends/security.h"
+ #include "abc.h"
+ #include "toplevel/Error.h"
+ #include "class.h"
+ #include "argconv.h"
+ #include "swf.h"
+ #include "flash/errors/flasherrors.h"
+-#include "backends/security.h"
+ #include <sys/types.h>
+ #ifdef _WIN32
+ #	define _WIN32_WINNT 0x0501
+diff -ur a/src/scripting/flash/sensors/flashsensors.cpp b/src/scripting/flash/sensors/flashsensors.cpp
+--- a/src/scripting/flash/sensors/flashsensors.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/scripting/flash/sensors/flashsensors.cpp	2012-10-30 01:20:46.299454329 +0100
+@@ -18,13 +18,13 @@
+ **************************************************************************/
+ 
+ #include <map>
++#include "backends/security.h"
+ #include "scripting/abc.h"
+ #include "scripting/flash/sensors/flashsensors.h"
+ #include "scripting/class.h"
+ #include "scripting/flash/system/flashsystem.h"
+ #include "compat.h"
+ #include "backends/audio.h"
+-#include "backends/security.h"
+ 
+ using namespace std;
+ using namespace lightspark;
+diff -ur a/src/swf.cpp b/src/swf.cpp
+--- a/src/swf.cpp	2012-10-28 16:49:04.000000000 +0100
++++ b/src/swf.cpp	2012-10-30 01:02:34.015821784 +0100
+@@ -19,6 +19,7 @@
+ 
+ #include <string>
+ #include <algorithm>
++#include "backends/security.h"
+ #include "scripting/abc.h"
+ #include "scripting/flash/events/flashevents.h"
+ #include "scripting/flash/utils/flashutils.h"
+@@ -31,7 +32,6 @@
+ #include "backends/config.h"
+ #include "backends/pluginmanager.h"
+ #include "backends/rendering.h"
+-#include "backends/security.h"
+ #include "backends/image.h"
+ #include "backends/extscriptobject.h"
+ #include "memory_support.h"
diff --git a/www-plugins/lightspark/lightspark-0.7.0.ebuild b/www-plugins/lightspark/lightspark-0.7.0.ebuild
index c6689757231a..0e0f00b76ad7 100644
--- a/www-plugins/lightspark/lightspark-0.7.0.ebuild
+++ b/www-plugins/lightspark/lightspark-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.0.ebuild,v 1.1 2012/10/29 13:36:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.0.ebuild,v 1.2 2012/11/18 13:43:34 chithanh Exp $
 
 EAPI=4
 inherit cmake-utils nsplugins multilib
@@ -52,6 +52,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_rc*/}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libxmlpp-gles.patch
+)
+
 src_configure() {
 	local audiobackends
 	use pulseaudio && audiobackends+="pulse"