From 650dd40187d63eb892a313b12d431f6b485e2dde Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Tue, 15 Mar 2011 19:58:25 +0000 Subject: update openal archive for linux. --- autobuild.xml | 4 ++-- indra/newview/viewer_manifest.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 6dfa7671d3..8e6ad226f3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1316,11 +1316,11 @@ archive hash - fccdca18a950ac9363c6fb39118b80e1 + 30b9b33fb9320d9b6634e0dbb013b4e7 hash_algorithm md5 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-3ad86a1c-linux-20110114.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openal/rev/223977/arch/Linux/installer/openal-1.12.854-1.1.0-linux-20110315.tar.bz2 name linux diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index addaafa494..2b756c8dce 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -947,7 +947,11 @@ class Linux_i686Manifest(LinuxManifest): self.path("libopenjpeg.so.1") self.path("libopenjpeg.so") self.path("libalut.so") - self.path("libopenal.so", "libopenal.so.1") + self.path("libalut.so.0") + self.path("libalut.so.0.0.0") + self.path("libopenal.so") + self.path("libopenal.so.1") + self.path("libopenal.so.1.12.854") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname self.path("libfontconfig.so.1.4.4") try: -- cgit v1.2.3 From cd8485f9c0535455142f7f979159dcf8027ae93c Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Tue, 15 Mar 2011 20:54:22 +0000 Subject: update uuid archive for linux. --- autobuild.xml | 4 ++-- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- indra/newview/viewer_manifest.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8e6ad226f3..11ffd12123 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1052,9 +1052,9 @@ archive hash - 2b64ea42d54583ab82f4936ce6ea2a3c + 873e8e99d29711df2efa30646dca1795 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20100930.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libuuid/rev/223995/arch/Linux/installer/uuid-1.6.2-linux-20110315.tar.bz2 name linux diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index f1584ff0c4..169502731d 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -259,7 +259,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so - libuuid.so.1 + libuuid.so.16.0.22 libssl.so.0.9.8 libfontconfig.so.1.4.4 ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2b756c8dce..dad0519a8a 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -938,7 +938,9 @@ class Linux_i686Manifest(LinuxManifest): self.path("libcrypto.so.0.9.8") self.path("libexpat.so.1.5.2") self.path("libssl.so.0.9.8") - self.path("libuuid.so.1") + self.path("libuuid.so") + self.path("libuuid.so.16") + self.path("libuuid.so.16.0.22") self.path("libSDL-1.2.so.0.11.3") self.path("libdirectfb-1.4.so.5.0.4") self.path("libfusion-1.4.so.5.0.4") -- cgit v1.2.3 From 1f5f03da389af871cdb5366051aeeac7f42294ab Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 16 Mar 2011 09:05:20 -0700 Subject: fix hash for curl archive on darwin. --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuild.xml b/autobuild.xml index 11ffd12123..7a05b01555 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -618,7 +618,7 @@ archive hash - 2bb7adabbd1fe2c7f99ddc4240842cc4 + bd2f84ef8bd308570e2e532a371dc2ef url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glui/rev/221069/arch/Darwin/installer/glui-2.36-darwin-20110309.tar.bz2 -- cgit v1.2.3 From 38bdbbd01921e008a5882739992fd8139ec9e1fb Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Wed, 16 Mar 2011 16:06:47 +0000 Subject: rename google archive for linux to google-perftools and update to latest. --- autobuild.xml | 28 +++++++--------------------- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- indra/cmake/GooglePerfTools.cmake | 3 +-- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 11ffd12123..6bf06212a9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -639,12 +639,14 @@ - google + google-perftools license - mit + bsd + license_file + LICENSES/google-perftools.txt name - google + google-perftools platforms linux @@ -652,29 +654,13 @@ archive hash - 7d9d1b6d32ee273df164f7b7d5f29848 - hash_algorithm - md5 + cf513fc2eec4a414cc804cf408932a45 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-0.0.0-linux-20110114.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-google-perftools/rev/224046/arch/Linux/installer/google_perftools-1.7-linux-20110315.tar.bz2 name linux - - version - 0.0.0 - - google-perftools - - license - bsd - license_file - LICENSES/google.txt - name - google-perftools - platforms - windows archive diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 169502731d..e2b7d3b888 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -257,8 +257,8 @@ elseif(LINUX) libopenal.so libopenjpeg.so libssl.so - libstacktrace.so libtcmalloc.so + libuuid.so.16 libuuid.so.16.0.22 libssl.so.0.9.8 libfontconfig.so.1.4.4 diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 133ae14d2f..6c784a3a76 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -12,9 +12,8 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) - use_prebuilt_binary(google) + use_prebuilt_binary(google-perftools) set(TCMALLOC_LIBRARIES tcmalloc) - set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) -- cgit v1.2.3