Skip to content
Snippets Groups Projects
Commit f02a85c3 authored by Oz Linden's avatar Oz Linden
Browse files

merge some linux fixes and OPEN-287

parents d91fe250 43388552
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
autobuild.xml
+ 12
− 42
View file @ f02a85c3
...@@ -682,56 +682,26 @@ ...@@ -682,56 +682,26 @@
<key>copyright</key> <key>copyright</key>
<string>Copyright (c) 2000 Cass Everitt</string> <string>Copyright (c) 2000 Cass Everitt</string>
<key>description</key> <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> <key>license</key>
<string> Copyright (c) 2000 NVIDIA CorporationMIT</string> <string>BSD</string>
<key>license_file</key> <key>license_file</key>
<string>LICENSES/glh_linear.txt</string> <string>LICENSES/glh-linear.txt</string>
<key>name</key> <key>name</key>
<string>glh-linear</string> <string>glh-linear</string>
<key>platforms</key> <key>platforms</key>
<map> <map>
<key>darwin</key> <key>common</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>
<map> <map>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>156abbd261be10ce68873ff0867b3845</string> <string>f577144536fd7c9d26d9f989acf17857</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>common</string>
</map> </map>
</map> </map>
<key>version</key> <key>version</key>
...@@ -1874,11 +1844,11 @@ ...@@ -1874,11 +1844,11 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>9054bf56196fb3ce43a92e512db6ba13</string> <string>15ebe611213c9577691ffbade081549d</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>md5</string> <string>md5</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -1888,18 +1858,18 @@ ...@@ -1888,18 +1858,18 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>ca34d3f0f014ef6b8c445b6cacf4edc7</string> <string>3bf6e26aeec71f36c8b6e20c6b883fe9</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>md5</string> <string>md5</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
</map> </map>
</map> </map>
<key>version</key> <key>version</key>
<string>1.12.854-1.1.0.296861</string> <string>1.12.854-1.1.0.297677</string>
</map> </map>
<key>openjpeg</key> <key>openjpeg</key>
<map> <map>
......
indra/cmake/00-Common.cmake
+ 1
− 1
View file @ f02a85c3
...@@ -209,7 +209,7 @@ if (LINUX OR DARWIN) ...@@ -209,7 +209,7 @@ if (LINUX OR DARWIN)
endif (CMAKE_CXX_COMPILER MATCHES ".*clang") endif (CMAKE_CXX_COMPILER MATCHES ".*clang")
if (CMAKE_COMPILER_IS_GNUCXX) 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) elseif (CMAKE_COMPILER_IS_CLANGXX)
set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
endif() endif()
......
indra/cmake/BerkeleyDB.cmake
+ 1
− 1
View file @ f02a85c3
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt)
set(DB_FIND_QUIETLY ON) set(DB_FIND_QUIETLY ON)
set(DB_FIND_REQUIRED ON) set(DB_FIND_REQUIRED ON)
......
indra/cmake/Copy3rdPartyLibs.cmake
+ 5
− 5
View file @ f02a85c3
...@@ -233,11 +233,11 @@ elseif(LINUX) ...@@ -233,11 +233,11 @@ elseif(LINUX)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files set(vivox_files
libsndfile.so.1 libsndfile.dylib
libortp.so libortp.dylib
libvivoxoal.so.1 libvivoxoal.dylib
libvivoxplatform.so libvivoxplatform.dylib
libvivoxsdk.so libvivoxsdk.dylib
SLVoice SLVoice
# ca-bundle.crt #No cert for linux. It is actually still 3.2SDK. # ca-bundle.crt #No cert for linux. It is actually still 3.2SDK.
) )
......
indra/llcommon/llprocessor.cpp
+ 1
− 1
View file @ f02a85c3
...@@ -778,7 +778,7 @@ private: ...@@ -778,7 +778,7 @@ private:
setInfo(eFamily, family); 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(eExtendedModel, getSysctlInt("machdep.cpu.extmodel"));
// setInfo(eBrandID, getSysctlInt("machdep.cpu.brand")); // setInfo(eBrandID, getSysctlInt("machdep.cpu.brand"));
......
indra/llcommon/llsys.cpp
+ 1
− 0
View file @ f02a85c3
...@@ -677,6 +677,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB() ...@@ -677,6 +677,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB()
#if LL_WINDOWS #if LL_WINDOWS
#endif #endif
#if LL_LINUX #if LL_LINUX
# define STATUS_SIZE 2048
LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
if (status_filep) if (status_filep)
{ {
......
indra/newview/viewer_manifest.py
+ 4
− 4
View file @ f02a85c3
...@@ -1154,11 +1154,11 @@ class Linux_i686_Manifest(LinuxManifest): ...@@ -1154,11 +1154,11 @@ class Linux_i686_Manifest(LinuxManifest):
self.path("SLVoice") self.path("SLVoice")
self.end_prefix() self.end_prefix()
if self.prefix(src="../packages/lib/release", dst="lib"): if self.prefix(src="../packages/lib/release", dst="lib"):
self.path("libortp.so") self.path("libortp.dylib")
self.path("libsndfile.so.1") self.path("libsndfile.dylib")
#self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
self.path("libvivoxsdk.so") self.path("libvivoxsdk.dylib")
self.path("libvivoxplatform.so") self.path("libvivoxplatform.dylib")
self.end_prefix("lib") self.end_prefix("lib")
# plugin runtime # plugin runtime
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment