From 34b5c5e89066171a3b98c58edc1185559ebcc75e Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 16 Apr 2022 23:01:00 +0200 Subject: Switch to USE_OPENAL --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3b9eaa0ff0..c1277bf2d3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3129,7 +3129,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE - -DOPENAL:BOOL=ON + -DUSE_OPENAL:BOOL=ON name @@ -3200,7 +3200,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE - -DOPENAL:BOOL=ON + -DUSE_OPENAL:BOOL=ON name -- cgit v1.2.3 From 54f8d5c380aae8beccf8e445a4911f102d9f49a2 Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 18 Apr 2022 03:02:50 +0200 Subject: Bring in first steps of Linux64: - Add the configuratons Release and ReleaseOS - The js files are platform independent, just copy the ones from windows64. --- autobuild.xml | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index c1277bf2d3..47da9730bb 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -331,6 +331,16 @@ name windows64 + linux64 + + archive + + hash + ac54672e0b38f52726f5c99047c913e4 + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89306/815431/cubemaptoequirectangular-1.1.0-windows64-564841.tar.bz2 + + version 1.1.0 @@ -1143,6 +1153,16 @@ name windows64 + linux64 + + archive + + hash + e70898903475d8ac2e81ff33278fc987 + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89309/815433/jpegencoderbasic-1.0-windows64-564842.tar.bz2 + + version 1.0 @@ -2498,6 +2518,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors name windows64 + linux64 + + archive + + hash + 46edf0f55417f8ef0d33a5c007bc3644 + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89310/815451/threejs-0.132.2-windows64-564843.tar.bz2 + + version 0.132.2 @@ -2937,6 +2967,68 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors name common + linux64 + + build_directory + build-linux-x86_64 + configurations + + Release + + build + + command + ninja + + configure + + arguments + + ../indra + + options + + -G + Ninja + -DLL_TESTS=Off + + + default + True + name + Release + + ReleaseOS + + build + + command + ninja + + configure + + options + + -G + Ninja + -DLL_TESTS=Off + + + name + ReleaseOS + + default + + build + + + name + default + + + name + linux64 + darwin64 build_directory -- cgit v1.2.3 From 35de5fc912c908fb1c3c5257f28e72ffebe796c4 Mon Sep 17 00:00:00 2001 From: Callum Linden Date: Thu, 25 Aug 2022 10:04:02 -0700 Subject: SL-18021 Generate a VS 2019 build of the Viewer using current third party libraries: replace hard coded VS 2017 '150' maginc number with another magic number - for VS 2019 --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e0f82a45eb..68bfa4b0a1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3114,7 +3114,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors windows build_directory - build-vc${AUTOBUILD_VSVER|150}-$AUTOBUILD_ADDRSIZE + build-vc${AUTOBUILD_VSVER|160}-$AUTOBUILD_ADDRSIZE configurations RelWithDebInfo -- cgit v1.2.3 From ef58b9751a514e5e63cd77f9f78e6513bc6403cd Mon Sep 17 00:00:00 2001 From: Callum Linden Date: Tue, 30 Aug 2022 15:20:04 -0700 Subject: DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming --- autobuild.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 68bfa4b0a1..273d52d47d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -236,9 +236,9 @@ archive hash - 4699b8389dfb754da0393ddb5d325722 + a880dfc15fcb330baf548a85324cd88a url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95882/856117/colladadom-2.3.569219-darwin64-569219.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104133/913090/colladadom-2.3.574693-darwin64-574693.tar.bz2 name darwin64 @@ -260,9 +260,9 @@ archive hash - 343e46ea49a08ad6596d3dc702d5b812 + 7e84441d9c7cf019a7bdc7b818b16c27 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95883/856128/colladadom-2.3.569219-windows-569219.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104112/912957/colladadom-2.3.574693-windows-574693.tar.bz2 name windows @@ -272,16 +272,16 @@ archive hash - de5bdfb61b31db56c5fe7d0962ad11e2 + 2eaffbb8a93b03a732d3c47055a8efcb url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95884/856129/colladadom-2.3.569219-windows64-569219.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104135/913103/colladadom-2.3.574693-windows64-574693.tar.bz2 name windows64 version - 2.3.569219 + 2.3.574693 cubemaptoequirectangular @@ -3114,7 +3114,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors windows build_directory - build-vc${AUTOBUILD_VSVER|160}-$AUTOBUILD_ADDRSIZE + build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE configurations RelWithDebInfo -- cgit v1.2.3 From c333a7935d33b30fb663739c567cec5ae661ffe8 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sat, 17 Sep 2022 02:38:52 +0300 Subject: SL-17238 Fixed llphysicsextensions connection to llrender --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 59bac89136..985bb55902 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1659,9 +1659,9 @@ archive hash - da57838d80cf332f4a3026713a13f086 + e51c6f5dfd76eb148348a44ff57e66c2 url - https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/90708/824484/llphysicsextensions_source-1.0.565754-darwin64-565754.tar.bz2 + https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/104810/918016/llphysicsextensions_source-1.0.575107-darwin64-575107.tar.bz2 name darwin64 @@ -1683,9 +1683,9 @@ archive hash - 28ad884012aa0bb70cf4101853af2f9a + dbbe4cc568ac149d862e421cdda4dd48 url - https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/90733/824570/llphysicsextensions_source-1.0.565768-windows-565768.tar.bz2 + https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/104809/918011/llphysicsextensions_source-1.0.575107-windows-575107.tar.bz2 name windows -- cgit v1.2.3 From c844bf0ab8acbbb2d4ef0814d8ed7ac9291b7f44 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 17 Dec 2021 01:39:40 +0200 Subject: SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5a5ffa2898..801da4e773 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2195,9 +2195,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 5abf2d9c0b250821c59cc60cd94fd8af + 89e6436b256c98818fa736a460a04016 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54840/510064/openjpeg-1.5.1.538970-darwin64-538970.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105184/920580/openjpeg-2.5.0.575325-darwin64-575325.tar.bz2 name darwin64 @@ -2219,9 +2219,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 222a406ecb4071a9cc9635353afa337e + 97b15b312c2dec38981ec63bd77d0491 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54977/511775/openjpeg-1.5.1.538970-windows-538970.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105185/920592/openjpeg-2.5.0.575325-windows-575325.tar.bz2 name windows @@ -2231,16 +2231,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 5b5c80807fa8161f3480be3d89fe9516 + cdb55c8b074ce4f166ebc597f13f62a1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54974/511767/openjpeg-1.5.1.538970-windows64-538970.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105186/920591/openjpeg-2.5.0.575325-windows64-575325.tar.bz2 name windows64 version - 1.5.1.538970 + 2.5.0.575325 openssl -- cgit v1.2.3 From 5404708de0cce19cb4b35fae10d78c447932e4ba Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 3 Oct 2022 21:09:47 +0300 Subject: SL-16542 Fix mac build not having some of openjpeg headers --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 801da4e773..bdc5e085ef 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2195,9 +2195,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 89e6436b256c98818fa736a460a04016 + 6bb03fe0b9dd44d3850ae9cae2161d76 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105184/920580/openjpeg-2.5.0.575325-darwin64-575325.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105416/922669/openjpeg-2.5.0.575468-darwin64-575468.tar.bz2 name darwin64 @@ -2219,9 +2219,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 97b15b312c2dec38981ec63bd77d0491 + a01d66d72d7c865364cd5761e56e8735 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105185/920592/openjpeg-2.5.0.575325-windows-575325.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105418/922681/openjpeg-2.5.0.575468-windows-575468.tar.bz2 name windows @@ -2231,16 +2231,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - cdb55c8b074ce4f166ebc597f13f62a1 + 8bd727bc7d6e0e6223e9ea49c14dd511 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105186/920591/openjpeg-2.5.0.575325-windows64-575325.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105419/922682/openjpeg-2.5.0.575468-windows64-575468.tar.bz2 name windows64 version - 2.5.0.575325 + 2.5.0.575468 openssl -- cgit v1.2.3 From 7018deb7f8bc22bdbab7be29896c92ec648a3f2f Mon Sep 17 00:00:00 2001 From: Callum Linden Date: Mon, 3 Oct 2022 11:31:44 -0700 Subject: SL-18289: Modify autobuild.xml to insert a CMaker architecture flag as well as the generator string for Windows builds --- autobuild.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 985bb55902..96f6918a99 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3235,6 +3235,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + -A + ${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} default @@ -3273,6 +3275,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + -A + ${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -DUSE_OPENAL:BOOL=ON @@ -3307,6 +3311,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + -A + ${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} name @@ -3343,6 +3349,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + -A + ${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -- cgit v1.2.3 From ad48f88d1f259248cf645e50437dd64c2cf58fb3 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 4 Oct 2022 19:51:16 +0300 Subject: SL-16542 Fixed openjpeg library's name --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index bdc5e085ef..1a353fe2e9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2195,9 +2195,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 6bb03fe0b9dd44d3850ae9cae2161d76 + 8114c6a7e499ea20d325db0de08ce30a url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105416/922669/openjpeg-2.5.0.575468-darwin64-575468.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105469/923024/openjpeg-2.5.0.575496-darwin64-575496.tar.bz2 name darwin64 @@ -2219,9 +2219,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - a01d66d72d7c865364cd5761e56e8735 + edc9388870d951632a6d595792293e05 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105418/922681/openjpeg-2.5.0.575468-windows-575468.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105472/923036/openjpeg-2.5.0.575496-windows-575496.tar.bz2 name windows @@ -2231,16 +2231,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 8bd727bc7d6e0e6223e9ea49c14dd511 + b95f0732f2388ebb0ddf33d4a30e0ff1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105419/922682/openjpeg-2.5.0.575468-windows64-575468.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105471/923037/openjpeg-2.5.0.575496-windows64-575496.tar.bz2 name windows64 version - 2.5.0.575468 + 2.5.0.575496 openssl -- cgit v1.2.3 From 73ca604ad5aa5dc93198ab8778b135b7f01d5c7b Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 14 Nov 2022 22:39:03 +0200 Subject: SL-18618 Update libpng --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 1a353fe2e9..f363b76706 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1418,9 +1418,9 @@ archive hash - c1c9e32e21f3c34d91ed045b2ca91f24 + 7a0059748d0b8733f2f9ce434cf604b8 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87781/805801/libpng-1.6.8.563850-darwin64-563850.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107514/937867/libpng-1.6.38.576621-darwin64-576621.tar.bz2 name darwin64 @@ -1442,9 +1442,9 @@ archive hash - 642e9cf95c8ccd0eb34f6d7a40df585a + 3112013186ad60b0fc270a398d4dd499 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87782/805831/libpng-1.6.8.563850-windows-563850.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107513/937823/libpng-1.6.38.576621-windows-576621.tar.bz2 name windows @@ -1454,16 +1454,16 @@ archive hash - ce46aa0f171d97626c4a3940347cecd7 + 7c6bfcdb0d6162587cdbc436f595dd02 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87780/805832/libpng-1.6.8.563850-windows64-563850.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107512/937822/libpng-1.6.38.576621-windows64-576621.tar.bz2 name windows64 version - 1.6.8.563850 + 1.6.38.576621 libuuid -- cgit v1.2.3 From a8ded3bcc4703803f738df14a665016aa20d03a2 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 18 Nov 2022 14:43:54 +0200 Subject: SL-17135 Pull in apr-suit package Same apr suit version, but with debug symbols --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f363b76706..ae63d08f93 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -52,9 +52,9 @@ archive hash - b6357ef3a0ec37877a5831820f25094e + 178b16ee9ff67986c8c14413ee68218e url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80557/759704/apr_suite-1.4.5.558565-darwin64-558565.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107593/938535/apr_suite-1.4.5.576669-darwin64-576669.tar.bz2 name darwin64 @@ -76,9 +76,9 @@ archive hash - cb48ac069440f6dcd564cfa9fd02a4c2 + d2997cad03dbd0d70a060276b5671480 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80556/759710/apr_suite-1.4.5.558565-windows-558565.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107594/938548/apr_suite-1.4.5.576669-windows-576669.tar.bz2 name windows @@ -88,16 +88,16 @@ archive hash - 646dc3828d9c39fb1e77c4eec44ed739 + ec24f5945faa8f13807b83eeaeb994f8 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80555/759709/apr_suite-1.4.5.558565-windows64-558565.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107592/938547/apr_suite-1.4.5.576669-windows64-576669.tar.bz2 name windows64 version - 1.4.5.558565 + 1.4.5.576669 boost -- cgit v1.2.3 From efb96d8c6e47e2ccc2dd608984205c083577dd2f Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 14 Dec 2022 15:36:24 +0200 Subject: SL-18786 Display updater on the top of other windows --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 25d95a6849..f94aedc090 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2671,9 +2671,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 1dda5fb3bb649b0ab5a93f22df7cb11e + 9e1b5515ab59b4e9cfeef6626d65d03d url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/96998/862110/viewer_manager-3.0.569958-darwin64-569958.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/108609/945996/viewer_manager-3.0.577252-darwin64-577252.tar.bz2 name darwin64 @@ -2683,9 +2683,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 30d1386d0a6883d898fc56757a789b8b + a3c599595ecc8fb987a5499fca42520a url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/97002/862130/viewer_manager-3.0.569958-windows-569958.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/108610/946003/viewer_manager-3.0.577252-windows-577252.tar.bz2 name windows @@ -2696,7 +2696,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 3.0.569958 + 3.0.577252 vlc-bin -- cgit v1.2.3