From 432bf69ad6217abfda330cb648ae45dfc5cb1e66 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 8 Dec 2009 08:56:13 +0000
Subject:  	DEV-43897 	 linux viewer2 corrupted vorbis problem

we were accidentally linking the duff fmod vorbis first because our dependancies weren't well-defined.
---
 indra/cmake/LLAudio.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake
index 89b790c6b0..7c248dfc72 100644
--- a/indra/cmake/LLAudio.cmake
+++ b/indra/cmake/LLAudio.cmake
@@ -6,4 +6,5 @@ set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
     )
 
-set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES})
+# be exhaustive here
+set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})
-- 
cgit v1.3


From 25a773d79cc8b2e00f6769abe0717ac9b2325cd4 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 8 Dec 2009 11:39:44 -0800
Subject: DEV-43896 	 solve render-pipeline linux mesh gzopen64 problem I'm
 committing here instead of to render-pipeline because this seems like a
 change that it makes sense to give a workout in trunk.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 1 -
 install.xml                        | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 5a142f23c9..faf9da8b14 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -231,7 +231,6 @@ elseif(LINUX)
         libstacktrace.so
         libtcmalloc.so
         libuuid.so.1
-        libz.so
         libssl.so.0.9.7
        )
 
diff --git a/install.xml b/install.xml
index c76217426c..d5581592ed 100644
--- a/install.xml
+++ b/install.xml
@@ -1447,9 +1447,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>1804b54034ef7f82832506a44acb06b8</string>
+            <string>26fe88213c213dc6153690ab142c25ca</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux-20090603.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3dfsg-linux-20091208.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
-- 
cgit v1.3