From bd66456a76c62379ecf09e6fc3ad8a2d4c2dba3d Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 8 Jun 2009 11:02:53 +0200
Subject: use openjpeg 1.3 also for Linux
modified: linden/indra/newview/viewer_manifest.py
modified: linden/install.xml
---
linden/indra/newview/viewer_manifest.py | 2 +-
linden/install.xml | 24 +++++-------------------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 0abdc60..5da0256 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -794,7 +794,7 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libuuid.so", "libuuid.so.1")
self.path("libSDL-1.2.so.0")
self.path("libELFIO.so")
- self.path("libopenjpeg.so.2")
+ self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
self.path("libopenal.so") # symlink
self.path("libopenal.so.1")
diff --git a/linden/install.xml b/linden/install.xml
index e11b930..224cd65 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1207,25 +1207,11 @@ anguage Infrstructure (CLI) international standard</string>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080812.tar.bz2</uri>
</map>
<key>linux</key>
- <map>
- <key>md5sum</key>
- <string>c333219c88462b8b22c815cd2b700218</string>
- <key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-linux-20080812.tar.bz2</uri>
- </map>
- <key>linux32</key>
- <map>
- <key>md5sum</key>
- <string>dc1f50c6570cef2d45d40ccc7ac76013</string>
- <key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2.0-linux-i686-gcc-4.1-20080919.tar.bz2</uri>
- </map>
- <key>linux64</key>
- <map>
- <key>md5sum</key>
- <string>44f1bc9d47e4a54fc274c213f2cb565f</string>
- <key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2.0-linux64-20080909.tar.bz2</uri>
+ <map>
+ <key>md5sum</key>
+ <string>02af0dad64803e0d821bc09e6038682c</string>
+ <key>url</key>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2</uri>
</map>
<key>windows</key>
<map>
--
cgit v1.1