aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py9
-rwxr-xr-xlinden/install.xml22
2 files changed, 20 insertions, 11 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 7b0d6ca..e449a7e 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1002,8 +1002,8 @@ class Linux_i686Manifest(LinuxManifest):
1002 self.path("libz.so.1") 1002 self.path("libz.so.1")
1003 1003
1004 # OpenAL 1004 # OpenAL
1005 self.path("libopenal.so.1") 1005 self.path("libopenal.so.1.12.854", "libopenal.so.1")
1006 self.path("libalut.so.0") 1006 self.path("libalut.so.0.1.0", "libalut.so.0")
1007 1007
1008 # GTK+ and dependencies 1008 # GTK+ and dependencies
1009 ## Lets just use the system libraries for all of these: 1009 ## Lets just use the system libraries for all of these:
@@ -1135,9 +1135,8 @@ class Linux_x86_64Manifest(LinuxManifest):
1135 #self.path("libz.so.1") #not needed 1135 #self.path("libz.so.1") #not needed
1136 1136
1137 # OpenAL 1137 # OpenAL
1138 self.path("libopenal.so.1") 1138 self.path("libopenal.so.1.12.854", "libopenal.so.1")
1139 self.path("libalut.so.0") 1139 self.path("libalut.so.0.1.0", "libalut.so.0")
1140
1141 # GTK+ and dependencies 1140 # GTK+ and dependencies
1142 ## Lets just use the system libraries for all of these: 1141 ## Lets just use the system libraries for all of these:
1143 ##self.path("libatk-1.0.so.0") 1142 ##self.path("libatk-1.0.so.0")
diff --git a/linden/install.xml b/linden/install.xml
index fdb39c9..10f7a8c 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1220,6 +1220,7 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1220 <key>url</key> 1220 <key>url</key>
1221 <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20091118.tar.bz2</uri> 1221 <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20091118.tar.bz2</uri>
1222 </map> 1222 </map>
1223<!-- openal compiled against pulse 0.9.10
1223 <key>linux</key> 1224 <key>linux</key>
1224 <map> 1225 <map>
1225 <key>md5sum</key> 1226 <key>md5sum</key>
@@ -1227,12 +1228,21 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1227 <key>url</key> 1228 <key>url</key>
1228 <uri>http://imprudenceviewer.org/download/libs/openal-linux32-20100426.tar.bz2</uri> 1229 <uri>http://imprudenceviewer.org/download/libs/openal-linux32-20100426.tar.bz2</uri>
1229 </map> 1230 </map>
1231-->
1232 <!-- openal compiled against pulse 0.9.21 -->
1233 <key>linux</key>
1234 <map>
1235 <key>md5sum</key>
1236 <string>44f9bacc69a3d29ae0b46ed69ad7c2ce</string>
1237 <key>url</key>
1238 <uri>http://download.kokuaviewer.org/files/libs/openal-linux32-20110304.tar.bz2</uri>
1239 </map>
1230 <key>linux64</key> 1240 <key>linux64</key>
1231 <map> 1241 <map>
1232 <key>md5sum</key> 1242 <key>md5sum</key>
1233 <string>ea42b868511e2d5fab2df11dceaf2b7e</string> 1243 <string>ea42b868511e2d5fab2df11dceaf2b7e</string>032848c2591a15e26c71998df3644cfc
1234 <key>url</key> 1244 <key>url</key>
1235 <uri>http://imprudenceviewer.org/download/libs/openal-linux64-20100428.tar.bz2</uri> 1245 <uri>http://download.kokuaviewer.org/files/libs/openal-linux64-pulse0.9.21-20110304.tar.bz2</uri>
1236 </map> 1246 </map>
1237 <key>windows</key> 1247 <key>windows</key>
1238 <map> 1248 <map>
@@ -1336,19 +1346,19 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1336 <string>lgpl</string> 1346 <string>lgpl</string>
1337 <key>packages</key> 1347 <key>packages</key>
1338 <map> 1348 <map>
1339 <key>linux</key> 1349<!-- <key>linux</key>
1340 <map> 1350 <map>
1341 <key>md5sum</key> 1351 <key>md5sum</key>
1342 <string>30cb00069fe2a545fbf7be1070386236</string> 1352 <string>30cb00069fe2a545fbf7be1070386236</string>
1343 <key>url</key> 1353 <key>url</key>
1344 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri> 1354 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri>
1345 </map> 1355 </map>
1346 <key>linux64</key> 1356 <key>linux64</key>--><key>common</key>
1347 <map> 1357 <map>
1348 <key>md5sum</key> 1358 <key>md5sum</key>
1349 <string>30cb00069fe2a545fbf7be1070386236</string> 1359 <string>c5c3b840bb77ee41fa06970663c15302</string>
1350 <key>url</key> 1360 <key>url</key>
1351 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri> 1361 <uri>http://download.kokuaviewer.org/files/libs/pulseaudio-headers-0.9.21-63-gd3efa-dirty.tar.bz2</uri>
1352 </map> 1362 </map>
1353 </map> 1363 </map>
1354 </map> 1364 </map>