From fc013f0c7495b87d6627c9d482a7556d96e65077 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 3 Sep 2010 15:23:46 +0200
Subject: linux64: fetch 32 bit libraries required for voice

---
 linden/indra/cmake/ViewerMiscLibs.cmake |  3 +++
 linden/indra/newview/viewer_manifest.py | 20 ++++++++++----------
 linden/install.xml                      | 23 +++++++++++++++++++++++
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7bd306b..4a62ebd 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,6 +4,9 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
+   if(LINUX64)
+     use_prebuilt_binary(32bitcompatibilitylibs)
+   endif(LINUX64)
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
 
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index f61f3c3..b16226a 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1020,7 +1020,6 @@ class Linux_i686Manifest(LinuxManifest):
                 self.path("libvivoxsdk.so")
                 self.end_prefix("lib")
 
-
 class Linux_x86_64Manifest(LinuxManifest):
     def construct(self):
         super(Linux_x86_64Manifest, self).construct()
@@ -1137,14 +1136,6 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.end_prefix("gstreamer-plugins")
             self.end_prefix("lib64")
         
-#	if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
-#            self.path("libalut.so")
-#	    self.path("libidn.so.11")
-#	    self.path("libopenal.so.1")
-#	    self.path("libortp.so")
-#	    self.path("libuuid.so.1")
-#        self.end_prefix("lib32")
-
 
             # Vivox runtimes and libs
             if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
@@ -1152,10 +1143,19 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.end_prefix("bin")
 
             if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"):
-                self.path("libalut.so")
+                #self.path("libalut.so")
                 self.path("libortp.so")
                 self.path("libvivoxsdk.so")
                 self.end_prefix("lib32")
+		
+	    # 32bit libs needed for voice
+	    if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
+                self.path("libalut.so")
+	        self.path("libidn.so.11")
+	        self.path("libopenal.so.1")
+	        # self.path("libortp.so")
+	        self.path("libuuid.so.1")
+            self.end_prefix("lib32")
 
 if __name__ == "__main__":
     main()
diff --git a/linden/install.xml b/linden/install.xml
index 74f9582..e5f42b6 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1514,6 +1514,29 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           </map>
         </map>
       </map>
+      <key>32bitcompatibilitylibs</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyrights: 	Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 
+				Simon Josefsson. License GPL v3.0.
+				Freealut, libuuid, openal-soft: see copyright and license of the 
+				according main packages.
+	</string>
+        <key>description</key>
+        <string>32bit libraries needed for using voice</string>
+        <key>license</key>
+        <string>gpl</string>
+        <key>packages</key>
+        <map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>cbaafc55fb8b14283541791e82f13462</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>xmlrpc-epi</key>
       <map>
         <key>copyright</key>
-- 
cgit v1.1