From 4173fa1a9ef79c27d39d9ab9dbee46f109fbf510 Mon Sep 17 00:00:00 2001 From: AiraYumi Date: Sat, 30 Mar 2024 06:59:21 -0400 Subject: linux build fix --- autobuild.xml | 152 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 102 insertions(+), 50 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 11b2783bd7..5fbccd0d4c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -16,9 +16,11 @@ archive hash - 7ea2df03bfc35c06acf23dd9e734adac + 0f6fbb52ffea1a55bf76a84a6688079f95674cbd + hash_algorithm + sha1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1103/2554/SDL-1.2.15-linux64-501092.tar.bz2 + https://github.com/secondlife/3p-sdl2/releases/download/v2.28.0-1dc88c1/SDL2-2.28.0-linux64-1dc88c1.tar.zst name linux64 @@ -60,9 +62,11 @@ archive hash - 84a1a140f20b25d714949185e854d14b + 95137cd3f4d6ffa5bd7a00d7d91bd8fc272b7ca2 + hash_algorithm + sha1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4811/15302/apr_suite-1.4.5.504800-linux64-504800.tar.bz2 + https://github.com/secondlife/3p-apr_suite/releases/download/v1.7.2-c5f3347/apr_suite-1.7.2-c5f3347-linux64-c5f3347.tar.zst name linux64 @@ -113,6 +117,20 @@ name darwin64 + linux64 + + archive + + hash + a3bfbdba7e1977e7e65266ec654990bb13994bd3 + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-boost/releases/download/v1.81-3d0d7fc/boost-1.81-linux64-3d0d7fc.tar.zst + + name + linux64 + windows64 archive @@ -205,6 +223,20 @@ name darwin64 + linux64 + + archive + + hash + cab0237b5194254c0c0ff6bf77bc6a2f946d4f57 + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-colladadom/releases/download/v2.3-2f532e1/colladadom-2.3.2f532e1-linux64-2f532e1.tar.zst + + name + linux64 + windows64 archive @@ -254,12 +286,14 @@ archive hash - 77c53daf558f51aec6e9f4bd9e930a103630ee7d + aea0bed0f953a9371b9091f09230b41597f891f7 hash_algorithm sha1 url - https://github.com/secondlife/3p-cubemap_to_eqr_js/releases/download/v1.1.0-d7afe27/cubemaptoequirectangular-1.1.0-linux64-d7afe27.tar.zst + https://github.com/secondlife/3p-cubemap_to_eqr_js/releases/download/v1.1.0-cb8785a/cubemaptoequirectangular-1.1.0-linux64-cb8785a.tar.zst + name + linux64 windows64 @@ -310,9 +344,11 @@ archive hash - 630a2ddf43bba6e5b6e171dc68921dcb + 7bb9bbadb44dd7490c3e6804395df01ab800bc18 + hash_algorithm + sha1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8663/36142/curl-7.54.1.508652-linux64-508652.tar.bz2 + https://github.com/secondlife/3p-curl/releases/download/v7.54.1-513145c/curl-7.54.1-513145c-linux64-513145c.tar.zst name linux64 @@ -481,6 +517,20 @@ name darwin64 + linux64 + + archive + + hash + 5b957aa7f353b10ae17b7119e5b3668f48a35325 + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-linux64-5413f58.tar.zst + + name + linux64 + windows64 archive @@ -623,36 +673,6 @@ description FMOD Studio API - fontconfig - - platforms - - linux64 - - archive - - hash - e2419d56960c160670051fbb055fb729 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-fontconfig/rev/314281/arch/Linux/installer/fontconfig-2.11.0-linux64-314281.tar.bz2 - - name - linux64 - - - license - bsd - license_file - LICENSES/fontconfig.txt - copyright - Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc. - version - 2.11.0 - name - fontconfig - description - Fontconfig is a library for configuring and customizing font access. - freetype copyright @@ -686,11 +706,11 @@ archive hash - 4a999279562e8f3e4ba02d3e78a844ddf6fe18f1 + 061e1bd8eef85a5d15fafc9d46fc562a621207da hash_algorithm sha1 url - https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-linux64-557becd.tar.zst + https://github.com/secondlife/3p-freetype/releases/download/v2.12.1.d315c1b/freetype-2.12.1.8443253711-linux64-8443253711.tar.zst name linux64 @@ -985,6 +1005,20 @@ name darwin64 + linux64 + + archive + + hash + 99e96926b7cf668d8e8195a021d6eacb09de32a0 + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-icu4c/releases/download/v4.8.1-7d08d82/icu4c-4.8.1-linux64-7d08d82.tar.zst + + name + linux64 + windows64 archive @@ -1026,11 +1060,11 @@ archive hash - 35d6a617444fde9c8a5e998ef29dc43b95747637 + 23daab838f4b8f92e5dc1a2f6c568cb7b0cb43b7 hash_algorithm sha1 url - https://github.com/secondlife/3p-jpeg_encoder_js/releases/download/v1.0-9165e47/jpegencoderbasic-1.0-linux64-9165e47.tar.zst + https://github.com/secondlife/3p-jpeg_encoder_js/releases/download/v1.0-790015a/jpegencoderbasic-1.0-linux64-790015a.tar.zst windows64 @@ -1374,9 +1408,11 @@ archive hash - 13de93ea11544051b69f238eeb644fd3 + 39d5779fd79e23da16a7b5bf608008999004c828 + hash_algorithm + sha1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/882/1946/libpng-1.6.8.500873-linux64-500873.tar.bz2 + https://github.com/secondlife/3p-libpng/releases/download/v1.16.38-d427738/libpng-1.6.38-8318603154-linux64-8318603154.tar.zst name linux64 @@ -1462,11 +1498,11 @@ archive hash - 4cda464277bfa6756ce4663a91cd724f3f45b8d8 + fda5d399c21c3ad29a78f29599523ca4ecf76bd2 hash_algorithm sha1 url - https://github.com/secondlife/3p-libxml2/releases/download/v2.9.4.7476681/libxml2-2.9.4.7476681-linux64-7476681.tar.zst + https://github.com/secondlife/3p-libxml2/releases/download/v2.9.4-2db4418/libxml2-2.9.4.2db4418-linux64-2db4418.tar.zst name linux64 @@ -1760,6 +1796,20 @@ name darwin64 + linux64 + + archive + + hash + 6f4509dca9e32e3b4f9c4b13d875ce0e24340efc + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-meshoptimizer/releases/download/v160-4f905dd/meshoptimizer-160-linux64-4f905dd.tar.zst + + name + linux64 + windows64 archive @@ -2341,9 +2391,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0f058ca2176e7d02d51e54c66a96f336 + 3a722c508a9278a49317e3f749f3256768f1c50b + hash_algorithm + sha1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/908/2010/pcre-8.35.500898-linux64-500898.tar.bz2 + https://github.com/secondlife/3p-pcre/releases/download/v8.35-3c0eb51/pcre-8.35.3c0eb51-linux64-3c0eb51.tar.zst name linux64 @@ -2461,11 +2513,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 9de1295b157c9913c28be81ff933c73493ecc132 + 982c0fa427458082ea9e3cb9603904210732b64e hash_algorithm sha1 url - https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-b8f6746/threejs-0.132.2-linux64-b8f6746.tar.zst + https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-5da28d9/threejs-0.132.2-common-8454371083.tar.zst windows64 -- cgit v1.2.3 From a93344b4db2654e91b4daa9f2709daf448c03a8e Mon Sep 17 00:00:00 2001 From: AiraYumi Date: Mon, 1 Apr 2024 21:41:21 -0400 Subject: enable tracy for linux and build fix --- autobuild.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5fbccd0d4c..612421f8c9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2616,6 +2616,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors name windows64 + linux64 + + archive + + hash + 0cac6af362861d90cdd3dc4adfff95f54e619f4a + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-tracy/releases/download/v0.8.1%2Br1/tracy-v0.8.1.38bf5f3-linux64-38bf5f3.tar.zst + + name + linux64 + license bsd -- cgit v1.2.3 From 57d423745fd1d3d0ea6a0c69b869a20c27e27fc5 Mon Sep 17 00:00:00 2001 From: Nicky Dasmijn Date: Fri, 5 Apr 2024 19:25:02 +0200 Subject: Linux viewer (ReleaseOS) resurrection (#1099) Co-authored-by: AiraYumi --- autobuild.xml | 195 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 107 insertions(+), 88 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 612421f8c9..5bb0e953f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -7,7 +7,7 @@ autobuild installables - SDL + SDL2 platforms @@ -29,13 +29,13 @@ license lgpl license_file - LICENSES/SDL.txt + LICENSES/SDL2.txt copyright - Copyright (C) 1997-2012 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga (slouken@libsdl.org) version - 1.2.15 + 2.28.0 name - SDL + SDL2 description Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. @@ -93,7 +93,7 @@ copyright Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. version - 1.7.2-e935465 + 1.7.2-c5f3347 name apr_suite description @@ -375,7 +375,7 @@ copyright Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se). version - 7.54.1-5a4a82d + 7.54.1-513145c name curl description @@ -543,6 +543,20 @@ name windows64 + linux64 + + archive + + hash_algorithm + sha1 + hash + 5b957aa7f353b10ae17b7119e5b3668f48a35325 + url + https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-linux64-5413f58.tar.zst + + name + linux64 + version 6.1.0.579438 @@ -615,14 +629,14 @@ archive - creds - github hash fb6797ff93b6e881b060d2a8b396d8d7477834ee hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908444 + creds + github name darwin64 @@ -631,14 +645,14 @@ archive - creds - github hash a378bd1604aa97ca763140911f9f4e463ced85c0 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908446 + creds + github name linux64 @@ -647,14 +661,14 @@ archive - creds - github hash 72304491d86bd797b840999b255358f195b06609 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908456 + creds + github name windows64 @@ -706,11 +720,11 @@ archive hash - 061e1bd8eef85a5d15fafc9d46fc562a621207da + 07a38133c008ce6f728d652d00a756bea3a70288 hash_algorithm sha1 url - https://github.com/secondlife/3p-freetype/releases/download/v2.12.1.d315c1b/freetype-2.12.1.8443253711-linux64-8443253711.tar.zst + https://github.com/secondlife/3p-freetype/releases/download/v2.12.1-r1/freetype-2.12.1.8503093630-linux64-8503093630.tar.zst name linux64 @@ -885,34 +899,6 @@ name gstreamer - gtk-atk-pango-glib - - platforms - - linux64 - - archive - - hash - de7bba8fd2275a11b077b124413065d0 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-gtk-atk-pango-glib/rev/314220/arch/Linux/installer/gtk_atk_pango_glib-0.1-linux64-314220.tar.bz2 - - name - linux64 - - - license - lgpl - license_file - LICENSES/gtk-atk-pango-glib.txt - copyright - Copyright (various, see sources) - version - 0.1 - name - gtk-atk-pango-glib - havok-source platforms @@ -921,14 +907,14 @@ archive - creds - github hash a193ff65d6db48626d65d96c6124c6efca85e8ec hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912596 + creds + github name darwin64 @@ -949,14 +935,14 @@ archive - creds - github hash ebfb82b6143874e7938b9d1e8a70d0a2e28aa818 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599 + creds + github name windows64 @@ -1005,33 +991,33 @@ name darwin64 - linux64 + windows64 archive hash - 99e96926b7cf668d8e8195a021d6eacb09de32a0 + b7db881dac80302e4d9010af34c0bf6ca9897df9 hash_algorithm sha1 url - https://github.com/secondlife/3p-icu4c/releases/download/v4.8.1-7d08d82/icu4c-4.8.1-linux64-7d08d82.tar.zst + https://github.com/secondlife/3p-icu4c/releases/download/v4.8.1-7d08d82/icu4c-4.8.1-windows64-7d08d82.tar.zst name - linux64 + windows64 - windows64 + linux64 archive hash - b7db881dac80302e4d9010af34c0bf6ca9897df9 + bdd74e2a02c7b78fded9222140d197da4af9904e hash_algorithm sha1 url - https://github.com/secondlife/3p-icu4c/releases/download/v4.8.1-7d08d82/icu4c-4.8.1-windows64-7d08d82.tar.zst + https://github.com/secondlife/3p-icu4c/releases/download/v4.8.1-8bff176/icu4c-4.8.1-linux64-8512575562.tar.zst name - windows64 + linux64 version @@ -1176,11 +1162,11 @@ archive hash - 97e268754808cb2fbd682c4d3beafd2c598e1ba7 + 66dce1d0c2fc19dff13db279d973773fc7e2aa13 hash_algorithm sha1 url - https://github.com/secondlife/3p-jsoncpp/releases/download/v0.5.0.bc46e62/jsoncpp-0.5.0.bc46e62-linux64-bc46e62.tar.zst + https://github.com/secondlife/3p-jsoncpp/releases/download/v0.5.0-cc63e92/jsoncpp-0.5.0.cc63e92-linux64-cc63e92.tar.zst name linux64 @@ -1207,7 +1193,7 @@ copyright Copyright (c) 2007-2010 Baptiste Lepilleur version - 0.5.0.bc46e62 + 0.5.0.1db375e name jsoncpp description @@ -1221,14 +1207,14 @@ archive - creds - github hash bcc7e2c34896fc9cbc41828dee8a4ddf54f10453 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298968 + creds + github name darwin64 @@ -1237,14 +1223,14 @@ archive - creds - github hash 9de772df2ed12e9c742df6c90670c7cbbb9c93a6 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298969 + creds + github name linux64 @@ -1253,14 +1239,14 @@ archive - creds - github hash 92533ff0f8c1881ad85e75800f9072c413ccf7b7 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298970 + creds + github name windows64 @@ -1529,7 +1515,7 @@ copyright Copyright (C) 1998-2012 Daniel Veillard. All Rights Reserved. version - 2.9.4.7476681 + 2.9.4.2db4418 name libxml2 description @@ -2138,9 +2124,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 45ebd074053dc9cae8c5c74b52085d4b + 90052be851c4fcecc35d8424b4f31352de14ab2f + hash_algorithm + sha1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/465/990/ogg_vorbis-1.2.2-1.3.2.500397-linux64-500397.tar.bz2 + 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 name linux64 @@ -2167,7 +2155,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2002, Xiph.org Foundation version - 1.3.3-1.3.6.e4101b6 + 1.3.3-1.3.6.881f65e name ogg_vorbis description @@ -2175,6 +2163,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors open-libndofdev + platforms + + linux64 + + archive + + hash + 2d20683554f0b00234bbb84d0ce7ac1be1ad70aa + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r1/open_libndofdev-0.14.8503290964-linux64-8503290964.tar.zst + + name + linux64 + + license BSD license_file @@ -2182,7 +2187,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com) version - 0.3 + 0.14.8503290964 name open-libndofdev description @@ -2422,7 +2427,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc. version - 8.35.979fd86 + 8.35.3c0eb51 name pcre description @@ -2436,14 +2441,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive - creds - github hash cc7c5bf53f83cff81d874ad66394df0991bd432c hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-slvoice/releases/assets/108299352 + creds + github name darwin64 @@ -2464,14 +2469,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive - creds - github hash 0c205371bb1731a9812b00556037729fdc057cbc hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-slvoice/releases/assets/108299356 + creds + github name windows64 @@ -2744,16 +2749,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors viewer-fonts - copyright - 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 - description - Viewer fonts - license - Various open source - license_file - LICENSES/fonts.txt - name - viewer-fonts platforms darwin64 @@ -2780,9 +2775,33 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors name windows64 + common + + archive + + hash + c25de57e57856a826b2c146ac951ae0b53250666 + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-viewer-fonts/releases/download/v1.0.0-r1/viewer_fonts-1.0.0.8512067490-common-8512067490.tar.zst + + name + common + + license + Various open source + license_file + LICENSES/fonts.txt + copyright + 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 version - 1.579464 + 1.0.0.8512067490 + name + viewer-fonts + description + Viewer fonts viewer-manager @@ -3312,11 +3331,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + arguments ../indra - + build @@ -3337,7 +3356,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + build -- cgit v1.2.3 From bbd6dfc21a1a6c07824fc81e0659a2c200581d3b Mon Sep 17 00:00:00 2001 From: AiraYumi Date: Tue, 9 Apr 2024 05:38:01 +0900 Subject: Some fixes to linux builds (#1144) * compile flag cleanup for linux * rollback indra/llcommon/llprofiler.h * use 3p fltk package * fix build gcc 13 (dangling-pointer) --- autobuild.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5bb0e953f7..e95eb13a6b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -39,6 +39,36 @@ description Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. + fltk + + platforms + + linux64 + + archive + + hash + 691fef2ddd57d7b6c26e87fc82d9ace3f54e078c + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-fltk/releases/download/v1.3.9-r1/fltk-1.3.9.8556992788-linux64-8556992788.tar.zst + + name + linux + + + license + LGPL/fltk + license_file + LICENSES/fltk.txt + copyright + Copyright (C) fltk project + version + 1.3.5 + name + fltk + apr_suite platforms -- cgit v1.2.3 From 6b4b33cc129e9482342c9280ae79c9c5ce427ef1 Mon Sep 17 00:00:00 2001 From: Nicky Dasmijn Date: Mon, 8 Apr 2024 22:39:20 +0200 Subject: Linux GHA builds (#1147) * Linux GHA builds Add Ubuntu 22.04 runner and Linux dependencies Do not even try to touch ReleaseFS for Linux yet (this needs KDU, Havok, FMOD) * Lets play a game of 'guess the havok source url' * Move to linux-large runner. * ReleaseOS used OpenAL, not fmod studio (which otherwise is the default) * - Correction for Linux build dir - HAVOK / CrashReporting wrestling. HAVOK is always turned on, even for OS builds Turn this off for Linux-ReleaseOS Same with crashreporting, we need it off for now * Add missing brace * When doing a GHA build pack right into RUNNER_TEMP and then signal the created archive as our "viewer_app" * Upload Linux-ReleaseOS after build * - Need to use os.path.join and not hyst join - set_github_output_path can be called unconditionally * Remove Linux GHA build example. --- autobuild.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e95eb13a6b..ca774fc769 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -954,9 +954,13 @@ archive hash - 00d0333936a67059a43a6ec8ac38d564 + ebfb82b6143874e7938b9d1e8a70d0a2e28aa818 + hash_algorithm + sha1 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/748/1563/havok_source-2012.1-2-linux64-500739.tar.bz2 + https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599 + creds + github name linux64 @@ -3386,7 +3390,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + -DUSE_OPENAL=On + build -- cgit v1.2.3 From 37392be4171303db08a4842b7882b4cb758a8f8d Mon Sep 17 00:00:00 2001 From: Nicky Dasmijn Date: Tue, 9 Apr 2024 20:26:06 +0200 Subject: Update Linux media handling (#1146) * Enable CEF browser for Linux * Disable the update for Linux, we don't have that one right now * Update build_linux.yaml We need libpulse-dev for volume_catcher Linux * Add linux_volum_catcher* files * Enable OpenAL for Linux-ReleaseOS * Linux: Update OpenAL * Update SDL2 * Add libsndio-dev to the dependencies. * Update CEF to an official LL version * Remove dupe of emoji_shortcodes * Reording autobuild does because it can and wants to * Linux: Disable NDOF for the time being. After updating the ndof 3P needs to be rebuilt and we do not have a fresh one from LL yet. Forcefully undefine LIB_NDOF, it gets defined in the build variables no matter if it is safe to define. * Remove wrestling with mutliarch and LIBGL_DRIVERS_PATH * Remove tcmalloc snippet, tcmalloc is a very faint bad dream of the past * Putting out a warning this viewer ran on a x64 arch and then suggesting to install 32 bit compat packages makes no sense at all * CEF resources need to be in lib * It;'s okay to warn about missing plugins * Linux: CEF keyboard handling * Remove old gstreamer 0.10 implementation * Linux DSO loading always had been very peculiar due to macro magic. At least now it is peculiar shared magic with only one implementation. * Remove -fPIC. We get that one from LL_BUILD * /proc/cpuinfo is not reliable to detrmine the max CPU clock. Try to determine this by reading "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq". Only if this fails go back to /proc/cpuinfo * Cleanup * Cleanup common linker and compiler flags, make it more obvious which flags are for which OS/compiler * Switch to correct plugin file * Install libpulse-dev for volume catcher. * And the runner needs libsndio-dev as well. * check for runner.os=='linux'. matrix.os is the full name of the image (limux-large). --- autobuild.xml | 174 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 88 insertions(+), 86 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ca774fc769..4fa94e96dc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -16,11 +16,11 @@ archive hash - 0f6fbb52ffea1a55bf76a84a6688079f95674cbd + cb7493d93dbd07eec5970ce4c97f74e94a3862f1 hash_algorithm sha1 url - https://github.com/secondlife/3p-sdl2/releases/download/v2.28.0-1dc88c1/SDL2-2.28.0-linux64-1dc88c1.tar.zst + https://github.com/secondlife/3p-sdl2/releases/download/v2.28.0-r2/SDL2-2.28.0-linux64-8572700123.tar.zst name linux64 @@ -505,6 +505,20 @@ name windows64 + linux64 + + archive + + hash + 08491c609b5f77835977fa459e386fddbad00064 + hash_algorithm + sha1 + url + https://github.com/secondlife/dullahan/releases/download/v1.14.0-r2/dullahan-1.14.0.202404051708_118.4.1_g3dd6078_chromium-118.0.5993.54-linux64-8573290624.tar.zst + + name + linux64 + license MPL @@ -521,18 +535,6 @@ emoji_shortcodes - canonical_repo - https://github.com/secondlife/3p-emoji-shortcodes - copyright - Copyright 2017-2019 Miles Johnson. - description - Emoji shortcodes - license - MIT - license_file - LICENSES/emojibase-license.txt - name - emoji_shortcodes platforms darwin64 @@ -573,23 +575,21 @@ name windows64 - linux64 - - archive - - hash_algorithm - sha1 - hash - 5b957aa7f353b10ae17b7119e5b3668f48a35325 - url - https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v6.1.0.5413f58/emoji_shortcodes-6.1.0.5413f58-linux64-5413f58.tar.zst - - name - linux64 - + license + MIT + license_file + LICENSES/emojibase-license.txt + copyright + Copyright 2017-2019 Miles Johnson. version 6.1.0.579438 + name + emoji_shortcodes + canonical_repo + https://github.com/secondlife/3p-emoji-shortcodes + description + Emoji shortcodes expat @@ -659,14 +659,14 @@ archive + creds + github hash fb6797ff93b6e881b060d2a8b396d8d7477834ee hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908444 - creds - github name darwin64 @@ -675,14 +675,14 @@ archive + creds + github hash a378bd1604aa97ca763140911f9f4e463ced85c0 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908446 - creds - github name linux64 @@ -691,14 +691,14 @@ archive + creds + github hash 72304491d86bd797b840999b255358f195b06609 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908456 - creds - github name windows64 @@ -719,16 +719,6 @@ freetype - copyright - Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. - description - Font rendering library - license - FreeType - license_file - LICENSES/freetype.txt - name - freetype platforms darwin64 @@ -788,8 +778,18 @@ windows64 + license + FreeType + license_file + LICENSES/freetype.txt + copyright + Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. version 2.12.1.557becd + name + freetype + description + Font rendering library glext @@ -937,14 +937,14 @@ archive + creds + github hash a193ff65d6db48626d65d96c6124c6efca85e8ec hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912596 - creds - github name darwin64 @@ -969,14 +969,14 @@ archive + creds + github hash ebfb82b6143874e7938b9d1e8a70d0a2e28aa818 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599 - creds - github name windows64 @@ -997,18 +997,6 @@ icu4c - canonical_repo - https://bitbucket.org/lindenlab/3p-icu4c - copyright - Copyright (c) 1995-2011 International Business Machines Corporation and others <http://source.icu-project.org> - description - ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software. - license - ICU, permissive non-copyleft free software license - license_file - LICENSES/icu.txt - name - icu4c platforms darwin64 @@ -1054,8 +1042,20 @@ linux64 + license + ICU, permissive non-copyleft free software license + license_file + LICENSES/icu.txt + copyright + Copyright (c) 1995-2011 International Business Machines Corporation and others <http://source.icu-project.org> version 4.8.1-7d08d82 + name + icu4c + canonical_repo + https://bitbucket.org/lindenlab/3p-icu4c + description + ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software. jpegencoderbasic @@ -1241,14 +1241,14 @@ archive + creds + github hash bcc7e2c34896fc9cbc41828dee8a4ddf54f10453 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298968 - creds - github name darwin64 @@ -1257,14 +1257,14 @@ archive + creds + github hash 9de772df2ed12e9c742df6c90670c7cbbb9c93a6 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298969 - creds - github name linux64 @@ -1273,14 +1273,14 @@ archive + creds + github hash 92533ff0f8c1881ad85e75800f9072c413ccf7b7 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298970 - creds - github name windows64 @@ -1986,18 +1986,6 @@ nanosvg - canonical_repo - https://bitbucket.org/lindenlab/3p-nanosvg - copyright - Copyright (c) 2013-14 Mikko Mononen - description - NanoSVG is a simple single-header-file SVG parser and rasterizer - license - Zlib - license_file - LICENSES/nanosvg.txt - name - nanosvg platforms darwin64 @@ -2037,8 +2025,20 @@ windows64 + license + Zlib + license_file + LICENSES/nanosvg.txt + copyright + Copyright (c) 2013-14 Mikko Mononen version 2022.09.27 + name + nanosvg + canonical_repo + https://bitbucket.org/lindenlab/3p-nanosvg + description + NanoSVG is a simple single-header-file SVG parser and rasterizer nghttp2 @@ -2236,11 +2236,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e0fbc4874acc4167a6e2b6489fbb8258d98fd665 + 0e25ed4856d4c0009c741a7ad153e6efe30f1398 hash_algorithm sha1 url - https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst + https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-r2/openal-1.23.1-linux64-8572560842.tar.zst name linux64 @@ -2475,14 +2475,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive + creds + github hash cc7c5bf53f83cff81d874ad66394df0991bd432c hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-slvoice/releases/assets/108299352 - creds - github name darwin64 @@ -2503,14 +2503,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive + creds + github hash 0c205371bb1731a9812b00556037729fdc057cbc hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-slvoice/releases/assets/108299356 - creds - github name windows64 @@ -3365,11 +3365,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + -DNDOF=Off + arguments ../indra - + build @@ -3391,6 +3392,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors Ninja -DLL_TESTS=Off -DUSE_OPENAL=On + -DNDOF=Off build -- cgit v1.2.3 From 2d4de107f8fc3714f75f73fc9293c87eaf0e5acb Mon Sep 17 00:00:00 2001 From: Nicky Dasmijn Date: Sun, 14 Apr 2024 15:14:23 +0200 Subject: Feature/linux gtk removal (#1225) * GTK remnants removal Remove old GTK code and wire up some missing fltk logic in llfilepicker This will leave linux_crash_logger as an empy stub which could be used as a skeleton in case crash logging gets implemented. Otherwise linux_crash_logger and what is left of it in some cmake files can be deleted. * Update SDL2 to latest version. This revealed openal has also a dependebcy on sndio. Consequently the dependency was moved to OPENMAL.cmake and canot be dropped. * Handle missing filetypes: FFSAVE_GLTF,FFLOAD_GLTF, FFLOAD_MATERIAL, FFLOAD_MATERIAL_TEXTURE --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 90f6b9eb69..0aab6f29f4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -16,11 +16,11 @@ archive hash - cb7493d93dbd07eec5970ce4c97f74e94a3862f1 + ceb0392106c2f50d79dc724fd5a6d8ec82b92cdb hash_algorithm sha1 url - https://github.com/secondlife/3p-sdl2/releases/download/v2.28.0-r2/SDL2-2.28.0-linux64-8572700123.tar.zst + https://github.com/secondlife/3p-sdl2/releases/download/v2.28.0-r3/SDL2-2.28.0-linux64-8663899652.tar.zst name linux64 @@ -953,14 +953,14 @@ archive + creds + github hash ebfb82b6143874e7938b9d1e8a70d0a2e28aa818 hash_algorithm sha1 url https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599 - creds - github name linux64 -- cgit v1.2.3 From 2ab17fa3f991a71cdb83d6dba8e345e14f11514c Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 18 Apr 2024 17:59:56 +0200 Subject: Update open_libndofdev and openal to latest versions. - With the updated openal the dependency on sndio can be dropped - The updated libndofdev is compiled against the correct version of SDL2 and thus NDOF can be enabled again --- autobuild.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 0aab6f29f4..5812ae3b5d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2204,11 +2204,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 2d20683554f0b00234bbb84d0ce7ac1be1ad70aa + f215c7e1a10f04a2c18cbb837e0039521fd150b6 hash_algorithm sha1 url - https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r1/open_libndofdev-0.14.8503290964-linux64-8503290964.tar.zst + https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r2/open_libndofdev-0.14.8730039102-linux64-8730039102.tar.zst name linux64 @@ -2221,7 +2221,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com) version - 0.14.8503290964 + 0.14.8730039102 name open-libndofdev description @@ -2236,11 +2236,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0e25ed4856d4c0009c741a7ad153e6efe30f1398 + 561032415ea95ce38d8836da2bb56e46968f5a82 hash_algorithm sha1 url - https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-r2/openal-1.23.1-linux64-8572560842.tar.zst + https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-r3/openal-1.23.1-linux64-8730177813.tar.zst name linux64 @@ -3365,7 +3365,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - -DNDOF=Off arguments @@ -3392,7 +3391,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors Ninja -DLL_TESTS=Off -DUSE_OPENAL=On - -DNDOF=Off build -- cgit v1.2.3 From 1ebf006b73c06d037e3d3ae4393136082195096d Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Wed, 27 Mar 2024 19:51:59 -0400 Subject: Remove dead googlemock dependency and related setup code --- autobuild.xml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 8d0797ad82..e00b18c3c6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -859,52 +859,6 @@ description glh - is a platform-indepenedent C++ OpenGL helper library - googlemock - - platforms - - darwin64 - - archive - - hash - dce3174b12136746f5f910e311e895c1b47bf8fb - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.2b109d4/googlemock-1.7.0.2b109d4-darwin64-2b109d4.tar.zst - - name - darwin64 - - windows64 - - archive - - hash - 265813f84b04c3b03f3d7d33e149b3d5e3cf31db - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.2b109d4/googlemock-1.7.0.2b109d4-windows64-2b109d4.tar.zst - - name - windows64 - - - license - BSD - license_file - LICENSES/gmock.txt - copyright - Copyright 2008, Google Inc. - version - 1.7.0.2b109d4 - name - googlemock - description - a library for writing and using C++ mock classes - gstreamer platforms -- cgit v1.2.3