Attachment #152747 for bug #127026

View | Details | Raw Unified | Return to bug 127026 | Differences between

and this patch

Lines 118-124 Link Here

(-)linden.orig/indra/SConstruct (-4 / +11 lines)
118	standalone = optenv['STANDALONE']	118	standalone = optenv['STANDALONE']
119	runtests = optenv['RUNTESTS']	119	runtests = optenv['RUNTESTS']
120	opensource = standalone or optenv['OPENSOURCE']	120	opensource = standalone or optenv['OPENSOURCE']
121	enable_fmod = not opensource and optenv['FMOD']	121	enable_fmod = optenv['FMOD']
122	elfio = optenv['ELFIO']	122	elfio = optenv['ELFIO']
123		123
124	targets = [ target_param ]	124	targets = [ target_param ]
Lines 141-146 Link Here
141	'gdk-pixbuf-2.0',	141	'gdk-pixbuf-2.0',
142	'glib-2.0',	142	'glib-2.0',
143	'gmodule-2.0',	143	'gmodule-2.0',
		144	'gthread-2.0',
144	'gtk+-2.0',	145	'gtk+-2.0',
145	'libpng',	146	'libpng',
146	'pango',	147	'pango',
Lines 161-166 Link Here
161	'libssl',	162	'libssl',
162	]	163	]
163		164
		165	if enable_gstreamer:
		166	standalone_pkgs += [ 'gstreamer-0.10' ]
		167
164	def pkgconfig(opt, pkgs=None):	168	def pkgconfig(opt, pkgs=None):
165	if pkgs is None:	169	if pkgs is None:
166	pkgs = standalone_pkgs + standalone_net_pkgs	170	pkgs = standalone_pkgs + standalone_net_pkgs
Lines 249-255 Link Here
249	##############	253	##############
250		254
251	# Generic GCC flags	255	# Generic GCC flags
252	cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '	256	cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
253	cxxflags = ''	257	cxxflags = ''
254	cppflags = '-D_FORTIFY_SOURCE=2 '	258	cppflags = '-D_FORTIFY_SOURCE=2 '
255	if standalone:	259	if standalone:
Lines 297-302 Link Here
297	'llfreetype2', 'pango-1.0' ]	301	'llfreetype2', 'pango-1.0' ]
298	include_dirs += ['../libraries/' + system_str + '/include/' + d	302	include_dirs += ['../libraries/' + system_str + '/include/' + d
299	for d in incdirs]	303	for d in incdirs]
		304	include_dirs += [d[2:] for d in
		305	pkgconfig('--cflags', [ 'gtk+-2.0' ]).split()
		306	]
300		307
301	if elfio:	308	if elfio:
302	client_external_libs += [ 'ELFIO' ]	309	client_external_libs += [ 'ELFIO' ]
Lines 613-619 Link Here
613	net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]	620	net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
614	net_external_libs += [ 'cares', 'expat' ]	621	net_external_libs += [ 'cares', 'expat' ]
615		622
616	common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]	623	common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ]
617		624
618	if build_target == 'client':	625	if build_target == 'client':
619	if platform == 'linux':	626	if platform == 'linux':
Lines 755-761 Link Here
755	internal_libs + external_libs)	762	internal_libs + external_libs)
756		763
757	# Rpcserver	764	# Rpcserver
758	external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient']	765	external_libs = common_external_libs + ['xmlrpc', 'mysqlclient']
759	internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs',	766	internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs',
760	'llmath', 'llcommon']	767	'llmath', 'llcommon']
761	create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',	768	create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',

Lines 31-41 Link Here

(-)linden.orig/indra/llcommon/llares.cpp (-5 / +1 lines)
31	* $/LicenseInfo$	31	* $/LicenseInfo$
32	*/	32	*/
33		33
34	#ifdef LL_STANDALONE	34	#include <ares_dns.h>
35	# include <ares_dns.h>
36	#else
37	# include <ares/ares_dns.h>
38	#endif
39		35
40	#include "apr-1/apr_portable.h"	36	#include "apr-1/apr_portable.h"
41	#include "apr-1/apr_network_io.h"	37	#include "apr-1/apr_network_io.h"

