linux build fix

7 files changed, 33 insertions, 14 deletions

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 9f79c13a97..48930c1c19 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -225,14 +225,14 @@ elseif(LINUX)
                  libapr-1.so.0
                  libaprutil-1.so.0
                  libatk-1.0.so
-                 libfreetype.so.6.6.2
-                 libfreetype.so.6
+                 #libfreetype.so.6.6.2
+                 #libfreetype.so.6
                  libhunspell-1.3.so.0.0.0
-                 libopenjp2.so
-                 libuuid.so.16
-                 libuuid.so.16.0.22
-                 libfontconfig.so.1.8.0
-                 libfontconfig.so.1
+                 #libopenjp2.so
+                 #libuuid.so.16
+                 #libuuid.so.16.0.22
+                 #libfontconfig.so.1.8.0
+                 #libfontconfig.so.1
                  libgmodule-2.0.so
                  libgobject-2.0.so
                  )
diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index 7b27665483..a9714696b4 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -12,8 +12,8 @@ if (WINDOWS)
   target_link_libraries( ll::icu4c INTERFACE  icuuc)
 elseif(DARWIN)
   target_link_libraries( ll::icu4c INTERFACE  icuuc)
-#elseif(LINUX)
-##  target_link_libraries( ll::icu4c INTERFACE  )
+elseif(LINUX)
+  target_link_libraries( ll::icu4c INTERFACE  icuuc)
 else()
   message(FATAL_ERROR "Invalid platform")
 endif()
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index cae68fbc11..3e5a37b277 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -6,7 +6,8 @@ if (LINUX)
   add_library( ll::fontconfig INTERFACE IMPORTED )
 
   if( NOT USE_CONAN )
-    use_prebuilt_binary(fontconfig)
+    find_package(Fontconfig REQUIRED)
+    target_link_libraries( ll::fontconfig INTERFACE Fontconfig::Fontconfig )
   else()
     target_link_libraries( ll::fontconfig INTERFACE CONAN_PKG::fontconfig )
   endif()
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 28f8bc2b93..7bca86119c 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -867,7 +867,7 @@ private:
 		LLPI_SET_INFO_INT(eModel, "model");
 
 		
-		S32 family;							 
+		S32 family = 0;							 
 		if (!cpuinfo["cpu family"].empty() 
 			&& LLStringUtil::convertToS32(cpuinfo["cpu family"], family))	
 		{ 
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index e98fc0285a..c3e7c544ec 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -161,7 +161,7 @@ LLSD ll_binary_from_string(const LLSD& sd)
 char* ll_print_sd(const LLSD& sd)
 {
 	const U32 bufferSize = 10 * 1024;
-	static char buffer[bufferSize];
+	static char buffer[bufferSize + 1];
 	std::ostringstream stream;
 	//stream.rdbuf()->pubsetbuf(buffer, bufferSize);
 	stream << LLSDOStreamer<LLSDXMLFormatter>(sd);
@@ -183,7 +183,7 @@ char* ll_pretty_print_sd_ptr(const LLSD* sd)
 char* ll_pretty_print_sd(const LLSD& sd)
 {
 	const U32 bufferSize = 100 * 1024;
-	static char buffer[bufferSize];
+	static char buffer[bufferSize + 1];
 	std::ostringstream stream;
 	//stream.rdbuf()->pubsetbuf(buffer, bufferSize);
 	stream << LLSDOStreamer<LLSDXMLFormatter>(sd, LLSDFormatter::OPTIONS_PRETTY);
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 6c06c6de38..d0351a553c 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -573,7 +573,6 @@ public:
         for (S32 c = 0; c < numcomps; c++)
         {
             cmptparm[c].prec = 8;
-            cmptparm[c].bpp = 8;
             cmptparm[c].sgnd = 0;
             cmptparm[c].dx = parameters.subsampling_dx;
             cmptparm[c].dy = parameters.subsampling_dy;
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index b80680a3d2..c1238ac6b9 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -1029,6 +1029,25 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 
 #include <OpenGL/gl.h>
 
+#elif LL_LINUX
+
+#define GL_GLEXT_PROTOTYPES
+#define GLX_GLEXT_PROTOTYPES
+
+#include "GL/gl.h"
+#include "GL/glu.h"
+#include "GL/glext.h"
+#include "GL/glx.h"
+
+// The __APPLE__ kludge is to make glh_extensions.h not symbol-clash horribly
+# define __APPLE__
+# include "GL/glh_extensions.h"
+# undef __APPLE__
+
+// #include <X11/Xlib.h>
+// #include <X11/Xutil.h>
+#include "GL/glh_extensions.h"
+
 #endif // LL_MESA / LL_WINDOWS / LL_DARWIN
 
 // Even when GL_ARB_depth_clamp is available in the driver, the (correct)