aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorArmin Weatherwax2011-07-08 16:43:43 +0200
committerArmin Weatherwax2011-11-13 14:28:27 +0100
commiteceee44dd3c990c536574aafa0a0084e9c8c7c57 (patch)
treec4c3b9593ea8306355e8fd61e5d9e714a0b35b04 /linden/indra/newview
parentimprove the voiceclient shutdown a bit (diff)
downloadmeta-impy-eceee44dd3c990c536574aafa0a0084e9c8c7c57.zip
meta-impy-eceee44dd3c990c536574aafa0a0084e9c8c7c57.tar.gz
meta-impy-eceee44dd3c990c536574aafa0a0084e9c8c7c57.tar.bz2
meta-impy-eceee44dd3c990c536574aafa0a0084e9c8c7c57.tar.xz
Linux: update OpenAL to 1.13.0
for Linux64 the 32bit compatibility libs (32bit openal et al.) are now integrated into the openal package.
Diffstat (limited to 'linden/indra/newview')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py23
1 files changed, 17 insertions, 6 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index a0b9d77..190b48a 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -938,8 +938,12 @@ class Linux_i686Manifest(LinuxManifest):
938 self.path("libz.so.1") 938 self.path("libz.so.1")
939 939
940 # OpenAL 940 # OpenAL
941 self.path("libopenal.so.1.12.854", "libopenal.so.1") 941 self.path("libalut.so")
942 self.path("libalut.so.0.1.0", "libalut.so.0") 942 self.path("libalut.so.0")
943 self.path("libalut.so.0.0.0")
944 self.path("libopenal.so")
945 self.path("libopenal.so.1")
946 self.path("libopenal.so.1.13.0")
943 947
944 # GTK+ and dependencies 948 # GTK+ and dependencies
945 ## Lets just use the system libraries for all of these: 949 ## Lets just use the system libraries for all of these:
@@ -1028,7 +1032,6 @@ class Linux_i686Manifest(LinuxManifest):
1028 self.end_prefix("bin") 1032 self.end_prefix("bin")
1029 1033
1030 if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): 1034 if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
1031 self.path("libalut.so")
1032 self.path("libortp.so") 1035 self.path("libortp.so")
1033 self.path("libvivoxsdk.so") 1036 self.path("libvivoxsdk.so")
1034 self.end_prefix("lib") 1037 self.end_prefix("lib")
@@ -1071,8 +1074,13 @@ class Linux_x86_64Manifest(LinuxManifest):
1071 #self.path("libz.so.1") #not needed 1074 #self.path("libz.so.1") #not needed
1072 1075
1073 # OpenAL 1076 # OpenAL
1074 self.path("libopenal.so.1.12.854", "libopenal.so.1") 1077 self.path("libopenal.so")
1075 self.path("libalut.so.0.1.0", "libalut.so.0") 1078 self.path("libopenal.so.1")
1079 self.path("libopenal.so.1.13.0")
1080 self.path("libalut.so")
1081 self.path("libalut.so.0")
1082 self.path("libalut.so.0.0.0")
1083
1076 # GTK+ and dependencies 1084 # GTK+ and dependencies
1077 ## Lets just use the system libraries for all of these: 1085 ## Lets just use the system libraries for all of these:
1078 ##self.path("libatk-1.0.so.0") 1086 ##self.path("libatk-1.0.so.0")
@@ -1169,9 +1177,12 @@ class Linux_x86_64Manifest(LinuxManifest):
1169 # 32bit libs needed for voice 1177 # 32bit libs needed for voice
1170 if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): 1178 if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
1171 self.path("libalut.so") 1179 self.path("libalut.so")
1180 self.path("libalut.so.0")
1181 self.path("libalut.so.0.0.0")
1172 self.path("libidn.so.11") 1182 self.path("libidn.so.11")
1183 self.path("libopenal.so")
1173 self.path("libopenal.so.1") 1184 self.path("libopenal.so.1")
1174 # self.path("libortp.so") 1185 self.path("libopenal.so.1.13.0")
1175 self.path("libuuid.so.1") 1186 self.path("libuuid.so.1")
1176 self.end_prefix("lib32") 1187 self.end_prefix("lib32")
1177 1188