diff --git a/autobuild.xml b/autobuild.xml
index 4ff5b08e4e99c3503f0df6aaed413f3527d84b26..b944a673c099b272ca4fa3a195c46dd4ade39068 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -682,56 +682,26 @@
<key>copyright</key>
<string>Copyright (c) 2000 Cass Everitt</string>
<key>description</key>
- <string>glh - is a platform-indepenedent C++ OpenGL helper library </string>
+ <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
<key>license</key>
- <string> Copyright (c) 2000 NVIDIA CorporationMIT</string>
+ <string>BSD</string>
<key>license_file</key>
- <string>LICENSES/glh_linear.txt</string>
+ <string>LICENSES/glh-linear.txt</string>
<key>name</key>
<string>glh-linear</string>
<key>platforms</key>
<map>
- <key>darwin</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>82d6a829726786944e2387c6ae89cf27</string>
- <key>hash_algorithm</key>
- <string>md5</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/297262/arch/Darwin/installer/glh_linear-0.0.0-darwin-297262.tar.bz2</string>
- </map>
- <key>name</key>
- <string>darwin</string>
- </map>
- <key>linux</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>41c5cd2b229bfb5373ecd7c7b57cb575</string>
- <key>hash_algorithm</key>
- <string>md5</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/297262/arch/Linux/installer/glh_linear-0.0.0-linux-297262.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux</string>
- </map>
- <key>windows</key>
+ <key>common</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
- <string>156abbd261be10ce68873ff0867b3845</string>
- <key>hash_algorithm</key>
- <string>md5</string>
+ <string>f577144536fd7c9d26d9f989acf17857</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/297262/arch/CYGWIN/installer/glh_linear-0.0.0-windows-297262.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/297692/arch/Linux/installer/glh_linear-0.0.0-common-297692.tar.bz2</string>
</map>
<key>name</key>
- <string>windows</string>
+ <string>common</string>
</map>
</map>
<key>version</key>
@@ -1874,11 +1844,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9054bf56196fb3ce43a92e512db6ba13</string>
+ <string>15ebe611213c9577691ffbade081549d</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openal_3p-update-openal/rev/296861/arch/Linux/installer/openal-1.12.854-1.1.0.296861-linux-296861.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openal_3p-update-openal/rev/297677/arch/Linux/installer/openal-1.12.854-1.1.0.297677-linux-297677.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1888,18 +1858,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ca34d3f0f014ef6b8c445b6cacf4edc7</string>
+ <string>3bf6e26aeec71f36c8b6e20c6b883fe9</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openal_3p-update-openal/rev/296861/arch/CYGWIN/installer/openal-1.12.854-1.1.0.296861-windows-296861.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openal_3p-update-openal/rev/297677/arch/CYGWIN/installer/openal-1.12.854-1.1.0.297677-windows-297677.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.12.854-1.1.0.296861</string>
+ <string>1.12.854-1.1.0.297677</string>
</map>
<key>openjpeg</key>
<map>
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index ec076837f4b5f995ad891c2aad834700c3d9c7d1..eb0eff2f544498cee4be2d40c54a30a53f2cd50d 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -209,7 +209,7 @@ if (LINUX OR DARWIN)
endif (CMAKE_CXX_COMPILER MATCHES ".*clang")
if (CMAKE_COMPILER_IS_GNUCXX)
- set(GCC_WARNINGS "-Wall -Wno-trigraphs")
+ set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
elseif (CMAKE_COMPILER_IS_CLANGXX)
set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
endif()
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
index 5f6b644a15da4ed3465faff71b228b4fb58df3f2..ee670ac6502d0bdf1f07bf50c6d021b9f2e27732 100755
--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -1,5 +1,5 @@
# -*- cmake -*-
-
+include(Prebuilt)
set(DB_FIND_QUIETLY ON)
set(DB_FIND_REQUIRED ON)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 28202f85d648f036e7689447f3f4ea8649c3647b..a1a9ff55f5858aebdd53efe6397f5a404c146f6c 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -233,11 +233,11 @@ elseif(LINUX)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
- libsndfile.so.1
- libortp.so
- libvivoxoal.so.1
- libvivoxplatform.so
- libvivoxsdk.so
+ libsndfile.dylib
+ libortp.dylib
+ libvivoxoal.dylib
+ libvivoxplatform.dylib
+ libvivoxsdk.dylib
SLVoice
# ca-bundle.crt #No cert for linux. It is actually still 3.2SDK.
)
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 1ee3c7edb054d20c7b0ad06e71be217c8f1fc678..e3e1d0c3918c8cdf1c61d2b98305c46d105a2dc8 100755
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -778,7 +778,7 @@ class LLProcessorInfoLinuxImpl : public LLProcessorInfoImpl
setInfo(eFamily, family);
}
- setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family));
+ setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family, 0));
// setInfo(eExtendedModel, getSysctlInt("machdep.cpu.extmodel"));
// setInfo(eBrandID, getSysctlInt("machdep.cpu.brand"));
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index c9db73eb99faea8953ab5455711532d1f2ad1755..1a66612e8785a22a792c505e8fd0bc494cef09d8 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -677,6 +677,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB()
#if LL_WINDOWS
#endif
#if LL_LINUX
+# define STATUS_SIZE 2048
LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
if (status_filep)
{
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 2394dd26b92391958493d5ab7fdf501dee19e52a..c360fc32ac1ac8cdd915cc116d96f6f262301de0 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1154,11 +1154,11 @@ def construct(self):
self.path("SLVoice")
self.end_prefix()
if self.prefix(src="../packages/lib/release", dst="lib"):
- self.path("libortp.so")
- self.path("libsndfile.so.1")
+ self.path("libortp.dylib")
+ self.path("libsndfile.dylib")
#self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
- self.path("libvivoxsdk.so")
- self.path("libvivoxplatform.so")
+ self.path("libvivoxsdk.dylib")
+ self.path("libvivoxplatform.dylib")
self.end_prefix("lib")
# plugin runtime