From 72d1febadb5f254eb7199bd26eb04a7553a6e55d Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Mon, 14 Mar 2011 21:18:24 +0000
Subject: [PATCH] update openjpeg archive for linux.
---
autobuild.xml | 4 ++--
indra/newview/viewer_manifest.py | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 5be2a6fa705..cdc724f5716 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1368,9 +1368,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>c34975e8090d861c6e37ea606fd66940</string>
+ <string>fb2382014c79e0049746e4e29bd834f9</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openjpeg/rev/223705/arch/Linux/installer/openjpeg-1.4-linux-20110314.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0574d8c0054..229055fdb73 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -943,7 +943,9 @@ def construct(self):
self.path("libdirectfb-1.4.so.5.0.4")
self.path("libfusion-1.4.so.5.0.4")
self.path("libdirect-1.4.so.5.0.4")
- self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
+ self.path("libopenjpeg.so.1.4.0")
+ self.path("libopenjpeg.so.1")
+ self.path("libopenjpeg.so")
self.path("libalut.so")
self.path("libopenal.so", "libopenal.so.1")
self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
--
GitLab