From 77b35822e6a5e5f6a690e87b9fb53a565ba975b9 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 17 Aug 2010 10:53:04 +0200
Subject: changes to the linux parts of viewer_manifest.py

* comment out SLVoice as long as we don't package it
* comment out libz for 64bit (not needed)
---
 linden/indra/newview/viewer_manifest.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index b3dbbcd..ca47995 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -988,10 +988,10 @@ class Linux_i686Manifest(LinuxManifest):
             self.end_prefix("lib")
 
             # Vivox runtimes
-            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
-                    self.path("SLVoice")
-                    self.end_prefix()
-            
+#            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
+#                    self.path("SLVoice")
+#                    self.end_prefix()
+
 
 class Linux_x86_64Manifest(LinuxManifest):
     def construct(self):
@@ -1024,7 +1024,7 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libpng12.so.0")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")
-            self.path("libz.so.1")
+            #self.path("libz.so.1") #not needed
 
             # OpenAL
             self.path("libopenal.so.1")
@@ -1116,10 +1116,10 @@ class Linux_x86_64Manifest(LinuxManifest):
 #        self.end_prefix("lib32")
 
             # Vivox runtimes
-            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
-                    self.path("SLVoice")
-                    self.end_prefix()
-            
+#            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
+#                    self.path("SLVoice")
+#                    self.end_prefix()
+#
 
 if __name__ == "__main__":
     main()
-- 
cgit v1.1