From de70b18dd12ab1499e073a333231bdbb612d3ec0 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Tue, 1 Mar 2022 22:44:44 +0100
Subject: [PATCH] Linux; Update slvoice, include 32 bit libs.

---
 autobuild.xml                      |  4 ++--
 indra/cmake/Copy3rdPartyLibs.cmake |  2 +-
 indra/newview/viewer_manifest.py   | 13 ++++---------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 9f3a56a688..dd8efe8058 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3282,9 +3282,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>05c4debd4cccfea620fc7e6f9a190924</string>
+              <string>a24f2457230e6c1353a5962973383b97</string>
               <key>url</key>
-              <string>http://3p.firestormviewer.org/slvoice-3.2.0002.10426.302004-linux64-212691952.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/slvoice-3.2-linux64_bionic-220602051.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 519f68b53e..00ca8ee473 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -223,7 +223,7 @@ elseif(LINUX)
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
 
-    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}/../../lib32/")
     set(vivox_libs
         libsndfile.so.1
         libortp.so
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index da2328c404..7f641ee53e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -2042,19 +2042,14 @@ class LinuxManifest(ViewerManifest):
 
             # Vivox runtimes
             # Currentelly, the 32-bit ones will work with a 64-bit client.
-        with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="bin"):
+        with self.prefix(src=os.path.join(pkgdir, 'bin32' ), dst="bin"):
             self.path("SLVoice")
+        with self.prefix(src=os.path.join(pkgdir ), dst="bin"):
             self.path("win32")
             self.path("win64")
 
-        with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"):
-            self.path("libortp.so")
-            self.path("libsndfile.so.1")
-            # <FS:TS> Vivox wants this library even if it's present already in the viewer
-            self.path("libvivoxoal.so.1")
-            self.path("libvivoxsdk.so")
-            self.path("libvivoxplatform.so")
-
+        with self.prefix(src=os.path.join(pkgdir, 'lib32' ), dst="lib32"):
+            self.path("*")
 
     def package_finish(self):
         # a standard map of strings for replacing in the templates