From ca6736807e892db99388b9bcd1ba4b672ff3f7e0 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 17 Dec 2014 17:57:17 -0500 Subject: include Prebuilt.cmake before using macro --- indra/cmake/BerkeleyDB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index 5f6b644a15..ee670ac650 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) -- cgit v1.2.3 From 7b2045e734d802839a86a874098be77d41acba1c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 18 Dec 2014 09:47:27 -0500 Subject: allow signed vs unsigned compare in gcc --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index ec076837f4..eb0eff2f54 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() -- cgit v1.2.3 From 4be01b73901256f669d5fb8ae3061ed10a5c2290 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 22 Dec 2014 13:19:20 -0500 Subject: correct havok-source package name in autobuild configuration --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuild.xml b/autobuild.xml index eb236c0f0e..4ff5b08e4e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1078,7 +1078,7 @@ license_file LICENSES/havok.txt name - -source + havok-source platforms darwin -- cgit v1.2.3 From 111900150d7e80f4f97f26ceb413aea2a5965d73 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 22 Dec 2014 16:42:55 -0500 Subject: work arounds to compile on linux --- indra/llcommon/llprocessor.cpp | 2 +- indra/llcommon/llsys.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 1ee3c7edb0..e3e1d0c391 100755 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -778,7 +778,7 @@ private: 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 c9db73eb99..1a66612e87 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) { -- cgit v1.2.3 From 707e51629ec2d540871cb625a7293c1fdebcebcf Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 22 Dec 2014 16:43:28 -0500 Subject: update libs to match vivox distribution --- indra/cmake/Copy3rdPartyLibs.cmake | 10 +++++----- indra/newview/viewer_manifest.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 28202f85d6..a1a9ff55f5 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/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2394dd26b9..c360fc32ac 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1154,11 +1154,11 @@ class Linux_i686_Manifest(LinuxManifest): 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 -- cgit v1.2.3 From d088c9b5a50126613b5db4178f50a54a2fc3fa77 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 22 Dec 2014 17:05:34 -0500 Subject: update openal package --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4ff5b08e4e..167249033a 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1874,11 +1874,11 @@ archive hash - 9054bf56196fb3ce43a92e512db6ba13 + 15ebe611213c9577691ffbade081549d hash_algorithm md5 url - 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 + 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 name linux @@ -1888,18 +1888,18 @@ archive hash - ca34d3f0f014ef6b8c445b6cacf4edc7 + 3bf6e26aeec71f36c8b6e20c6b883fe9 hash_algorithm md5 url - 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 + 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 name windows version - 1.12.854-1.1.0.296861 + 1.12.854-1.1.0.297677 openjpeg -- cgit v1.2.3 From 43388552a07bfcfed5e674097303054e1cacf6ae Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 23 Dec 2014 11:03:35 -0500 Subject: OPEN-287: convert glh-linear to a common package --- autobuild.xml | 44 +++++++------------------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 167249033a..b944a673c0 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -682,56 +682,26 @@ copyright Copyright (c) 2000 Cass Everitt description - glh - is a platform-indepenedent C++ OpenGL helper library + glh - is a platform-indepenedent C++ OpenGL helper library license - Copyright (c) 2000 NVIDIA CorporationMIT + BSD license_file - LICENSES/glh_linear.txt + LICENSES/glh-linear.txt name glh-linear platforms - darwin - - archive - - hash - 82d6a829726786944e2387c6ae89cf27 - hash_algorithm - md5 - url - 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 - - name - darwin - - linux - - archive - - hash - 41c5cd2b229bfb5373ecd7c7b57cb575 - hash_algorithm - md5 - url - 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 - - name - linux - - windows + common archive hash - 156abbd261be10ce68873ff0867b3845 - hash_algorithm - md5 + f577144536fd7c9d26d9f989acf17857 url - 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 + 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 name - windows + common version -- cgit v1.2.3