diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 87678aa91a..56a87d7032 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -173,7 +173,7 @@ jobs: velopack_mac_bundle_id: ${{ steps.build.outputs.velopack_mac_bundle_id }} env: # Sets Xcode version used for build - DEVELOPER_DIR: "/Applications/Xcode_26.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode_26.6.app/Contents/Developer" # Ensure that Linden viewer builds engage Bugsplat. BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }} # Decide if we're building tests or the viewer @@ -334,17 +334,17 @@ jobs: Windows) cmake_preset_name="vs2026$cmake_preset_postfix" build_directory="build-Windows-$cmake_preset_name" - vcpkg_triplet="x64-windows-secondlife-release" + vcpkg_triplet="x64-windows-alchemy-release" ;; macOS) cmake_preset_name="ninja$cmake_preset_postfix-$BUILD_ARCH" build_directory="build-Darwin-$cmake_preset_name" - vcpkg_triplet="$BUILD_ARCH-osx-secondlife-release" + vcpkg_triplet="$BUILD_ARCH-osx-alchemy-release" ;; Linux) cmake_preset_name="ninja$cmake_preset_postfix" build_directory="build-Linux-$cmake_preset_name" - vcpkg_triplet="x64-linux-secondlife-release" + vcpkg_triplet="x64-linux-alchemy-release" ;; esac diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index dee010262e..769f3c8875 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -118,7 +118,7 @@ option(ENABLE_SIGNING "Enable signing the viewer" OFF) set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") # macOS deploy target(must be set BEFORE first project call) -set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum macOS version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") +set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0" CACHE STRING "Minimum macOS version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") # Set our supported configuration types set(CMAKE_CONFIGURATION_TYPES "Debug;OptDebug;RelWithDebInfo;Release" CACHE STRING "Supported build types.") diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index ce50d93e14..bfef7bae16 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -127,7 +127,7 @@ endif() if(WINDOWS) set(CMAKE_MSVC_RUNTIME_CHECKS "$<$:StackFrameErrorCheck;UninitializedVariable>") set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT $,EditAndContinue,ProgramDatabase>) - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") # Don't build DLLs. set(BUILD_SHARED_LIBS OFF) @@ -137,10 +137,8 @@ if(WINDOWS) $<$:/OPT:ICF> /DEBUG:FULL /LARGEADDRESSAWARE - /NODEFAULTLIB:LIBCMT - /NODEFAULTLIB:LIBCMTD - $<$:/NODEFAULTLIB:MSVCRTD> - $<$:/NODEFAULTLIB:MSVCRT> + $<$:/NODEFAULTLIB:LIBCMTD> + $<$:/NODEFAULTLIB:LIBCMT> ) add_compile_definitions( @@ -166,6 +164,10 @@ if(WINDOWS) $<$:DISABLE_WEBRTC=1> ) + if(DISABLE_WEBRTC) + add_compile_definitions(DISABLE_WEBRTC=1) + endif() + # Options shared between all configurations add_compile_options( /utf-8 # matches macOS and Linux behaviors and allows unicode in source files diff --git a/indra/cmake/BootstrapVcpkg.cmake b/indra/cmake/BootstrapVcpkg.cmake index 208cede903..0e77c487b3 100644 --- a/indra/cmake/BootstrapVcpkg.cmake +++ b/indra/cmake/BootstrapVcpkg.cmake @@ -33,12 +33,12 @@ if(NOT DEFINED VCPKG_TARGET_TRIPLET) if(WIN32) if(LL_GENERATOR_IS_MULTI_CONFIG) - set(VCPKG_TARGET_TRIPLET "x64-windows-secondlife") + set(VCPKG_TARGET_TRIPLET "x64-windows-alchemy") else() if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(VCPKG_TARGET_TRIPLET "x64-windows-secondlife") + set(VCPKG_TARGET_TRIPLET "x64-windows-alchemy") else() - set(VCPKG_TARGET_TRIPLET "x64-windows-secondlife-release") + set(VCPKG_TARGET_TRIPLET "x64-windows-alchemy-release") endif() endif() elseif(APPLE) @@ -49,33 +49,33 @@ if(NOT DEFINED VCPKG_TARGET_TRIPLET) endif() if(LL_GENERATOR_IS_MULTI_CONFIG) if(OS_PLATFORM STREQUAL arm64) - set(VCPKG_TARGET_TRIPLET "arm64-osx-secondlife") + set(VCPKG_TARGET_TRIPLET "arm64-osx-alchemy") else() - set(VCPKG_TARGET_TRIPLET "x64-osx-secondlife") + set(VCPKG_TARGET_TRIPLET "x64-osx-alchemy") endif() else() if(OS_PLATFORM STREQUAL arm64) if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(VCPKG_TARGET_TRIPLET "arm64-osx-secondlife") + set(VCPKG_TARGET_TRIPLET "arm64-osx-alchemy") else() - set(VCPKG_TARGET_TRIPLET "arm64-osx-secondlife-release") + set(VCPKG_TARGET_TRIPLET "arm64-osx-alchemy-release") endif() else() if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(VCPKG_TARGET_TRIPLET "x64-osx-secondlife") + set(VCPKG_TARGET_TRIPLET "x64-osx-alchemy") else() - set(VCPKG_TARGET_TRIPLET "x64-osx-secondlife-release") + set(VCPKG_TARGET_TRIPLET "x64-osx-alchemy-release") endif() endif() endif() else() if(LL_GENERATOR_IS_MULTI_CONFIG) - set(VCPKG_TARGET_TRIPLET "x64-linux-secondlife") + set(VCPKG_TARGET_TRIPLET "x64-linux-alchemy") else() if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(VCPKG_TARGET_TRIPLET "x64-linux-secondlife") + set(VCPKG_TARGET_TRIPLET "x64-linux-alchemy") else() - set(VCPKG_TARGET_TRIPLET "x64-linux-secondlife-release") + set(VCPKG_TARGET_TRIPLET "x64-linux-alchemy-release") endif() endif() endif() diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 92a6f0d9fd..c87b91cfda 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -5,7 +5,5 @@ add_library( ll::libcurl INTERFACE IMPORTED ) find_package(CURL REQUIRED) target_link_libraries(ll::libcurl INTERFACE CURL::libcurl) -if(LINUX OR DARWIN) - find_library(NGHTTP2_LIBRARIES nghttp2 REQUIRED) - target_link_libraries(ll::libcurl INTERFACE ${NGHTTP2_LIBRARIES}) -endif() +find_library(NGHTTP2_LIBRARIES nghttp2 REQUIRED) +target_link_libraries(ll::libcurl INTERFACE ${NGHTTP2_LIBRARIES}) diff --git a/indra/cmake/Collada-Dom.cmake b/indra/cmake/Collada-Dom.cmake index dd621c7446..68e31d07e8 100644 --- a/indra/cmake/Collada-Dom.cmake +++ b/indra/cmake/Collada-Dom.cmake @@ -8,11 +8,6 @@ find_path(COLLADA_DOM_INCLUDE_DIRS NAMES dae.h PATHS "${_VCPKG_INSTALLED_DIR}/${ target_include_directories(ll::colladadom SYSTEM INTERFACE "${COLLADA_DOM_INCLUDE_DIRS}" "${COLLADA_DOM_INCLUDE_DIRS}/1.4") -if(WINDOWS) - target_compile_definitions(ll::colladadom INTERFACE DOM_DYNAMIC=1) -endif() - - find_library(COLLADA14_LIBRARY_RELEASE NAMES collada14dom PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 65f0931f3d..d9c8f84e86 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -41,40 +41,40 @@ if(WINDOWS) set(vcpkg_lib_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin") # Files that vcpkg fails to automatically stage - set(release_libs "legacy.dll") # OpenSSL legacy engine + # set(release_libs "legacy.dll") # OpenSSL legacy engine #******************************* # Copy MS C runtime dlls, required for packaging. - set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) - include(InstallRequiredSystemLibraries) - - foreach(system_lib_file IN LISTS CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS) - get_filename_component(system_lib_directory ${system_lib_file} DIRECTORY) - get_filename_component(system_lib_filename ${system_lib_file} NAME ) - MESSAGE(DEBUG "Copying redist file from ${system_lib_directory}/${system_lib_filename}") - to_staging_dirs( - ${system_lib_directory} - third_party_targets - ${system_lib_filename} - ) - to_viewer_staging_dirs( - ${system_lib_directory} - third_party_targets - ${system_lib_filename} - ) - to_viewer_staging_subdirs( - "llplugin" - ${system_lib_directory} - third_party_targets - ${system_lib_filename} - ) - endforeach() - - to_viewer_staging_dirs( - ${vcpkg_lib_dir} - third_party_targets - ${release_libs} - ) + # set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) + # include(InstallRequiredSystemLibraries) + + # foreach(system_lib_file IN LISTS CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS) + # get_filename_component(system_lib_directory ${system_lib_file} DIRECTORY) + # get_filename_component(system_lib_filename ${system_lib_file} NAME ) + # MESSAGE(DEBUG "Copying redist file from ${system_lib_directory}/${system_lib_filename}") + # to_staging_dirs( + # ${system_lib_directory} + # third_party_targets + # ${system_lib_filename} + # ) + # to_viewer_staging_dirs( + # ${system_lib_directory} + # third_party_targets + # ${system_lib_filename} + # ) + # to_viewer_staging_subdirs( + # "llplugin" + # ${system_lib_directory} + # third_party_targets + # ${system_lib_filename} + # ) + # endforeach() + + # to_viewer_staging_dirs( + # ${vcpkg_lib_dir} + # third_party_targets + # ${release_libs} + # ) if(USE_FMODSTUDIO) list(APPEND fmod_libs diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 135a7331cb..fc4a897413 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -39,6 +39,7 @@ #include "lltrans.h" #include "llmutelist.h" #include "llnearbyvoicemoderation.h" +#include "llviewerregion.h" const F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f; @@ -186,10 +187,12 @@ void LLVoiceClient::userAuthorized(const std::string& user_id, const LLUUID &age void LLVoiceClient::handleSimulatorFeaturesReceived(const LLSD &simulatorFeatures) { std::string voiceServerType = simulatorFeatures["VoiceServerType"].asString(); +#ifndef DISABLE_WEBRTC if (voiceServerType.empty()) { voiceServerType = WEBRTC_VOICE_SERVER_TYPE; } +#endif if (mSpatialVoiceModule && !mNonSpatialVoiceModule) { @@ -600,12 +603,14 @@ LLVoiceP2POutgoingCallInterface *LLVoiceClient::getOutgoingCallInterface(const L LLVoiceVersionInfo versionInfo = LLVoiceClient::getInstance()->getVersion(); voice_server_type = versionInfo.internalVoiceServerType; } +#ifndef DISABLE_WEBRTC if (voiceChannelInfo.has("voice_server_type") && voiceChannelInfo["voice_server_type"] != voice_server_type) { // there's a mismatch between what the peer is offering and what our server // can handle, so default to webrtc voice_server_type = WEBRTC_VOICE_SERVER_TYPE; } +#endif LLVoiceModuleInterface *module = getVoiceModule(voice_server_type); return dynamic_cast(module); } diff --git a/indra/vcpkg.json b/indra/vcpkg.json index faa62f90dc..200d9f825f 100644 --- a/indra/vcpkg.json +++ b/indra/vcpkg.json @@ -1,5 +1,5 @@ { - "builtin-baseline": "cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3", + "builtin-baseline": "a0400024711b283056538ac19ced80b91a83c24c", "dependencies": [ "alchemy-branding", "alchemy-dictionaries", diff --git a/indra/vcpkg/ports/apr/vcpkg.json b/indra/vcpkg/ports/apr/vcpkg.json index 13c8e15caa..14daeccb6a 100644 --- a/indra/vcpkg/ports/apr/vcpkg.json +++ b/indra/vcpkg/ports/apr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "apr", "version": "1.7.6", + "port-version": 1, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", diff --git a/indra/vcpkg/ports/cef-bin/portfile.cmake b/indra/vcpkg/ports/cef-bin/portfile.cmake index de58461344..4b2a4a2070 100644 --- a/indra/vcpkg/ports/cef-bin/portfile.cmake +++ b/indra/vcpkg/ports/cef-bin/portfile.cmake @@ -42,11 +42,17 @@ vcpkg_extract_source_archive( ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_configure( - SOURCE_PATH ${CEF_SOURCE_PATH} - OPTIONS - -DCEF_RUNTIME_LIBRARY_FLAG="/MD" - ) + if(VCPKG_CRT_LINKAGE MATCHES "dynamic") + vcpkg_cmake_configure( + SOURCE_PATH ${CEF_SOURCE_PATH} + OPTIONS + -DCEF_RUNTIME_LIBRARY_FLAG="/MD" + ) + else() + vcpkg_cmake_configure( + SOURCE_PATH ${CEF_SOURCE_PATH} + ) + endif() elseif(VCPKG_TARGET_IS_OSX) vcpkg_cmake_configure( SOURCE_PATH ${CEF_SOURCE_PATH} diff --git a/indra/vcpkg/ports/faudio/portfile.cmake b/indra/vcpkg/ports/faudio/portfile.cmake index adce2a1a4b..f4c169b380 100644 --- a/indra/vcpkg/ports/faudio/portfile.cmake +++ b/indra/vcpkg/ports/faudio/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FNA-XNA/faudio REF "${FAUDIO_REF}" - SHA512 523298017bfbcea2739a18406ed6860e45713049b503558e91f5e6de98993c6e6654c7358bc861a9337d74a12a0cd89f5ecac49ae9734b4856384062a64c79d0 + SHA512 e2efecf88bf62232da7b3ac04e21c19ae801ebe05c185c4b1775e2deae7dc9d95de7140ef5759439ca94b6cb4cf3a03cc08cf84c781d0d8a906964ee36876cbc HEAD_REF master PATCHES # Apple's arm64 linker (Xcode 26+) rejects merged globals where a diff --git a/indra/vcpkg/ports/faudio/vcpkg.json b/indra/vcpkg/ports/faudio/vcpkg.json index 2f09d1e839..df7d37070a 100644 --- a/indra/vcpkg/ports/faudio/vcpkg.json +++ b/indra/vcpkg/ports/faudio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "faudio", - "version": "26.5", - "port-version": 1, + "version": "26.6", "description": "FAudio - accuracy-focused XAudio reimplementation for open platforms", "homepage": "https://fna-xna.github.io/", "license": "Zlib", diff --git a/indra/vcpkg/ports/freetype/portfile.cmake b/indra/vcpkg/ports/freetype/portfile.cmake index df53b7dacb..cc039386bd 100644 --- a/indra/vcpkg/ports/freetype/portfile.cmake +++ b/indra/vcpkg/ports/freetype/portfile.cmake @@ -16,7 +16,6 @@ vcpkg_from_gitlab( brotli-static.patch bzip2.patch fix-exports.patch - harffbuzzwin.patch ${SUBPIXEL_RENDERING_PATCH} ) @@ -34,21 +33,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS brotli FT_DISABLE_BROTLI ) -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DFT_DYNAMIC_HARFBUZZ=ON - ${FEATURE_OPTIONS} - ) -else() - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DFT_DISABLE_HARFBUZZ=ON - ${FEATURE_OPTIONS} - ) -endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFT_DISABLE_HARFBUZZ=ON + ${FEATURE_OPTIONS} +) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/indra/vcpkg/ports/tracy/portfile.cmake b/indra/vcpkg/ports/tracy/portfile.cmake index d09c390cf6..0990d151e2 100644 --- a/indra/vcpkg/ports/tracy/portfile.cmake +++ b/indra/vcpkg/ports/tracy/portfile.cmake @@ -46,7 +46,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() # Need to manually fix debug file locations on windows if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/bin/Debug/TracyClient.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/TracyClient.dll") + if(VCPKG_LIBRARY_LINKAGE MATCHES "static") + file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/Debug/TracyClient.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/TracyClient.lib") + else() + file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/bin/Debug/TracyClient.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/TracyClient.dll") + endif() endif() vcpkg_copy_pdbs() diff --git a/indra/vcpkg/ports/webrtc-bin/portfile.cmake b/indra/vcpkg/ports/webrtc-bin/portfile.cmake index ef35d41f63..0619416e6a 100644 --- a/indra/vcpkg/ports/webrtc-bin/portfile.cmake +++ b/indra/vcpkg/ports/webrtc-bin/portfile.cmake @@ -7,9 +7,9 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile( WEBRTC_ARCHIVE - URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r10/webrtc.windows_x86_64.tar.xz + URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r11/webrtc.windows_x86_64.tar.xz FILENAME webrtc.${VERSION}.windows_x86_64.tar.xz - SHA512 f4215881234c9d2b64ee7c21ed5d321952ab1de73e9511846a994d9cc4d76d7e4dccbd3c5e87e7d2068f9871bee7833669d4a0a90cce4482a3d79905cf40bc97 + SHA512 fa44150d94976c346501be8213689abb4220f4b75ae3ed5526776d9c6982337eaebf2396a5a8cf467e402e3e5707a952cd9f702e39d9129d480a514d12dc23f2 ) elseif(VCPKG_TARGET_IS_OSX) set(WEBRTC_LIBNAME "libwebrtc.a") @@ -17,16 +17,16 @@ elseif(VCPKG_TARGET_IS_OSX) if(VCPKG_OSX_ARCHITECTURES MATCHES "arm64") vcpkg_download_distfile( WEBRTC_ARCHIVE - URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r10/webrtc.macos_arm64.tar.xz + URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r11/webrtc.macos_arm64.tar.xz FILENAME webrtc.${VERSION}.macos_arm64.tar.xz - SHA512 64f0dd819f33a446c480a56897ffb928abdaedb745bd021f1efed50f790ad3ffbefb7b1655ba6f91ac6f7490fb4d4f66892d1882e03a27077a1f4078ffc97ab5 + SHA512 e67da2870f3b4b4031c89bd828f7b9705397423728d801314de0e17b95296535eaed5132b8dece50faa8f2d599851bc8ce3fd0bd2e911ec5f38d58d65664fb73 ) else() vcpkg_download_distfile( WEBRTC_ARCHIVE - URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r10/webrtc.macos_x86_64.tar.xz + URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r11/webrtc.macos_x86_64.tar.xz FILENAME webrtc.${VERSION}.macos_x86_64.tar.xz - SHA512 53e831d19c4bcd41145d7f183dfbe401da153dbc311ea8d26b3bdef146cb1349e7792a8b1f94098eebd88fe74801f465344167d6a8b06f99d06f01fa6286ea2e + SHA512 804a742da02f2e179a58f163de72db2b438c7a16ba82170b48dff78468a6145815db8566c9acbe22c342de523c2a9bb02a4fb4140e2a549bd0fdc069091b6d87 ) endif() elseif(VCPKG_TARGET_IS_LINUX) @@ -34,9 +34,9 @@ elseif(VCPKG_TARGET_IS_LINUX) vcpkg_download_distfile( WEBRTC_ARCHIVE - URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r10/webrtc.ubuntu-22.04_x86_64.tar.xz + URLS https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r11/webrtc.ubuntu-22.04_x86_64.tar.xz FILENAME webrtc.${VERSION}.ubuntu-22.04_x86_64.tar.xz - SHA512 7a7c248929055b0026cf9362188848a4e5624c9ceb149ae3b2f4a27c2e15e41c9063ac20a87c2a6e140fd3ad5c46b010f12be9ab076f383ed871c534bf51403e + SHA512 c20db361a98837dfb914821e97e0b813dc6856ebc2492521546f8cb4af45c820ac93d244c00973012d7ba3e84455c4bf80b291f5982785ed6b10cb55688a6f73 ) endif() diff --git a/indra/vcpkg/ports/webrtc-bin/vcpkg.json b/indra/vcpkg/ports/webrtc-bin/vcpkg.json index 69b3a18eaf..a2b552e1be 100644 --- a/indra/vcpkg/ports/webrtc-bin/vcpkg.json +++ b/indra/vcpkg/ports/webrtc-bin/vcpkg.json @@ -1,5 +1,5 @@ { "name": "webrtc-bin", - "version-string": "137.7151.0423-r10", + "version-string": "137.7151.0423-r11", "license": "MIT" } diff --git a/indra/vcpkg/ports/zlib/portfile.cmake b/indra/vcpkg/ports/zlib/portfile.cmake index 5ec9f3e96a..35103360ff 100644 --- a/indra/vcpkg/ports/zlib/portfile.cmake +++ b/indra/vcpkg/ports/zlib/portfile.cmake @@ -23,6 +23,14 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib" "${CURRENT_PACKAGES_DIR}/lib/zs.lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/zsd.lib") + endif() +endif() # Condition in `WIN32`, from https://github.com/zlib-ng/zlib-ng/blob/2.1.5/CMakeLists.txt#L1081-L1100 # (dynamic) for `zlib` or (static `MSVC) for `zlibstatic` or default `z` @@ -39,7 +47,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND (NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static AND V if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(_port_output_name "zlib${_port_suffix}") else() - set(_port_output_name "zlibstatic${_port_suffix}") + set(_port_output_name "zs${_port_suffix}") endif() # CMAKE_DEBUG_POSTFIX from https://github.com/zlib-ng/zlib-ng/blob/2.1.5/CMakeLists.txt#L494 diff --git a/indra/vcpkg/ports/zlib/vcpkg-cmake-wrapper.cmake b/indra/vcpkg/ports/zlib/vcpkg-cmake-wrapper.cmake index 868a41851a..96cac06cd8 100644 --- a/indra/vcpkg/ports/zlib/vcpkg-cmake-wrapper.cmake +++ b/indra/vcpkg/ports/zlib/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,6 @@ find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) -find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z zs PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_DEBUG NAMES zlib zlibd z zd zsd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) if(NOT ZLIB_INCLUDE_DIR OR NOT (ZLIB_LIBRARY_RELEASE OR ZLIB_LIBRARY_DEBUG)) message(FATAL_ERROR "Broken installation of vcpkg port zlib") endif() diff --git a/indra/vcpkg/ports/zlib/vcpkg.json b/indra/vcpkg/ports/zlib/vcpkg.json index f64fa3a361..20632593c1 100644 --- a/indra/vcpkg/ports/zlib/vcpkg.json +++ b/indra/vcpkg/ports/zlib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zlib", "version": "2.3.3", + "port-version": 1, "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/indra/vcpkg/triplets/arm64-osx-secondlife-release.cmake b/indra/vcpkg/triplets/arm64-osx-alchemy-release.cmake similarity index 90% rename from indra/vcpkg/triplets/arm64-osx-secondlife-release.cmake rename to indra/vcpkg/triplets/arm64-osx-alchemy-release.cmake index 878723e97e..4776736bc2 100644 --- a/indra/vcpkg/triplets/arm64-osx-secondlife-release.cmake +++ b/indra/vcpkg/triplets/arm64-osx-alchemy-release.cmake @@ -6,7 +6,7 @@ set(VCPKG_BUILD_TYPE release) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES arm64) -set(VCPKG_OSX_DEPLOYMENT_TARGET 12.0) +set(VCPKG_OSX_DEPLOYMENT_TARGET 14.0) if(PORT MATCHES "hunspell") set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/indra/vcpkg/triplets/arm64-osx-secondlife.cmake b/indra/vcpkg/triplets/arm64-osx-alchemy.cmake similarity index 89% rename from indra/vcpkg/triplets/arm64-osx-secondlife.cmake rename to indra/vcpkg/triplets/arm64-osx-alchemy.cmake index 173d3de9c8..6af62c740e 100644 --- a/indra/vcpkg/triplets/arm64-osx-secondlife.cmake +++ b/indra/vcpkg/triplets/arm64-osx-alchemy.cmake @@ -5,7 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES arm64) -set(VCPKG_OSX_DEPLOYMENT_TARGET 12.0) +set(VCPKG_OSX_DEPLOYMENT_TARGET 14.0) if(PORT MATCHES "hunspell") set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/indra/vcpkg/triplets/x64-linux-secondlife-release.cmake b/indra/vcpkg/triplets/x64-linux-alchemy-release.cmake similarity index 100% rename from indra/vcpkg/triplets/x64-linux-secondlife-release.cmake rename to indra/vcpkg/triplets/x64-linux-alchemy-release.cmake diff --git a/indra/vcpkg/triplets/x64-linux-secondlife.cmake b/indra/vcpkg/triplets/x64-linux-alchemy.cmake similarity index 100% rename from indra/vcpkg/triplets/x64-linux-secondlife.cmake rename to indra/vcpkg/triplets/x64-linux-alchemy.cmake diff --git a/indra/vcpkg/triplets/x64-osx-secondlife-release.cmake b/indra/vcpkg/triplets/x64-osx-alchemy-release.cmake similarity index 90% rename from indra/vcpkg/triplets/x64-osx-secondlife-release.cmake rename to indra/vcpkg/triplets/x64-osx-alchemy-release.cmake index 950934e6bb..adc1972035 100644 --- a/indra/vcpkg/triplets/x64-osx-secondlife-release.cmake +++ b/indra/vcpkg/triplets/x64-osx-alchemy-release.cmake @@ -6,7 +6,7 @@ set(VCPKG_BUILD_TYPE release) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES x86_64) -set(VCPKG_OSX_DEPLOYMENT_TARGET 12.0) +set(VCPKG_OSX_DEPLOYMENT_TARGET 14.0) if(PORT MATCHES "hunspell") set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/indra/vcpkg/triplets/x64-osx-secondlife.cmake b/indra/vcpkg/triplets/x64-osx-alchemy.cmake similarity index 89% rename from indra/vcpkg/triplets/x64-osx-secondlife.cmake rename to indra/vcpkg/triplets/x64-osx-alchemy.cmake index 43866dedd7..e0a7ffdc0f 100644 --- a/indra/vcpkg/triplets/x64-osx-secondlife.cmake +++ b/indra/vcpkg/triplets/x64-osx-alchemy.cmake @@ -5,7 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES x86_64) -set(VCPKG_OSX_DEPLOYMENT_TARGET 12.0) +set(VCPKG_OSX_DEPLOYMENT_TARGET 14.0) if(PORT MATCHES "hunspell") set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/indra/vcpkg/triplets/x64-windows-secondlife-release.cmake b/indra/vcpkg/triplets/x64-windows-alchemy-release.cmake similarity index 61% rename from indra/vcpkg/triplets/x64-windows-secondlife-release.cmake rename to indra/vcpkg/triplets/x64-windows-alchemy-release.cmake index 55f2af82be..83b7dce984 100644 --- a/indra/vcpkg/triplets/x64-windows-secondlife-release.cmake +++ b/indra/vcpkg/triplets/x64-windows-alchemy-release.cmake @@ -1,6 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_BUILD_TYPE release) set(VCPKG_C_FLAGS_RELEASE "") @@ -9,3 +9,7 @@ set(VCPKG_CXX_FLAGS_RELEASE "/std:c++20 /Zc:__cplusplus") if(PORT MATCHES "faudio") set(VCPKG_LIBRARY_LINKAGE static) endif() + +if(PORT MATCHES "openal-soft") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/indra/vcpkg/triplets/x64-windows-secondlife.cmake b/indra/vcpkg/triplets/x64-windows-alchemy.cmake similarity index 57% rename from indra/vcpkg/triplets/x64-windows-secondlife.cmake rename to indra/vcpkg/triplets/x64-windows-alchemy.cmake index 51488d5b0f..bd20f36fdb 100644 --- a/indra/vcpkg/triplets/x64-windows-secondlife.cmake +++ b/indra/vcpkg/triplets/x64-windows-alchemy.cmake @@ -1,6 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_C_FLAGS_RELEASE "") set(VCPKG_CXX_FLAGS_RELEASE "/std:c++20 /Zc:__cplusplus") @@ -8,3 +8,7 @@ set(VCPKG_CXX_FLAGS_RELEASE "/std:c++20 /Zc:__cplusplus") if(PORT MATCHES "faudio") set(VCPKG_LIBRARY_LINKAGE static) endif() + +if(PORT MATCHES "openal-soft") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/vcpkg b/vcpkg index cd61e1e26a..a040002471 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3 +Subproject commit a0400024711b283056538ac19ced80b91a83c24c