diff options
| author | Armin Weatherwax | 2009-06-08 11:02:53 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-13 22:28:46 -0700 |
| commit | bd66456a76c62379ecf09e6fc3ad8a2d4c2dba3d (patch) | |
| tree | 21b4b3424e35e9d026f2964f75179de5c2bc0210 /linden | |
| parent | Applied Aimee's patch for VWR-12631: setting to adjust the maximum size of ob... (diff) | |
| download | meta-impy-bd66456a76c62379ecf09e6fc3ad8a2d4c2dba3d.zip meta-impy-bd66456a76c62379ecf09e6fc3ad8a2d4c2dba3d.tar.gz meta-impy-bd66456a76c62379ecf09e6fc3ad8a2d4c2dba3d.tar.bz2 meta-impy-bd66456a76c62379ecf09e6fc3ad8a2d4c2dba3d.tar.xz | |
use openjpeg 1.3 also for Linux
modified: linden/indra/newview/viewer_manifest.py
modified: linden/install.xml
Diffstat (limited to 'linden')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 2 | ||||
| -rw-r--r-- | 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): | |||
| 794 | self.path("libuuid.so", "libuuid.so.1") | 794 | self.path("libuuid.so", "libuuid.so.1") |
| 795 | self.path("libSDL-1.2.so.0") | 795 | self.path("libSDL-1.2.so.0") |
| 796 | self.path("libELFIO.so") | 796 | self.path("libELFIO.so") |
| 797 | self.path("libopenjpeg.so.2") | 797 | self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") |
| 798 | 798 | ||
| 799 | self.path("libopenal.so") # symlink | 799 | self.path("libopenal.so") # symlink |
| 800 | self.path("libopenal.so.1") | 800 | 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> | |||
| 1207 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080812.tar.bz2</uri> | 1207 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080812.tar.bz2</uri> |
| 1208 | </map> | 1208 | </map> |
| 1209 | <key>linux</key> | 1209 | <key>linux</key> |
| 1210 | <map> | 1210 | <map> |
| 1211 | <key>md5sum</key> | 1211 | <key>md5sum</key> |
| 1212 | <string>c333219c88462b8b22c815cd2b700218</string> | 1212 | <string>02af0dad64803e0d821bc09e6038682c</string> |
| 1213 | <key>url</key> | 1213 | <key>url</key> |
| 1214 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-linux-20080812.tar.bz2</uri> | 1214 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2</uri> |
| 1215 | </map> | ||
| 1216 | <key>linux32</key> | ||
| 1217 | <map> | ||
| 1218 | <key>md5sum</key> | ||
| 1219 | <string>dc1f50c6570cef2d45d40ccc7ac76013</string> | ||
| 1220 | <key>url</key> | ||
| 1221 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2.0-linux-i686-gcc-4.1-20080919.tar.bz2</uri> | ||
| 1222 | </map> | ||
| 1223 | <key>linux64</key> | ||
| 1224 | <map> | ||
| 1225 | <key>md5sum</key> | ||
| 1226 | <string>44f1bc9d47e4a54fc274c213f2cb565f</string> | ||
| 1227 | <key>url</key> | ||
| 1228 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2.0-linux64-20080909.tar.bz2</uri> | ||
| 1229 | </map> | 1215 | </map> |
| 1230 | <key>windows</key> | 1216 | <key>windows</key> |
| 1231 | <map> | 1217 | <map> |