Lines 38-48 Link Here

(-)linden.orig/indra/llcommon/llares.h (-5 / +1 lines)
38	# include <ws2tcpip.h>	38	# include <ws2tcpip.h>
39	#endif	39	#endif
40		40
41	#ifdef LL_STANDALONE	41	#include <ares.h>
42	# include <ares.h>
43	#else
44	# include <ares/ares.h>
45	#endif
46		42
47	#include "llmemory.h"	43	#include "llmemory.h"
48	#include "lluri.h"	44	#include "lluri.h"

Lines 39-49 Link Here

(-)linden.orig/indra/llcommon/llsdserialize_xml.cpp (-5 / +1 lines)
39		39
40	extern "C"	40	extern "C"
41	{	41	{
42	#ifdef LL_STANDALONE	42	#include <expat.h>
43	# include <expat.h>
44	#else
45	# include "expat/expat.h"
46	#endif
47	}	43	}
48		44
49	/**	45	/**

Lines 34-44 Link Here

(-)linden.orig/indra/llcommon/llsys.cpp (-5 / +1 lines)
34	#include "llsys.h"	34	#include "llsys.h"
35		35
36	#include <iostream>	36	#include <iostream>
37	#ifdef LL_STANDALONE	37	#include <zlib.h>
38	# include <zlib.h>
39	#else
40	# include "zlib/zlib.h"
41	#endif
42		38
43	#include "llprocessor.h"	39	#include "llprocessor.h"
44		40




#include "llimage.h"

extern "C" {
#include <jpeglib.h>
#include <jerror.h>
# include <jerror.h>
#else
# include "jpeglib/jpeglib.h"
# include "jpeglib/jerror.h"
#endif
}

class LLImageJPEG : public LLImageFormatted

Lines 33-39 Link Here

(-)linden.orig/indra/llimagej2coj/llimagej2coj.cpp (-1 / +1 lines)
33	#include "llimagej2coj.h"	33	#include "llimagej2coj.h"
34		34
35	// this is defined so that we get static linking.	35	// this is defined so that we get static linking.
36	#include "openjpeg/openjpeg.h"	36	#include "openjpeg.h"
37		37
38	#include "lltimer.h"	38	#include "lltimer.h"
39	#include "llmemory.h"	39	#include "llmemory.h"




	{
	default:
	case LLQuaternion::XYZ:
		strcpy(p, "XYZ");
		break;
	case LLQuaternion::YZX:
		strcpy(p, "YZX");
		break;
	case LLQuaternion::ZXY:
		strcpy(p, "ZXY");
		break;
	case LLQuaternion::XZY:
		strcpy(p, "XZY");
		break;
	case LLQuaternion::YXZ:
		strcpy(p, "YXZ");
		break;
	case LLQuaternion::ZYX:
		strcpy(p, "ZYX");
		break;
	}
	return p;

Lines 80-86 Link Here

(-)linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp (-1 / +1 lines)
80		80
81	#include <sstream>	81	#include <sstream>
82	#include <iterator>	82	#include <iterator>
83	#include <xmlrpc-epi/xmlrpc.h>	83	#include <xmlrpc.h>
84	#include "apr-1/apr_base64.h"	84	#include "apr-1/apr_base64.h"
85		85
86	#include "llbuffer.h"	86	#include "llbuffer.h"

Lines 41-51 Link Here

(-)linden.orig/indra/llmessage/llhttpassetstorage.cpp (-5 / +1 lines)
41	#include "llvfile.h"	41	#include "llvfile.h"
42	#include "llvfs.h"	42	#include "llvfs.h"
43		43
44	#ifdef LL_STANDALONE	44	#include <zlib.h>
45	# include <zlib.h>
46	#else
47	# include "zlib/zlib.h"
48	#endif
49		45
50	const U32 MAX_RUNNING_REQUESTS = 1;	46	const U32 MAX_RUNNING_REQUESTS = 1;
51	const F32 MAX_PROCESSING_TIME = 0.005f;	47	const F32 MAX_PROCESSING_TIME = 0.005f;




#include "llfont.h"

// Freetype stuff
#if !defined(LL_LINUX) || defined(LL_STANDALONE)
# include <ft2build.h>
#else
// I had to do some work to avoid the system-installed FreeType headers... --ryan.
# include "llfreetype2/freetype/ft2build.h"
#endif

// For some reason, this won't work if it's not wrapped in the ifdef
#ifdef FT_FREETYPE_H

Lines 80-86 Link Here

(-)linden.orig/indra/llwindow/llglheaders.h (-1 / +1 lines)
80	# include "GL/glxext.h"	80	# include "GL/glxext.h"
81	// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol	81	// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
82	// is considered 'legacy' but works on more machines.	82	// is considered 'legacy' but works on more machines.
83	# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p))	83	# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p))
84	// Whee, the X headers define 'Status'. Undefine to avoid confusion.	84	// Whee, the X headers define 'Status'. Undefine to avoid confusion.
85	#undef Status	85	#undef Status
86	#endif // LL_LINUX && !LL_MESA_HEADLESS	86	#endif // LL_LINUX && !LL_MESA_HEADLESS

Lines 33-43 Link Here

(-)linden.orig/indra/llxml/llxmlnode.h (-4 lines)
33	#define LL_LLXMLNODE_H	33	#define LL_LLXMLNODE_H
34		34
35	#define XML_STATIC	35	#define XML_STATIC
36	#ifdef LL_STANDALONE
37	#include <expat.h>	36	#include <expat.h>
38	#else
39	#include "expat/expat.h"
40	#endif
41	#include <map>	37	#include <map>
42		38
43	#include "indra_constants.h"	39	#include "indra_constants.h"

Lines 33-43 Link Here

(-)linden.orig/indra/llxml/llxmlparser.h (-4 lines)
33	#define LL_LLXMLPARSER_H	33	#define LL_LLXMLPARSER_H
34		34
35	#define XML_STATIC	35	#define XML_STATIC
36	#ifdef LL_STANDALONE
37	#include <expat.h>	36	#include <expat.h>
38	#else
39	#include "expat/expat.h"
40	#endif
41		37
42	class LLXmlParser	38	class LLXmlParser
43	{	39	{

Lines 92-98 Link Here

(-)linden.orig/indra/newview/linux_tools/wrapper.sh (-1 / +1 lines)
92	fi	92	fi
93	fi	93	fi
94		94
95	export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'	95	export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/lib/llmozlib:"${LD_LIBRARY_PATH}"'
96	export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'	96	export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
97	export SL_OPT="`cat gridargs.dat` $@"	97	export SL_OPT="`cat gridargs.dat` $@"
98		98

Lines 45-51 Link Here

(-)linden.orig/indra/newview/lluserauth.cpp (-1 / +1 lines)
45		45
46	// NOTE: MUST include these after otherincludes since queue gets redefined!?!!	46	// NOTE: MUST include these after otherincludes since queue gets redefined!?!!
47	#include <curl/curl.h>	47	#include <curl/curl.h>
48	#include <xmlrpc-epi/xmlrpc.h>	48	#include <xmlrpc.h>
49		49
50		50
51		51

Lines 65-75 Link Here

(-)linden.orig/indra/newview/llviewerobjectlist.cpp (-4 lines)
65	#include "u64.h"	65	#include "u64.h"
66	#include "llviewerimagelist.h"	66	#include "llviewerimagelist.h"
67	#include "lldatapacker.h"	67	#include "lldatapacker.h"
68	#ifdef LL_STANDALONE
69	#include <zlib.h>	68	#include <zlib.h>
70	#else
71	#include "zlib/zlib.h"
72	#endif
73	#include "object_flags.h"	69	#include "object_flags.h"
74		70
75	#include "llappviewer.h"	71	#include "llappviewer.h"

Lines 39-45 Link Here

(-)linden.orig/indra/newview/llvoiceclient.cpp (-1 / +1 lines)
39	#include "llvoavatar.h"	39	#include "llvoavatar.h"
40	#include "llbufferstream.h"	40	#include "llbufferstream.h"
41	#include "llfile.h"	41	#include "llfile.h"
42	#include "expat/expat.h"	42	#include "expat.h"
43	#include "llcallbacklist.h"	43	#include "llcallbacklist.h"
44	#include "llviewerregion.h"	44	#include "llviewerregion.h"
45	#include "llviewernetwork.h" // for gGridChoice	45	#include "llviewernetwork.h" // for gGridChoice

Lines 37-43 Link Here

(-)linden.orig/indra/newview/llxmlrpctransaction.cpp (-1 / +1 lines)
37	#include "llviewercontrol.h"	37	#include "llviewercontrol.h"
38		38
39	// Have to include these last to avoid queue redefinition!	39	// Have to include these last to avoid queue redefinition!
40	#include <xmlrpc-epi/xmlrpc.h>	40	#include <xmlrpc.h>
41		41
42	#include "llappviewer.h"	42	#include "llappviewer.h"
43		43

Return to bug 127026

Lines 698-719 Link Here

(-)linden.orig/indra/llmath/llquaternion.cpp (-6 / +6 lines)
698	{	698	{
699	default:	699	default:
700	case LLQuaternion::XYZ:	700	case LLQuaternion::XYZ:
701	p = "XYZ";	701	strcpy(p, "XYZ");
702	break;	702	break;
703	case LLQuaternion::YZX:	703	case LLQuaternion::YZX:
704	p = "YZX";	704	strcpy(p, "YZX");
705	break;	705	break;
706	case LLQuaternion::ZXY:	706	case LLQuaternion::ZXY:
707	p = "ZXY";	707	strcpy(p, "ZXY");
708	break;	708	break;
709	case LLQuaternion::XZY:	709	case LLQuaternion::XZY:
710	p = "XZY";	710	strcpy(p, "XZY");
711	break;	711	break;
712	case LLQuaternion::YXZ:	712	case LLQuaternion::YXZ:
713	p = "YXZ";	713	strcpy(p, "YXZ");
714	break;	714	break;
715	case LLQuaternion::ZYX:	715	case LLQuaternion::ZYX:
716	p = "ZYX";	716	strcpy(p, "ZYX");
717	break;	717	break;
718	}	718	}
719	return p;	719	return p;

Lines 37-49 Link Here

(-)linden.orig/indra/llimage/llimagejpeg.h (-7 / +2 lines)
37	#include "llimage.h"	37	#include "llimage.h"
38		38
39	extern "C" {	39	extern "C" {
40	#ifdef LL_STANDALONE	40	#include <jpeglib.h>
41	# include <jpeglib.h>	41	#include <jerror.h>
42	# include <jerror.h>
43	#else
44	# include "jpeglib/jpeglib.h"
45	# include "jpeglib/jerror.h"
46	#endif
47	}	42	}
48		43
49	class LLImageJPEG : public LLImageFormatted	44	class LLImageJPEG : public LLImageFormatted

Lines 34-45 Link Here

(-)linden.orig/indra/llrender/llfont.cpp (-5 lines)
34	#include "llfont.h"	34	#include "llfont.h"
35		35
36	// Freetype stuff	36	// Freetype stuff
37	#if !defined(LL_LINUX) \|\| defined(LL_STANDALONE)
38	# include <ft2build.h>	37	# include <ft2build.h>
39	#else
40	// I had to do some work to avoid the system-installed FreeType headers... --ryan.
41	# include "llfreetype2/freetype/ft2build.h"
42	#endif
43		38
44	// For some reason, this won't work if it's not wrapped in the ifdef	39	// For some reason, this won't work if it's not wrapped in the ifdef
45	#ifdef FT_FREETYPE_H	40	#ifdef FT_FREETYPE_H