Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/lightspark/files: lightspark-0.4.2.2-fix-disabled-plugin.diff
Date: Sat, 31 Jul 2010 15:02:35
Message-Id: 20100731145036.C9A2A2CAD8@corvid.gentoo.org
1 chithanh 10/07/31 14:50:36
2
3 Added: lightspark-0.4.2.2-fix-disabled-plugin.diff
4 Log:
5 Version bump, fixes bug #330177
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 www-plugins/lightspark/files/lightspark-0.4.2.2-fix-disabled-plugin.diff
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.2.2-fix-disabled-plugin.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.2.2-fix-disabled-plugin.diff?rev=1.1&content-type=text/plain
13
14 Index: lightspark-0.4.2.2-fix-disabled-plugin.diff
15 ===================================================================
16 === modified file 'swf.cpp'
17 --- swf.cpp 2010-07-28 22:52:35 +0000
18 +++ swf.cpp 2010-07-29 16:21:13 +0000
19 @@ -497,6 +497,7 @@
20 //Check if we should fall back on gnash
21 if(useGnashFallback && engine==GTKPLUG && vmVersion!=AVM2)
22 {
23 +#ifdef COMPILE_PLUGIN
24 if(dumpedSWFPath.len()==0) //The path is not known yet
25 {
26 waitingForDump=true;
27 @@ -565,11 +566,19 @@
28 stopEngines();
29 return;
30 }
31 +#else
32 + //COMPILE_PLUGIN not defined
33 + throw new UnsupportedException("GNASH fallback not available when not built with COMPILE_PLUGIN");
34 +#endif
35 }
36
37 if(engine==GTKPLUG) //The engines must be created int the context of the main thread
38 {
39 +#ifdef COMPILE_PLUGIN
40 npapiParams.helper(npapiParams.helperArg, (helper_t)delayedCreation, this);
41 +#else
42 + throw new UnsupportedException("Plugin engine not available when not built with COMPILE_PLUGIN");
43 +#endif
44 }
45 else //SDL engine
46 {