1 |
chithanh 10/07/05 22:41:07 |
2 |
|
3 |
Added: lightspark-0.4.2-ndebug.patch |
4 |
Log: |
5 |
Add release candidate. |
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-ndebug.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.2-ndebug.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.2-ndebug.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: lightspark-0.4.2-ndebug.patch |
15 |
=================================================================== |
16 |
=== modified file 'CMakeLists.txt' |
17 |
--- CMakeLists.txt 2010-07-01 01:24:10 +0000 |
18 |
+++ CMakeLists.txt 2010-07-04 16:57:13 +0000 |
19 |
@@ -123,9 +123,9 @@ |
20 |
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wnon-virtual-dtor -Woverloaded-virtual -pipe -fvisibility=hidden") |
21 |
SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DEXPENSIVE_DEBUG") |
22 |
SET(CMAKE_CXX_FLAGS_PROFILE "-g -pg -O2") |
23 |
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3") |
24 |
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2") |
25 |
-SET(CMAKE_CXX_FLAGS_DEBIAN "-O2") |
26 |
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") |
27 |
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2 -DNDEBUG") |
28 |
+SET(CMAKE_CXX_FLAGS_DEBIAN "-O2 -DNDEBUG") |
29 |
|
30 |
ADD_DEFINITIONS(-DDATADIR="${CMAKE_INSTALL_PREFIX}/share/lightspark") |
31 |
|
32 |
|
33 |
=== modified file 'abc_opcodes.cpp' |
34 |
--- abc_opcodes.cpp 2010-06-20 15:00:39 +0000 |
35 |
+++ abc_opcodes.cpp 2010-07-04 16:57:13 +0000 |
36 |
@@ -644,11 +644,15 @@ |
37 |
ret=Class<ASObject>::getInstanceS(); |
38 |
if(sf->mi->body) |
39 |
{ |
40 |
+#ifndef NDEBUG |
41 |
ret->initialized=false; |
42 |
+#endif |
43 |
LOG(LOG_CALLS,"Building method traits"); |
44 |
for(unsigned int i=0;i<sf->mi->body->trait_count;i++) |
45 |
th->context->buildTrait(ret,&sf->mi->body->traits[i],false); |
46 |
+#ifndef NDEBUG |
47 |
ret->initialized=true; |
48 |
+#endif |
49 |
ret->incRef(); |
50 |
assert_and_throw(sf->closure_this==NULL); |
51 |
ASObject* ret2=sf->call(ret,args,m,0); |
52 |
@@ -1913,11 +1917,15 @@ |
53 |
ret=Class<ASObject>::getInstanceS(); |
54 |
if(sf->mi->body) |
55 |
{ |
56 |
+#ifndef NDEBUG |
57 |
ret->initialized=false; |
58 |
+#endif |
59 |
LOG(LOG_CALLS,"Building method traits"); |
60 |
for(unsigned int i=0;i<sf->mi->body->trait_count;i++) |
61 |
th->context->buildTrait(ret,&sf->mi->body->traits[i],false); |
62 |
+#ifndef NDEBUG |
63 |
ret->initialized=true; |
64 |
+#endif |
65 |
ret->incRef(); |
66 |
assert_and_throw(sf->closure_this==NULL); |
67 |
ASObject* ret2=sf->call(ret,args,m,0); |
68 |
@@ -2181,10 +2189,14 @@ |
69 |
//TODO: Should create a real activation object |
70 |
//TODO: Should method traits be added to the activation context? |
71 |
ASObject* act=Class<ASObject>::getInstanceS(); |
72 |
+#ifndef NDEBUG |
73 |
act->initialized=false; |
74 |
+#endif |
75 |
for(unsigned int i=0;i<info->body->trait_count;i++) |
76 |
th->context->buildTrait(act,&info->body->traits[i],false); |
77 |
+#ifndef NDEBUG |
78 |
act->initialized=true; |
79 |
+#endif |
80 |
|
81 |
return act; |
82 |
} |
83 |
|
84 |
=== modified file 'asobjects.cpp' |
85 |
--- asobjects.cpp 2010-06-30 01:41:37 +0000 |
86 |
+++ asobjects.cpp 2010-07-04 16:57:13 +0000 |
87 |
@@ -1727,7 +1727,9 @@ |
88 |
}*/ |
89 |
if(buildAndLink) |
90 |
{ |
91 |
+ #ifndef NDEBUG |
92 |
assert_and_throw(!target->initialized); |
93 |
+ #endif |
94 |
//HACK: suppress implementation handling of variables just now |
95 |
bool bak=target->implEnable; |
96 |
target->implEnable=false; |
97 |
|
98 |
=== modified file 'swf.cpp' |
99 |
--- swf.cpp 2010-07-03 21:26:00 +0000 |
100 |
+++ swf.cpp 2010-07-04 16:57:13 +0000 |
101 |
@@ -653,7 +653,7 @@ |
102 |
break; |
103 |
case ButtonPress: |
104 |
{ |
105 |
- cout << "Press" << endl; |
106 |
+ //cout << "Press" << endl; |
107 |
Locker locker(th->mutexListeners); |
108 |
th->m_sys->renderThread->requestInput(); |
109 |
float selected=th->m_sys->renderThread->getIdAt(xevent->xbutton.x,xevent->xbutton.y); |
110 |
@@ -674,7 +674,7 @@ |
111 |
} |
112 |
case ButtonRelease: |
113 |
{ |
114 |
- cout << "Release" << endl; |
115 |
+ //cout << "Release" << endl; |
116 |
Locker locker(th->mutexListeners); |
117 |
sys->renderThread->requestInput(); |
118 |
float selected=sys->renderThread->getIdAt(xevent->xbutton.x,xevent->xbutton.y); |
119 |
|
120 |
=== modified file 'swftypes.cpp' |
121 |
--- swftypes.cpp 2010-06-30 01:23:30 +0000 |
122 |
+++ swftypes.cpp 2010-07-04 16:57:13 +0000 |
123 |
@@ -263,7 +263,9 @@ |
124 |
void ASObject::setGetterByQName(const tiny_string& name, const tiny_string& ns, IFunction* o) |
125 |
{ |
126 |
check(); |
127 |
+#ifndef NDEBUG |
128 |
assert_and_throw(!initialized); |
129 |
+#endif |
130 |
//Getters are inserted with the current level of the prototype chain |
131 |
int level=cur_level; |
132 |
obj_var* obj=Variables.findObjVar(name,ns,level,true,false); |
133 |
@@ -279,7 +281,9 @@ |
134 |
void ASObject::setSetterByQName(const tiny_string& name, const tiny_string& ns, IFunction* o) |
135 |
{ |
136 |
check(); |
137 |
+#ifndef NDEBUG |
138 |
assert_and_throw(!initialized); |
139 |
+#endif |
140 |
//Setters are inserted with the current level of the prototype chain |
141 |
int level=cur_level; |
142 |
obj_var* obj=Variables.findObjVar(name,ns,level,true,false); |
143 |
@@ -579,7 +583,9 @@ |
144 |
void ASObject::initSlot(unsigned int n,const tiny_string& name, const tiny_string& ns) |
145 |
{ |
146 |
//Should be correct to use the level on the prototype chain |
147 |
+#ifndef NDEBUG |
148 |
assert_and_throw(!initialized); |
149 |
+#endif |
150 |
Variables.initSlot(n,cur_level,name,ns); |
151 |
} |