From c5e6a960fbee5c134b86bdaf48473ed66c0969c1 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 29 Nov 2016 16:43:57 -0500
Subject: [PATCH] DRTVWR-418: Update to openjpeg build 501102
---
autobuild.xml | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 64545668ee2..2a79aa1f0b0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2586,9 +2586,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d933c5cbc53efae1224060dc7badc801</string>
+ <string>f7013e1f0b6a877090622fd73ec72cbc</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/542/1165/openjpeg-2.0.0.500534-darwin64-500534.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1114/2576/openjpeg-1.5.1.501102-darwin64-501102.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -2610,9 +2610,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9aec0b4f73b784f2ebc1c6526e3dc2cc</string>
+ <string>ac66f3197010b1549a5e4467aebbc27d</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/541/1160/openjpeg-2.0.0.500534-linux64-500534.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1113/2571/openjpeg-1.5.1.501102-linux64-501102.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -2622,9 +2622,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a4dc6ba5dea2fc236b84806c8621c5e8</string>
+ <string>8a7f0be5647e07235d205ac00805fb78</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/543/1168/openjpeg-2.0.0.500534-windows-500534.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1116/2586/openjpeg-1.5.1.501102-windows-501102.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2634,16 +2634,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>92e861866ec3e024e7297c6505d582d7</string>
+ <string>398544058036bc27097fcff208934d11</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/544/1171/openjpeg-2.0.0.500534-windows64-500534.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1115/2581/openjpeg-1.5.1.501102-windows64-501102.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>2.0.0.500534</string>
+ <string>1.5.1.501102</string>
</map>
<key>openssl</key>
<map>
@@ -3288,7 +3288,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
</array>
@@ -3309,7 +3309,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
@@ -3329,7 +3329,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
</array>
@@ -3350,7 +3350,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
@@ -3615,7 +3615,7 @@
<key>windows</key>
<map>
<key>build_directory</key>
- <string>build-vc120-$AUTOBUILD_ADDRSIZE</string>
+ <string>build-vc120-64</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
@@ -3631,7 +3631,7 @@
<key>options</key>
<array>
<string>/build</string>
- <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>RelWithDebInfo|NOTWIN</string>
</array>
</map>
<key>configure</key>
@@ -3643,7 +3643,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>NOTWIN</string>
</array>
</map>
<key>default</key>
@@ -3664,7 +3664,7 @@
<key>options</key>
<array>
<string>/p:Configuration=RelWithDebInfo</string>
- <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/p:Platform=NOTWIN</string>
<string>/t:Build</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
@@ -3681,7 +3681,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>NOTWIN</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
@@ -3703,7 +3703,7 @@
<key>options</key>
<array>
<string>/build</string>
- <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>Release|NOTWIN</string>
</array>
</map>
<key>configure</key>
@@ -3715,7 +3715,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>NOTWIN</string>
</array>
</map>
<key>name</key>
@@ -3734,7 +3734,7 @@
<key>options</key>
<array>
<string>/p:Configuration=Release</string>
- <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/p:Platform=NOTWIN</string>
<string>/t:Build</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
@@ -3751,7 +3751,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>NOTWIN</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
--
GitLab