diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct --- linden.orig/indra/SConstruct 2008-04-07 20:37:53.000000000 -0600 +++ linden/indra/SConstruct 2008-05-07 18:36:26.000000000 -0600 @@ -118,7 +118,7 @@ standalone = optenv['STANDALONE'] runtests = optenv['RUNTESTS'] opensource = standalone or optenv['OPENSOURCE'] -enable_fmod = not opensource and optenv['FMOD'] +enable_fmod = optenv['FMOD'] elfio = optenv['ELFIO'] targets = [ target_param ] @@ -141,6 +141,7 @@ 'gdk-pixbuf-2.0', 'glib-2.0', 'gmodule-2.0', + 'gthread-2.0', 'gtk+-2.0', 'libpng', 'pango', @@ -161,6 +162,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 @@ -249,7 +253,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: @@ -613,7 +617,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': @@ -755,7 +759,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 2008-04-07 20:37:55.000000000 -0600 +++ linden/indra/llimagej2coj/llimagej2coj.cpp 2008-05-07 18:36:26.000000000 -0600 @@ -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 2008-04-07 20:37:55.000000000 -0600 +++ linden/indra/llmath/llquaternion.cpp 2008-05-07 18:36:26.000000000 -0600 @@ -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 2008-04-07 20:37:55.000000000 -0600 +++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2008-05-07 18:36:26.000000000 -0600 @@ -80,7 +80,7 @@ #include #include -#include +#include #include "apr-1/apr_base64.h" #include "llbuffer.h" diff -Naur linden.orig/indra/llwindow/llglheaders.h linden/indra/llwindow/llglheaders.h --- linden.orig/indra/llwindow/llglheaders.h 2008-04-07 20:37:57.000000000 -0600 +++ linden/indra/llwindow/llglheaders.h 2008-05-07 18:36:26.000000000 -0600 @@ -80,7 +80,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)) // Whee, the X headers define 'Status'. Undefine to avoid confusion. #undef Status #endif // LL_LINUX && !LL_MESA_HEADLESS diff -Naur linden.orig/indra/newview/linux_tools/wrapper.sh linden/indra/newview/linux_tools/wrapper.sh --- linden.orig/indra/newview/linux_tools/wrapper.sh 2008-04-07 20:38:11.000000000 -0600 +++ linden/indra/newview/linux_tools/wrapper.sh 2008-05-07 18:38:03.000000000 -0600 @@ -92,7 +92,7 @@ fi fi -export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' +export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/lib/llmozlib:"${LD_LIBRARY_PATH}"' export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin' export SL_OPT="`cat gridargs.dat` $@" diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp --- linden.orig/indra/newview/lluserauth.cpp 2008-04-07 20:38:06.000000000 -0600 +++ linden/indra/newview/lluserauth.cpp 2008-05-07 18:36:26.000000000 -0600 @@ -45,7 +45,7 @@ // NOTE: MUST include these after otherincludes since queue gets redefined!?!! #include -#include +#include diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp --- linden.orig/indra/newview/llvoiceclient.cpp 2008-04-07 20:38:06.000000000 -0600 +++ linden/indra/newview/llvoiceclient.cpp 2008-05-07 18:36:26.000000000 -0600 @@ -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 gGridChoice diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp --- linden.orig/indra/newview/llxmlrpctransaction.cpp 2008-04-07 20:38:06.000000000 -0600 +++ linden/indra/newview/llxmlrpctransaction.cpp 2008-05-07 18:36:26.000000000 -0600 @@ -37,7 +37,7 @@ #include "llviewercontrol.h" // Have to include these last to avoid queue redefinition! -#include +#include #include "llappviewer.h"