diff options
Diffstat (limited to 'linden/indra')
-rwxr-xr-x | linden/indra/newview/linux_tools/getvoice.sh | 34 | ||||
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/linden/indra/newview/linux_tools/getvoice.sh b/linden/indra/newview/linux_tools/getvoice.sh deleted file mode 100755 index 13b632f..0000000 --- a/linden/indra/newview/linux_tools/getvoice.sh +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | SCRIPTSRC=`readlink -f "$0" || echo "$0"` | ||
4 | RUN_PATH=`dirname "${SCRIPTSRC}" || echo .` | ||
5 | |||
6 | #if mozilla-runtime-linux-x86_64 is present we are using 64bit Imprudence on 64bit Linux | ||
7 | if [ -d "${RUN_PATH}/app_settings/mozilla-runtime-linux-x86_64/" ]; then | ||
8 | LIB_INSTALLDIR="lib32/" # It's 32bit voice on 64bit Linux and 64bit viewer. Not using lib/ for avoiding ambiguity. | ||
9 | else | ||
10 | LIB_INSTALLDIR="lib/" # It's 32bit voice on 32 or 64bit Linux and 32bit viewer. | ||
11 | fi | ||
12 | |||
13 | mkdir -p $LIB_INSTALLDIR | ||
14 | wget http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2 | ||
15 | tar -C ./bin --strip-components 4 -xjf vivox-*.tar.bz2 --wildcards '*SLVoice' | ||
16 | tar -C ./$LIB_INSTALLDIR --strip-components 4 -xjf vivox-*.tar.bz2 --wildcards '*.so*' | ||
17 | rm vivox-*.tar.bz2 | ||
18 | |||
19 | #now we have Vivox' OpenAL, but we want Imprudence (32bit for voice) OpenAL which is way better: | ||
20 | wget http://imprudenceviewer.org/download/libs/openal-linux32-20100426.tar.bz2 | ||
21 | tar -C ./$LIB_INSTALLDIR --strip-components 3 -xjf openal-*.tar.bz2 --wildcards '*openal.so*' | ||
22 | rm openal-*.tar.bz2 | ||
23 | |||
24 | # For 64bit viewer on 64bit Linux we also need a 32bit libidn.so.11 and libuuid.so.1 | ||
25 | if [ -d ${RUN_PATH}/lib32/ ]; then | ||
26 | wget http://imprudenceviewer.org/download/libs/libidn20100312.tar.bz2 | ||
27 | tar -C $LIB_INSTALLDIR --strip-components 1 -xjf libidn*.tar.bz2 --wildcards '*.so*' | ||
28 | rm libidn*.tar.bz2 | ||
29 | |||
30 | wget http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2 | ||
31 | tar -C ./$LIB_INSTALLDIR --strip-components 3 -xjf libuuid-*.tar.bz2 --wildcards '*.so*' | ||
32 | rm libuuid-*.tar.bz2 | ||
33 | fi | ||
34 | |||
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index ff59aec..bccfa8f 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -845,7 +845,6 @@ class LinuxManifest(ViewerManifest): | |||
845 | self.path("wrapper.sh","imprudence") | 845 | self.path("wrapper.sh","imprudence") |
846 | self.path("handle_secondlifeprotocol.sh") | 846 | self.path("handle_secondlifeprotocol.sh") |
847 | self.path("register_secondlifeprotocol.sh") | 847 | self.path("register_secondlifeprotocol.sh") |
848 | self.path("getvoice.sh") | ||
849 | self.end_prefix("linux_tools") | 848 | self.end_prefix("linux_tools") |
850 | 849 | ||
851 | self.gather_documents() | 850 | self.gather_documents() |