From af39853e7caf6467bad2bbad3e1e7ede1ae87f8a Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Thu, 1 Oct 2009 00:23:26 +0000
Subject: [PATCH] DEV-40702 update viewer2 vivox sdk to v3
---
indra/newview/viewer_manifest.py | 14 ++++++++++----
install.xml | 12 ++++++------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e85fddbc991..aa6a1442474 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -248,10 +248,12 @@ def construct(self):
# Vivox runtimes
if self.prefix(src="vivox-runtime/i686-win32", dst=""):
self.path("SLVoice.exe")
- self.path("alut.dll")
+ self.path("libsndfile-1.dll")
+ self.path("zlib1.dll")
self.path("vivoxsdk.dll")
+ self.path("vivoxplatform.dll")
self.path("ortp.dll")
- self.path("wrap_oal.dll")
+ self.path("vivoxoal.dll")
self.end_prefix()
# pull in the crash logger and updater from other projects
@@ -461,10 +463,11 @@ def construct(self):
self.path("zh-Hans.lproj")
# SLVoice and vivox lols
- self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
- self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
+ self.path("vivox-runtime/universal-darwin/libsndfile.dylib", "libsndfile.dylib")
+ self.path("vivox-runtime/universal-darwin/libvivoxoal.dylib", "libvivoxoal.dylib")
self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
+ self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib")
self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
# need to get the kdu dll from any of the build directories as well
@@ -715,7 +718,10 @@ def construct(self):
self.end_prefix()
if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
self.path("libortp.so")
+ self.path("libsndfile.so.1")
+ self.path("libvivoxoal.so.1")
self.path("libvivoxsdk.so")
+ self.path("libvivoxplatform.so")
self.end_prefix("lib")
class Linux_x86_64Manifest(LinuxManifest):
diff --git a/install.xml b/install.xml
index 6366b3104b8..e5a59ff3b10 100644
--- a/install.xml
+++ b/install.xml
@@ -1301,23 +1301,23 @@ anguage Infrstructure (CLI) international standard</string>
<key>darwin</key>
<map>
<key>md5sum</key>
- <string>8675b5eedef038b514338b17f0e55961</string>
+ <string>3eb4b31e92e16567e2fa967df9f9b845</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-darwin-20090309.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.0.0006.7278-darwin-20090930a.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
- <string>01573510dce7f380f44e561ef2f3dd9f</string>
+ <string>61ab6acd1f4736c5260c492bb60c26af</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.0.0006.7278-linux-20090930a.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
- <string>752daa90e07c05202d1f76980cb955eb</string>
+ <string>ad5737dbfab87a13b23451b68248b22a</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.0.0006.7278-windows-20090930a.tar.bz2</uri>
</map>
</map>
</map>
--
GitLab