From de70b18dd12ab1499e073a333231bdbb612d3ec0 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 1 Mar 2022 22:44:44 +0100 Subject: [PATCH 01/18] Linux; Update slvoice, include 32 bit libs. --- autobuild.xml | 4 ++-- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- indra/newview/viewer_manifest.py | 13 ++++--------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9f3a56a688..dd8efe8058 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3282,9 +3282,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 05c4debd4cccfea620fc7e6f9a190924 + a24f2457230e6c1353a5962973383b97 url - http://3p.firestormviewer.org/slvoice-3.2.0002.10426.302004-linux64-212691952.tar.bz2 + http://3p.firestormviewer.org/slvoice-3.2-linux64_bionic-220602051.tar.bz2 name linux64 diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 519f68b53e..00ca8ee473 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -223,7 +223,7 @@ elseif(LINUX) set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}") set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}") - set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}") + set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}/../../lib32/") set(vivox_libs libsndfile.so.1 libortp.so diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index da2328c404..7f641ee53e 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -2042,19 +2042,14 @@ class LinuxManifest(ViewerManifest): # Vivox runtimes # Currentelly, the 32-bit ones will work with a 64-bit client. - with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="bin"): + with self.prefix(src=os.path.join(pkgdir, 'bin32' ), dst="bin"): self.path("SLVoice") + with self.prefix(src=os.path.join(pkgdir ), dst="bin"): self.path("win32") self.path("win64") - with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"): - self.path("libortp.so") - self.path("libsndfile.so.1") - # Vivox wants this library even if it's present already in the viewer - self.path("libvivoxoal.so.1") - self.path("libvivoxsdk.so") - self.path("libvivoxplatform.so") - + with self.prefix(src=os.path.join(pkgdir, 'lib32' ), dst="lib32"): + self.path("*") def package_finish(self): # a standard map of strings for replacing in the templates From a92923c800ed683355b419d3425730ee8c796ee6 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 1 Mar 2022 22:47:40 +0100 Subject: [PATCH 02/18] Linux; Add build_data.json to symbols. Tweak symbol filenam to be closer to distribution tarball --- indra/newview/fs_viewer_manifest.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py index 04d75e6c1d..c41620b5be 100644 --- a/indra/newview/fs_viewer_manifest.py +++ b/indra/newview/fs_viewer_manifest.py @@ -194,10 +194,14 @@ class FSViewerManifest: def fs_save_breakpad_symbols(self, osname): from glob import glob import sys - from os.path import isdir + from os.path import isdir, join from shutil import rmtree import tarfile + components = ['Phoenix',self.app_name(),self.args.get('arch'),'.'.join(self.args['version'])] + symbolsName = "_".join(components) + symbolsName = symbolsName + "_" + self.args["viewer_flavor"] + "-" + osname + "-" + str(self.address_size) + ".tar.bz2" + if isdir( "symbols" ): rmtree( "symbols" ) @@ -213,12 +217,7 @@ class FSViewerManifest: if isdir( "symbols" ): for a in self.args: print("%s: %s" % (a, self.args[a])) - symbolsName = "%s/Phoenix_%s_%s_%s_symbols-%s-%d.tar.bz2" % (self.args['configuration'].lower(), - self.fs_channel_legacy_oneword(), - '-'.join( self.args['version'] ), - self.args['viewer_flavor'], - osname, - self.address_size) fTar = tarfile.open( symbolsName, "w:bz2") fTar.add("symbols", arcname=".") + fTar.add( join( self.args["dest"], "build_data.json" ), arcname="build_data.json" ) From ba12815f7cd167afc855bb1c9ae045a6df27519e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 2 Mar 2022 13:56:13 +0100 Subject: [PATCH 03/18] Let's just use add_compile_definitions because... future and stuff... --- indra/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 646ff1cfa2..d63ecfbf3a 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -4,7 +4,7 @@ # other commands to guarantee full compatibility # with the version specified ## 3.8 added VS_DEBUGGER_WORKING_DIRECTORY support -cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR) set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING "The root project/makefile/solution name. Defaults to SecondLife.") @@ -28,9 +28,9 @@ endif (NOT CMAKE_BUILD_TYPE) # option(OPENSIM "OpenSim support" OFF) if (OPENSIM) - add_definitions(-DOPENSIM=1) + add_compile_definitions(OPENSIM) if (SINGLEGRID) - add_definitions(-DSINGLEGRID=1 -DSINGLEGRID_URI=\"${SINGLEGRID_URI}\") + add_compile_definitions(SINGLEGRID SINGLEGRID_URI=\"${SINGLEGRID_URI}\") message(STATUS "Compiling with OpenSim support - Single Grid version (${SINGLEGRID_URI})") else (SINGLEGRID) message(STATUS "Compiling with OpenSim support") @@ -43,7 +43,7 @@ else (OPENSIM) endif (OPENSIM) if (HAVOK_TPV) - add_definitions(-DHAVOK_TPV=1) + add_compile_definitions(HAVOK_TPV) message(STATUS "Compiling with Havok libraries") endif (HAVOK_TPV) # @@ -51,7 +51,7 @@ endif (HAVOK_TPV) # Support for test builds option(TESTBUILD "Generating test build" OFF) if(TESTBUILD AND TESTBUILDPERIOD) - add_definitions(-DTESTBUILD=1 -DTESTBUILDPERIOD=${TESTBUILDPERIOD}) + add_compile_definitions(TESTBUILD TESTBUILDPERIOD=${TESTBUILDPERIOD}) message(STATUS "Creating test build version; test period: ${TESTBUILDPERIOD} days") endif(TESTBUILD AND TESTBUILDPERIOD) # @@ -63,11 +63,11 @@ if (USE_AVX_OPTIMIZATION) if (USE_AVX2_OPTIMIZATION) message(FATAL_ERROR "You cannot use AVX and AVX2 at the same time!") else (USE_AVX2_OPTIMIZATION) - add_definitions(-DUSE_AVX_OPTIMIZATION=1) + add_compile_definitions(USE_AVX_OPTIMIZATION) message(STATUS "Compiling with AVX optimizations") endif (USE_AVX2_OPTIMIZATION) elseif (USE_AVX2_OPTIMIZATION) - add_definitions(-DUSE_AVX2_OPTIMIZATION=1) + add_compile_definitions(USE_AVX2_OPTIMIZATION) message(STATUS "Compiling with AVX2 optimizations") else (USE_AVX_OPTIMIZATION) message(STATUS "Compiling without AVX optimizations") From c5d16fe1e28f1cb85df3790c526914d8c0b280e4 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 2 Mar 2022 14:45:25 +0100 Subject: [PATCH 04/18] Add missing brace. --- indra/llcommon/tests/lleventcoro_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp index ccc4d82b34..4a1d4b8ba9 100644 --- a/indra/llcommon/tests/lleventcoro_test.cpp +++ b/indra/llcommon/tests/lleventcoro_test.cpp @@ -216,6 +216,7 @@ namespace tut } void test_data::postAndWait1() + { BEGIN { mSync.bump(); From 0dfe0f888e30e5fb057b4dbf9eef4684776b41e7 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 2 Mar 2022 14:46:06 +0100 Subject: [PATCH 05/18] Add pragma for GCC --- indra/llcommon/tests/llerror_test.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 148c18aabe..d4ca7bce65 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -61,6 +61,9 @@ namespace { #ifdef __clang__ # pragma clang diagnostic ignored "-Wunused-function" +#endif +#if __GNUC__ +#pragma GCC diagnostic ignored "-Wunused-function" #endif void test_that_error_h_includes_enough_things_to_compile_a_message() { From 1a774cf71a420bb6357e0ddf3d67613e62cf3ab0 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 2 Mar 2022 14:47:59 +0100 Subject: [PATCH 06/18] Add pragma for GCC --- indra/test/lltut.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/test/lltut.h b/indra/test/lltut.h index 9835565bb6..fd5d70462c 100644 --- a/indra/test/lltut.h +++ b/indra/test/lltut.h @@ -79,10 +79,18 @@ namespace tut #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-function" #endif +#if __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-function" +#endif + #include #if __clang__ #pragma clang diagnostic pop #endif +#if __GNUC__ +#pragma GCC diagnostic pop +#endif // The functions BELOW this point actually consume tut.hpp functionality. namespace tut From 974c00f6de29a67387381fc91197b1d47f5efe3f Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 2 Mar 2022 14:49:29 +0100 Subject: [PATCH 07/18] Add apr so's to be copyed into sharedlibs --- indra/cmake/Copy3rdPartyLibs.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 00ca8ee473..34a7c3f18d 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -255,6 +255,8 @@ elseif(LINUX) libuuid.so.16.0.22 libfontconfig.so.1.8.0 libfontconfig.so.1 + libaprutil-1.so.0 + libapr-1.so.0 ) else (NOT USESYSTEMLIBS) set(release_files From 4525ae3901d024a4c1ecd4db76493e1f7d9abc7b Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 2 Mar 2022 15:54:23 +0100 Subject: [PATCH 08/18] Use add_compile_definitions with cmake 3.12.0 now being a thing of the present. --- indra/cmake/bugsplat.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index ce61b51b9b..0f5f283f6b 100644 --- a/indra/cmake/bugsplat.cmake +++ b/indra/cmake/bugsplat.cmake @@ -36,9 +36,7 @@ if (USE_BUGSPLAT) if( LINUX ) set(BUGSPLAT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/breakpad) - # Sadly we cannot have the nice things yet and need add_definitions for older cmake - #add_compile_definitions(__STDC_FORMAT_MACROS) - add_definitions(-D__STDC_FORMAT_MACROS) + add_compile_definitions(__STDC_FORMAT_MACROS) else() set(BUGSPLAT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/bugsplat) endif() From 7f90c30bd62f670aaf68edf0a5a82bdc24a15415 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Wed, 2 Mar 2022 20:44:25 +0100 Subject: [PATCH 09/18] FIRE-31439 French translation update, by Laurent Bechir --- .../xui/fr/floater_scene_load_stats.xml | 8 ++- .../skins/default/xui/fr/notifications.xml | 36 ++++++++++++ .../xui/fr/panel_group_creation_sidetray.xml | 58 +++++++++++++++++++ 3 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml diff --git a/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml index 3889b13f0c..c0bf186b60 100644 --- a/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml +++ b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml @@ -1,5 +1,5 @@ - +