1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
--- linden.orig/indra/SConstruct 2007-10-30 06:12:46.000000000 +0900
+++ linden/indra/SConstruct 2007-11-05 01:14:51.000000000 +0900
@@ -112,7 +112,7 @@
channel = optenv['CHANNEL']
standalone = optenv['STANDALONE']
opensource = standalone or optenv['OPENSOURCE']
-enable_fmod = not opensource and optenv['FMOD']
+enable_fmod = optenv['FMOD']
elfio = optenv['ELFIO']
targets = [ target_param ]
@@ -135,6 +135,7 @@
'gdk-pixbuf-2.0',
'glib-2.0',
'gmodule-2.0',
+ 'gthread-2.0',
'gtk+-2.0',
'libpng',
'pango',
@@ -155,6 +156,9 @@
'libssl',
]
+if enable_gstreamer:
+ standalone_pkgs += [ 'gstreamer-0.10' ]
+
def pkgconfig(opt, pkgs=None):
if pkgs is None:
pkgs = standalone_pkgs + standalone_net_pkgs
@@ -243,7 +247,7 @@
##############
# Generic GCC flags
- cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '
+ cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
cxxflags = ''
cppflags = '-D_FORTIFY_SOURCE=2 '
if standalone:
@@ -602,7 +606,7 @@
net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
net_external_libs += [ 'cares', 'expat' ]
- common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]
+ common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ]
if build_target == 'client':
if platform == 'linux':
@@ -742,7 +746,7 @@
internal_libs + external_libs)
# Rpcserver
- external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient']
+ external_libs = common_external_libs + ['xmlrpc', 'mysqlclient']
internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs',
'llmath', 'llcommon']
create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',
diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-10-30 06:12:46.000000000 +0900
+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -33,7 +33,7 @@
#include "llimagej2coj.h"
// this is defined so that we get static linking.
-#include "openjpeg/openjpeg.h"
+#include "openjpeg.h"
#include "lltimer.h"
#include "llmemory.h"
diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp
--- linden.orig/indra/llmath/llquaternion.cpp 2007-10-30 06:12:46.000000000 +0900
+++ linden/indra/llmath/llquaternion.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -698,22 +698,22 @@
{
default:
case LLQuaternion::XYZ:
- p = "XYZ";
+ strcpy(p, "XYZ");
break;
case LLQuaternion::YZX:
- p = "YZX";
+ strcpy(p, "YZX");
break;
case LLQuaternion::ZXY:
- p = "ZXY";
+ strcpy(p, "ZXY");
break;
case LLQuaternion::XZY:
- p = "XZY";
+ strcpy(p, "XZY");
break;
case LLQuaternion::YXZ:
- p = "YXZ";
+ strcpy(p, "YXZ");
break;
case LLQuaternion::ZYX:
- p = "ZYX";
+ strcpy(p, "ZYX");
break;
}
return p;
diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp
--- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-10-30 06:12:46.000000000 +0900
+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -80,7 +80,7 @@
#include <sstream>
#include <iterator>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
#include "apr-1/apr_base64.h"
#include "llbuffer.h"
diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp
--- linden.orig/indra/llwindow/llgl.cpp 2007-10-30 06:12:47.000000000 +0900
+++ linden/indra/llwindow/llgl.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -64,7 +64,7 @@
# include "GL/glxext.h"
// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
// is considered 'legacy' but works on more machines.
-# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p))
+# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p))
#endif // LL_LINUX && !LL_MESA_HEADLESS
diff -Naur linden.orig/indra/newview/llfloaterhtml.cpp linden/indra/newview/llfloaterhtml.cpp
--- linden.orig/indra/newview/llfloaterhtml.cpp 2007-10-30 06:12:51.000000000 +0900
+++ linden/indra/newview/llfloaterhtml.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -228,7 +228,9 @@
// static
void LLFloaterHtml::onCommitUrlEdit(LLUICtrl* ctrl, void* user_data)
{
+#if LL_LIBXUL_ENABLED
LLFloaterHtml* self = (LLFloaterHtml*)user_data;
+#endif
LLLineEditor* editor = (LLLineEditor*)ctrl;
std::string url = editor->getText();
diff -Naur linden.orig/indra/newview/llurldispatcher.cpp linden/indra/newview/llurldispatcher.cpp
--- linden.orig/indra/newview/llurldispatcher.cpp 2007-10-30 06:12:51.000000000 +0900
+++ linden/indra/newview/llurldispatcher.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -151,7 +151,9 @@
{
if (matchPrefix(url, SLURL_SL_HELP_PREFIX))
{
+#if LL_LIBXUL_ENABLED
gViewerHtmlHelp.show();
+#endif // LL_LIBXUL_ENABLED
return true;
}
return false;
diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp
--- linden.orig/indra/newview/lluserauth.cpp 2007-10-30 06:12:51.000000000 +0900
+++ linden/indra/newview/lluserauth.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -45,7 +45,7 @@
// NOTE: MUST include these after otherincludes since queue gets redefined!?!!
#include <curl/curl.h>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp
--- linden.orig/indra/newview/llvoiceclient.cpp 2007-10-30 06:12:51.000000000 +0900
+++ linden/indra/newview/llvoiceclient.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -39,7 +39,7 @@
#include "llvoavatar.h"
#include "llbufferstream.h"
#include "llfile.h"
-#include "expat/expat.h"
+#include "expat.h"
#include "llcallbacklist.h"
#include "llviewerregion.h"
#include "llviewernetwork.h" // for gUserServerChoice
diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp
--- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-10-30 06:12:51.000000000 +0900
+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-11-05 01:13:59.000000000 +0900
@@ -37,7 +37,7 @@
// Have to include these last to avoid queue redefinition!
#include <curl/curl.h>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
#include "viewer.h"
|
GitWeb