From 4d7fb2fb417a3ea27028acc27fcb93e22d0b3919 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 27 Apr 2025 19:30:33 +0800 Subject: One Collada DOM try_compile for all platforms On macOS, it's static library too, now, hence the stream editing is done out of any platform scope (which it's still needed because BUILD_SHARED_LIBS is ignored), and the (so)versions don't need to be set any more. CMAKE_INSTALL_LIBDIR is also ignored, hence the libcollada14dom.a moving. --- indra/newview/FixBundle.cmake.in | 4 ---- indra/newview/FixPackage.cmake.in | 4 ---- 2 files changed, 8 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 7f06249224..e2fa244577 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -187,9 +187,6 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libcollada14dom.2.3-r8.dylib - -thin ${CMAKE_OSX_ARCHITECTURES} - -output libcollada14dom.2.3-r8.dylib COMMAND lipo libexpat.1.10.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libexpat.1.10.0.dylib @@ -288,7 +285,6 @@ execute_process( Frameworks/libbrotlicommon.1.1.0.dylib Frameworks/libbrotlidec.1.1.0.dylib Frameworks/libbz2.1.0.8.dylib - Frameworks/libcollada14dom.2.3-r8.dylib Frameworks/libexpat.1.10.0.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 074a6e5815..909e07885d 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -187,9 +187,6 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libcollada14dom.2.3-r8.dylib - -thin ${CMAKE_OSX_ARCHITECTURES} - -output libcollada14dom.2.3-r8.dylib COMMAND lipo libexpat.1.10.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libexpat.1.10.0.dylib @@ -288,7 +285,6 @@ execute_process( Frameworks/libbrotlicommon.1.1.0.dylib Frameworks/libbrotlidec.1.1.0.dylib Frameworks/libbz2.1.0.8.dylib - Frameworks/libcollada14dom.2.3-r8.dylib Frameworks/libexpat.1.10.0.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib -- cgit v1.3 From b5c230ab68f6c3e10acb53f4e186c44812696957 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 27 Apr 2025 20:03:09 +0800 Subject: Replace {.._DIR}/lib/release with ARCH_PREBUILT_DIRS_RELEASE Shorter. --- indra/cmake/FMODSTUDIO.cmake | 8 ++++---- indra/cmake/WebRTC.cmake | 6 +++--- indra/media_plugins/cef/CMakeLists.txt | 12 ++++++------ indra/newview/ViewerInstall.cmake | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'indra/newview') diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake index d97251885f..35ce932c1a 100644 --- a/indra/cmake/FMODSTUDIO.cmake +++ b/indra/cmake/FMODSTUDIO.cmake @@ -31,7 +31,7 @@ if (USE_FMODSTUDIO) # as accessing the private LL location will fail if you don't have the credential include(Prebuilt) if (USESYSTEMLIBS AND (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/fmodstudio_installed OR NOT ${fmodstudio_installed} EQUAL 0)) - file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release) + file(MAKE_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}) if (DARWIN) execute_process( COMMAND hdiutil attach -noverify fmodstudioapi20228mac-installer.dmg @@ -53,7 +53,7 @@ if (USE_FMODSTUDIO) COMMAND lipo lib/libfmod.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output ${LIBS_PREBUILT_DIR}/lib/release/libfmod.dylib + -output ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.dylib WORKING_DIRECTORY /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core ) execute_process( @@ -85,7 +85,7 @@ if (USE_FMODSTUDIO) ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/arm64/libfmod.so ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/arm64/libfmod.so.13 ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/arm64/libfmod.so.13.28 - DESTINATION ${LIBS_PREBUILT_DIR}/lib/release + DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE} FOLLOW_SYMLINK_CHAIN ) else () @@ -94,7 +94,7 @@ if (USE_FMODSTUDIO) ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13 ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.28 - DESTINATION ${LIBS_PREBUILT_DIR}/lib/release + DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE} FOLLOW_SYMLINK_CHAIN ) endif (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index a5c821f32a..19457924d8 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -65,13 +65,13 @@ elseif (NOT (WINDOWS OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)) endforeach() file(RENAME ${LIBS_PREBUILT_DIR}/lib/libwebrtc.a - ${LIBS_PREBUILT_DIR}/lib/release/libwebrtc.a + ${ARCH_PREBUILT_DIRS_RELEASE}/libwebrtc.a ) if (CMAKE_OSX_ARCHITECTURES MATCHES arm64) - file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/lib/release/WebRTC.framework) + file(REMOVE_RECURSE ${ARCH_PREBUILT_DIRS_RELEASE}/WebRTC.framework) file(RENAME ${LIBS_PREBUILT_DIR}/Frameworks/WebRTC.xcframework/${WEBRTC_PLATFORM}/WebRTC.framework - ${LIBS_PREBUILT_DIR}/lib/release/WebRTC.framework + ${ARCH_PREBUILT_DIRS_RELEASE}/WebRTC.framework ) file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/Frameworks) endif (CMAKE_OSX_ARCHITECTURES MATCHES arm64) diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index bf1e990450..99810d77d8 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -140,15 +140,15 @@ if (INSTALL) if (DARWIN) set(_LIB llplugin) install( - DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework" + DIRECTORY "${ARCH_PREBUILT_DIRS_RELEASE}/Chromium Embedded Framework.framework" DESTINATION ../Frameworks ) install( DIRECTORY - "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app" - "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app" - "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app" - "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app" + "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper.app" + "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper (GPU).app" + "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper (Plugin).app" + "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper (Renderer).app" DESTINATION SLPlugin.app/Contents/Frameworks ) elseif (LINUX) @@ -178,7 +178,7 @@ if (INSTALL) endif (${LINUX_DISTRO} MATCHES arch) install( FILES - ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so + ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.so ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 4716cdde36..1281136cef 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -66,7 +66,7 @@ if (DARWIN) if (NDOF) install(FILES - "${AUTOBUILD_INSTALL_DIR}/lib/release/libndofdev.dylib" + "${ARCH_PREBUILT_DIRS_RELEASE}/libndofdev.dylib" DESTINATION . ) endif () @@ -110,9 +110,9 @@ if (LINUX) endif () if (USE_FMODSTUDIO) install(FILES - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.28 + ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so + ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13 + ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13.28 DESTINATION ${_LIB}) endif (USE_FMODSTUDIO) endif (LINUX) -- cgit v1.3 From b04cc0b90ab93141d3ffc77bceb241da41c37ace Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 27 Apr 2025 20:21:11 +0800 Subject: Add dependency on libgles-dev on Debian/Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Jenni Windrider for the bug report and solution. On startup, the log gets flooded with: [0426/150813.911339:ERROR:viz_main_impl.cc(196)] Exiting GPU process due to errors during initialization [0426/150813.918965:ERROR:egl_util.cc(44)] Failed to load GLES library: /usr/lib/x86_64-linux-gnu/libGLESv2.so: /usr/lib/x86_64-linux-gnu/libGLESv2.so: cannot open shared object file: No such file or directory doing a ls shows there's indeed no libGLESv2.so: ll /usr/lib/x86_64-linux-gnu/libGLESv2* - rw-r--r-- root root 110.39K 18.Mar'25 15:10  libGLESv2_nvidia.so.2 - rw-r--r-- root root 110.39K 18.Mar'25 15:10  libGLESv2_nvidia.so.570.133.07 - rw-r--r-- root root 70.30K 08.Apr'24 10:04  libGLESv2.so.2 - rw-r--r-- root root 70.30K 08.Apr'24 10:04  libGLESv2.so.2.1.0 The package that provides this isn't installed by default: apt-file search libGLESv2.so libgles-dev: /usr/lib/x86_64-linux-gnu/libGLESv2.so So installing libgles-dev fixes that. --- indra/newview/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 8d7f37142f..b6100c05bc 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2167,11 +2167,11 @@ if (LINUX) CACHE STRING "Debian package section.") if (${LINUX_DISTRO} MATCHES debian) set(CPACK_DEBIAN_PACKAGE_DEPENDS - "libalut0, libaprutil1, libboost-fiber1.81.0, libboost-filesystem1.81.0, libboost-program-options1.81.0, libboost-regex1.81.0, libboost-thread1.81.0, libboost-url1.81.0, libexpat1, libfltk1.3, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1, libnghttp2-14, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" + "libalut0, libaprutil1, libboost-fiber1.81.0, libboost-filesystem1.81.0, libboost-program-options1.81.0, libboost-regex1.81.0, libboost-thread1.81.0, libboost-url1.81.0, libexpat1, libfltk1.3, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1, libnghttp2-14, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" CACHE STRING "Debian package dependencies.") elseif (${LINUX_DISTRO} MATCHES ubuntu) set(CPACK_DEBIAN_PACKAGE_DEPENDS - "libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.3t64, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1, libnghttp2-14, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" + "libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.3t64, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1, libnghttp2-14, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" CACHE STRING "Debian package dependencies.") endif (${LINUX_DISTRO} MATCHES debian) elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)) -- cgit v1.3