diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-06 16:40:00 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-06 16:40:00 +0300 |
commit | 2795fe9786c96b057dee4ce6f4fd1504117e6f78 (patch) | |
tree | b88e8b0ae7f62a51bd0df0894a61d1fb97f8235b /autobuild.xml | |
parent | fd15b4309b126fd5f83f2091c060a6043e18fdbf (diff) | |
parent | 75455d101c9535d0d45aa0f505f888f4ba3de64d (diff) |
Merge branch 'develop' into marchcat/b-sync
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/cmake/Audio.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llxml/llxmltree.cpp
# indra/newview/viewer_manifest.py
Diffstat (limited to 'autobuild.xml')
-rw-r--r-- | autobuild.xml | 260 |
1 files changed, 75 insertions, 185 deletions
diff --git a/autobuild.xml b/autobuild.xml index 892c1fcf5f..7ce8372559 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -537,47 +537,19 @@ <map> <key>platforms</key> <map> - <key>darwin64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>52c41a4547d2d9aceb4a9a1e9e1680c71e5ffa79</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-darwin64-5413f58.tar.zst</string> - </map> - <key>name</key> - <string>darwin64</string> - </map> - <key>linux64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>5b957aa7f353b10ae17b7119e5b3668f48a35325</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-linux64-5413f58.tar.zst</string> - </map> - <key>name</key> - <string>linux64</string> - </map> - <key>windows64</key> + <key>common</key> <map> <key>archive</key> <map> <key>hash</key> - <string>3137e06d376767a631bc9626832d558c4d5e5aa9</string> + <string>9c58108270fbad15a321f75501cdfb9c6b78a6f2</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-windows64-5413f58.tar.zst</string> + <string>https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v15.3.2-r1/emoji_shortcodes-15.3.2.10207138275-common-10207138275.tar.zst</string> </map> <key>name</key> - <string>windows64</string> + <string>common</string> </map> </map> <key>license</key> @@ -587,7 +559,7 @@ <key>copyright</key> <string>Copyright 2017-2019 Miles Johnson.</string> <key>version</key> - <string>6.1.0.5413f58</string> + <string>15.3.2.10207138275</string> <key>name</key> <string>emoji_shortcodes</string> <key>canonical_repo</key> @@ -1067,63 +1039,65 @@ <key>name</key> <string>jpegencoderbasic</string> </map> - <key>jpeglib</key> + <key>libjpeg-turbo</key> <map> <key>platforms</key> <map> - <key>darwin64</key> + <key>windows64</key> <map> <key>archive</key> <map> <key>hash</key> - <string>776d114aa1e3455bb13deaacd756deb07b53ecbe</string> + <string>36144272e381952a7c11f1d593c2916c5c7387d0</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-jpeglib/releases/download/v8c.7846234/jpeglib-8c.7846234-darwin64-7846234.tar.zst</string> + <string>https://github.com/secondlife/3p-libjpeg-turbo/releases/download/v3.0.3-r1/libjpeg_turbo-3.0.3-windows64-10204037839.tar.zst</string> </map> <key>name</key> - <string>darwin64</string> + <string>windows64</string> </map> <key>linux64</key> <map> <key>archive</key> <map> <key>hash</key> - <string>b4b2278bd2fcae85619e2145a243cca388d760d7</string> + <string>f853a7d4fe842e7a661dd71a56a51f65b2ec25c7</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-jpeglib/releases/download/v8c.7846234/jpeglib-8c.7846234-linux64-7846234.tar.zst</string> + <string>https://github.com/secondlife/3p-libjpeg-turbo/releases/download/v3.0.3-r1/libjpeg_turbo-3.0.3-linux64-10204037839.tar.zst</string> </map> <key>name</key> <string>linux64</string> </map> - <key>windows64</key> + <key>darwin64</key> <map> <key>archive</key> <map> <key>hash</key> - <string>d50fcac69eeb9404638da07db96ee3e1191ecf93</string> + <string>6fcbc2c3c91b5e9bfbbc57ddf27d2f3698fe7d99</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-jpeglib/releases/download/v8c.7846234/jpeglib-8c.7846234-windows64-7846234.tar.zst</string> + <string>https://github.com/secondlife/3p-libjpeg-turbo/releases/download/v3.0.3-r1/libjpeg_turbo-3.0.3-darwin64-10204037839.tar.zst</string> </map> <key>name</key> - <string>windows64</string> + <string>darwin64</string> </map> </map> <key>license</key> - <string>jpeglib</string> + <string>libjpeg-turbo</string> <key>license_file</key> - <string>LICENSES/jpeglib.txt</string> + <string>LICENSES/libjpeg-turbo.txt</string> <key>copyright</key> - <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string> + <string>Copyright (C)2009-2024 D. R. Commander. All Rights Reserved. Copyright (C)2015 Viktor Szathmáry. All Rights Reserved.</string> <key>version</key> - <string>8c.7846234</string> + <string>3.0.3</string> <key>name</key> - <string>jpeglib</string> + <string>libjpeg-turbo</string> + <key>canonical_repo</key> + <string>https://github.com/secondlife/3p-libjpeg-turbo</string> <key>description</key> <string>JPEG encoding, decoding library</string> </map> @@ -1218,11 +1192,11 @@ <key>archive</key> <map> <key>hash</key> - <string>d5757ab84d934fa358f299ab91e2e297beaa3dac</string> + <string>e71ae7a645603fe967a69aa5beb5b3009185e177</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-libhunspell/releases/download/v1.3.2.650fb94/libhunspell-1.3.2.650fb94-darwin64-650fb94.tar.zst</string> + <string>https://github.com/secondlife/3p-libhunspell/releases/download/v1.7.2-r1/libhunspell-1.7.2.10207243663-darwin64-10207243663.tar.zst</string> </map> <key>name</key> <string>darwin64</string> @@ -1232,11 +1206,11 @@ <key>archive</key> <map> <key>hash</key> - <string>6413d3bd4cd50c2a6b7f949eb4bd6f0c94feb984</string> + <string>275ffb7f60064d8008aed8406f80f34229f651fc</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-libhunspell/releases/download/v1.3.2.650fb94/libhunspell-1.3.2.650fb94-linux64-650fb94.tar.zst</string> + <string>https://github.com/secondlife/3p-libhunspell/releases/download/v1.7.2-r1/libhunspell-1.7.2.10207243663-linux64-10207243663.tar.zst</string> </map> <key>name</key> <string>linux64</string> @@ -1246,11 +1220,11 @@ <key>archive</key> <map> <key>hash</key> - <string>c1be4a79b20435030b2e0e01b582c61b462c8376</string> + <string>89ff24e93eaeca7949ccdb5cc368f938f5b1f307</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-libhunspell/releases/download/v1.3.2.650fb94/libhunspell-1.3.2.650fb94-windows64-650fb94.tar.zst</string> + <string>https://github.com/secondlife/3p-libhunspell/releases/download/v1.7.2-r1/libhunspell-1.7.2.10207243663-windows64-10207243663.tar.zst</string> </map> <key>name</key> <string>windows64</string> @@ -1261,9 +1235,9 @@ <key>license_file</key> <string>LICENSES/hunspell.txt</string> <key>copyright</key> - <string>See hunspell.txt</string> + <string>LGPL 2.1</string> <key>version</key> - <string>1.3.2.650fb94</string> + <string>1.7.2.10207243663</string> <key>name</key> <string>libhunspell</string> <key>description</key> @@ -1798,18 +1772,6 @@ </map> <key>mikktspace</key> <map> - <key>canonical_repo</key> - <string>https://bitbucket.org/lindenlab/3p-mikktspace</string> - <key>copyright</key> - <string>Copyright (C) 2011 by Morten S. Mikkelsen, Copyright (C) 2022 Blender Authors</string> - <key>description</key> - <string>Mikktspace Tangent Generator</string> - <key>license</key> - <string>Apache 2.0</string> - <key>license_file</key> - <string>mikktspace.txt</string> - <key>name</key> - <string>mikktspace</string> <key>platforms</key> <map> <key>darwin64</key> @@ -1855,8 +1817,20 @@ <string>windows64</string> </map> </map> + <key>license</key> + <string>Apache 2.0</string> + <key>license_file</key> + <string>mikktspace.txt</string> + <key>copyright</key> + <string>Copyright (C) 2011 by Morten S. Mikkelsen, Copyright (C) 2022 Blender Authors</string> <key>version</key> <string>1</string> + <key>name</key> + <string>mikktspace</string> + <key>canonical_repo</key> + <string>https://bitbucket.org/lindenlab/3p-mikktspace</string> + <key>description</key> + <string>Mikktspace Tangent Generator</string> </map> <key>minizip-ng</key> <map> @@ -2080,11 +2054,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>ad0dd0f608b868cc44c225ee48e114239fca2807</string> + <string>1e694e5562b8d844bc44d5f7ae4dce243ee70d23</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-ogg_vorbis/releases/download/v1.3.3-1.3.6.e4101b6/ogg_vorbis-1.3.3-1.3.6.e4101b6-darwin64-e4101b6.tar.zst</string> + <string>https://github.com/secondlife/3p-ogg_vorbis/releases/download/v1.3.5-1.3.7/ogg_vorbis-1.3.5-1.3.7.10218872737-darwin64-10218872737.tar.zst</string> </map> <key>name</key> <string>darwin64</string> @@ -2094,11 +2068,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>90052be851c4fcecc35d8424b4f31352de14ab2f</string> + <string>ce0c6adb6d684eb2f4b2ad8838c67186c59e151a</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-ogg_vorbis/releases/download/v1.3.3-1.3.6-881f65e/ogg_vorbis-1.3.3-1.3.6.881f65e-linux64-881f65e.tar.zst</string> + <string>https://github.com/secondlife/3p-ogg_vorbis/releases/download/v1.3.5-1.3.7/ogg_vorbis-1.3.5-1.3.7.10218872737-linux64-10218872737.tar.zst</string> </map> <key>name</key> <string>linux64</string> @@ -2108,11 +2082,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>2e73a0a5659c9a09eba2f94619aa5c23c7cc3937</string> + <string>9434b592c5d748c5deb64ad548fd1484638e3172</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-ogg_vorbis/releases/download/v1.3.3-1.3.6.e4101b6/ogg_vorbis-1.3.3-1.3.6.e4101b6-windows64-e4101b6.tar.zst</string> + <string>https://github.com/secondlife/3p-ogg_vorbis/releases/download/v1.3.5-1.3.7/ogg_vorbis-1.3.5-1.3.7.10218872737-windows64-10218872737.tar.zst</string> </map> <key>name</key> <string>windows64</string> @@ -2125,7 +2099,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>copyright</key> <string>Copyright (c) 2002, Xiph.org Foundation</string> <key>version</key> - <string>1.3.3-1.3.6.881f65e</string> + <string>1.3.5-1.3.7.10218872737</string> <key>name</key> <string>ogg_vorbis</string> <key>description</key> @@ -2343,66 +2317,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>description</key> <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string> </map> - <key>pcre</key> - <map> - <key>platforms</key> - <map> - <key>darwin64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>b372d37596474043a62568e569b0ce155192f484</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-pcre/releases/download/v8.35.979fd86/pcre-8.35.979fd86-darwin64-979fd86.tar.zst</string> - </map> - <key>name</key> - <string>darwin64</string> - </map> - <key>linux64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>3a722c508a9278a49317e3f749f3256768f1c50b</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-pcre/releases/download/v8.35-3c0eb51/pcre-8.35.3c0eb51-linux64-3c0eb51.tar.zst</string> - </map> - <key>name</key> - <string>linux64</string> - </map> - <key>windows64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>166564afb60a7536a038fae80e2fc9a41d6dbccb</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-pcre/releases/download/v8.35.979fd86/pcre-8.35.979fd86-windows64-979fd86.tar.zst</string> - </map> - <key>name</key> - <string>windows64</string> - </map> - </map> - <key>license</key> - <string>bsd</string> - <key>license_file</key> - <string>LICENSES/pcre-license.txt</string> - <key>copyright</key> - <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string> - <key>version</key> - <string>8.35.3c0eb51</string> - <key>name</key> - <string>pcre</string> - <key>description</key> - <string>PCRE Perl-compatible regular expression library</string> - </map> <key>slvoice</key> <map> <key>platforms</key> @@ -2657,40 +2571,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <map> <key>platforms</key> <map> - <key>darwin64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>6041bbd4001e3951f96ac3456c7906da</string> - <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113314/980656/viewer_fonts-1.579464-darwin64-579464.tar.bz2</string> - </map> - <key>name</key> - <string>darwin64</string> - </map> - <key>windows64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>1745ba6eec0108250446fe01d4aa065c</string> - <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113307/980631/viewer_fonts-1.579464-windows64-579464.tar.bz2</string> - </map> - <key>name</key> - <string>windows64</string> - </map> <key>common</key> <map> <key>archive</key> <map> <key>hash</key> - <string>c25de57e57856a826b2c146ac951ae0b53250666</string> + <string>e88a7c97a6843d43e0093388f211299ec2892790</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-viewer-fonts/releases/download/v1.0.0-r1/viewer_fonts-1.0.0.8512067490-common-8512067490.tar.zst</string> + <string>https://github.com/secondlife/3p-viewer-fonts/releases/download/v1.1.0-r1/viewer_fonts-1.0.0.10204976553-common-10204976553.tar.zst</string> </map> <key>name</key> <string>common</string> @@ -2703,7 +2593,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>copyright</key> <string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT</string> <key>version</key> - <string>1.0.0.8512067490</string> + <string>1.0.0.10204976553</string> <key>name</key> <string>viewer-fonts</string> <key>description</key> @@ -2762,6 +2652,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <string>LICENSE</string> <key>copyright</key> <string>Copyright (c) 2000-2012, Linden Research, Inc.</string> + <key>version</key> + <string>3.0-f14b5ec</string> <key>name</key> <string>viewer-manager</string> <key>description</key> @@ -2770,11 +2662,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <string>https://bitbucket.org/lindenlab/vmp-standalone</string> <key>source_type</key> <string>hg</string> - <key>version</key> - <string>3.0-f14b5ec</string> </map> <key>vlc-bin</key> <map> + <key>copyright</key> + <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string> + <key>license</key> + <string>GPL2</string> + <key>license_file</key> + <string>LICENSES/vlc.txt</string> + <key>name</key> + <string>vlc-bin</string> <key>platforms</key> <map> <key>darwin64</key> @@ -2782,11 +2680,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>a26b47ab01a7e2c0add4c236886162c1135b3b79</string> + <string>f13c82042ef8311e57dd75a3b2bda02d70f711b5</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-vlc-bin/releases/download/v3.0.16.c219a5d/vlc_bin-3.0.16.c219a5d-darwin64-c219a5d.tar.zst</string> + <string>https://github.com/secondlife/3p-vlc-bin/releases/download/v3.0.21.e60ee26/vlc_bin-3.0.21.10218721728-darwin64-10218721728.tar.zst</string> </map> <key>name</key> <string>darwin64</string> @@ -2796,26 +2694,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>d56002da7435bab166c88d59eeaf69fd87cd897d</string> + <string>bd995441c1a229ed1432ddd837d7d1663b8c5548</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-vlc-bin/releases/download/v3.0.16.c219a5d/vlc_bin-3.0.16.c219a5d-windows64-c219a5d.tar.zst</string> + <string>https://github.com/secondlife/3p-vlc-bin/releases/download/v3.0.21.e60ee26/vlc_bin-3.0.21.10218721728-windows64-10218721728.tar.zst</string> </map> <key>name</key> <string>windows64</string> </map> </map> - <key>license</key> - <string>GPL2</string> - <key>license_file</key> - <string>LICENSES/vlc.txt</string> - <key>copyright</key> - <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string> <key>version</key> - <string>3.0.16.c219a5d</string> - <key>name</key> - <string>vlc-bin</string> + <string>3.0.21.10218721728</string> </map> <key>vulkan_gltf</key> <map> @@ -2860,11 +2750,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>0a0a972036f2b2c9c97dead40c91f7443b8ab339</string> + <string>baabb11f324be350253b1fb58cf262c1aa19fa70</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.61-debug/webrtc-m114.5735.08.61-debug.9571929057-darwin64-9571929057.tar.zst</string> + <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.67-debug/webrtc-m114.5735.08.67-debug.10190042668-darwin64-10190042668.tar.zst</string> </map> <key>name</key> <string>darwin64</string> @@ -2874,11 +2764,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>8725ad23f33d946bd5a4e5f28e8c8324925c71a7</string> + <string>a13776c8f99f8975665be66ff8b51a80ba46c718</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.61-debug/webrtc-m114.5735.08.61-debug.9571929057-linux64-9571929057.tar.zst</string> + <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.67-debug/webrtc-m114.5735.08.67-debug.10190042668-linux64-10190042668.tar.zst</string> </map> <key>name</key> <string>linux64</string> @@ -2888,11 +2778,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>db560661807db276a3c7d1e7d9531198c9268f68</string> + <string>965ef5d65a14191a52ee9ec6a9a8a1d2ce3f2ffb</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.61-debug/webrtc-m114.5735.08.61-debug.9571929057-windows64-9571929057.tar.zst</string> + <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.67-debug/webrtc-m114.5735.08.67-debug.10190042668-windows64-10190042668.tar.zst</string> </map> <key>name</key> <string>windows64</string> @@ -2905,7 +2795,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>copyright</key> <string>Copyright (c) 2011, The WebRTC project authors. All rights reserved.</string> <key>version</key> - <string>m114.5735.08.61-debug.9571929057</string> + <string>m114.5735.08.67-debug.10190042668</string> <key>name</key> <string>webrtc</string> <key>vcs_branch</key> |