summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2025-10-28Merge branch 'main' into 2025.08Erik Kundiman
2025-10-28FMOD has been upgradedErik Kundiman
2025-10-26Merge tag 'Second_Life_Release#4e2a9667-2025.08' into 2025.08Erik Kundiman
2025-10-25Merge tag 'Second_Life_Release#01823996-2025.08' into 2025.08Erik Kundiman
2025-10-23FreeBSD Ports Boost just got upgraded to 1.89Erik Kundiman
2025-10-22Arch's Boost just got upgraded to 1.89Erik Kundiman
2025-10-20Rework new convex decomp into a physicsextensions stub package and fix havok ↵Rye
and havok_tpv builds for darwin universal to utilize new vhacd stub (#4858)
2025-10-17Merge remote-tracking branch 'origin/main' into geenz/main-to-developJonathan "Geenz" Goodman
2025-10-16Fix erroneous check for __attribute__ definition introduced with APR 1.7.5Ansariel
With the update of APR to versoin 1.7.5., we have to deal with an erroneous check for the definition of __attribute__ added to the APR head file apr.h: The additional check for the definition of __has_attribute is nonsense as it is a C++ internal macro to check for the existance of certain attributes, however it has nothing to do with __attribute__ used in this context. Since __attribute__ is not defined in MSVC, the modified, erroneous check now causes said definition becoming missing, resulting in a huge amount of "this declaration may not have extern 'C' linkage" errors within in MSVC. This change utilizes CMake to patch the extracted APR header file, restoring the original version of the check.
2025-10-11Fix WebRTC & Havok linking on macOS x86-64Erik Kundiman
It wouldn't automatically detect the prebuilt libraries directory, might be because of the older build environment I have for building the macOS x86-64 binary.
2025-10-10Merge branch 'main' into 2025.07Erik Kundiman
2025-10-10Tumbleweed & vcpkg Boost has been upgraded to 1.89Erik Kundiman
and boost-system is now header only.
2025-10-10Use MacPorts' Boost 1.88 instead of its Boost 1.87Erik Kundiman
Now that MacPorts' newest Boost version is 1.88.
2025-10-09Merge tag 'Second_Life_Release#95337dfc-2025.07' into 2025.07Erik Kundiman
2025-10-05lipo thin SLv macOS universal librariesErik Kundiman
The fatal errors when lipo thinning something that's already thin, can be safely ignored.
2025-10-03Initial VHACD based llconvexdecompositionRye
2025-10-03Loosen Boost find_packageErik Kundiman
It couldn't find Boost now, somehow, at least on Debian Asahi.
2025-10-03Fix cURL failing to link to OpenSSL on Linux/BSDErik Kundiman
when linking the final executable. Basically bringing back previous code, but exempting Darwin cause somehow the extra target link broke CEF.
2025-10-03LL's cURL fork has been updated to 7.54.1-r3Erik Kundiman
2025-10-01Reenable havok llphysicsextensions on Darwin x86_64 with ↵Brad Linden
llphysicsextensions_stub used for aarch64
2025-10-01Merge tag 'Second_Life_Release#a6d4c1d3-2025.07' into 2025.07Erik Kundiman
2025-09-11Follow up fixes for Apple Silicon (#4662)Rye
* Remove GLM sse flag from cmake that was moved to llpreprocessor.h * Further reduce performance loss of HDR and Sharpening on bandwith-constrained gpu by combining gamma correction into tonemap/sharpening shader passes * Update SSE2NEON to 1.8.0 to fix random render nans * Fix occasional startup crash from LLCachedControl being declared in global scope
2025-09-10Improvements found in reviewing mac_arm branch #4629Brad Linden
2025-09-05Fix macos build arch and deploy target due to cmake behavior changesRye
2025-09-05viewer-cef build fixesAndrey Kleshchev
2025-08-28Fixes for GHA buildRye
2025-08-28Fix up universal buildRye
2025-08-27Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemacRye
2025-08-27MacOS companion changes for dullahan 1.21 including package structure and ↵Rye
linkage fixes
2025-08-22Enable deprecation warnings and suppress a small handful that have no modern ↵Rye
replacements
2025-08-20Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemacRye
2025-08-15Merge branch 'main' into 2025.06Erik Kundiman
2025-08-11Supported Debian amd64 is now 13.0 (current stable)Erik Kundiman
OpenAL and LL's WebRTC now break CEF too just like on many other supported distros. Same as Ubuntu 24.04.2 when it comes to not yet compatible newer Pipewire, but OpenJPEG 2.5.3 (unlike 24.04.2 which is still at 2.5.0). The libminizip1 package name is also fixed here for Ubuntu.
2025-08-11FMOD has been upgraded from 2.02.29 to 2.02.30Erik Kundiman
2025-08-08Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06Erik Kundiman
2025-08-05#4470 Adjustments and Mac build fixesAndrey Kleshchev
2025-08-05#4470 Plug in Discord SDK packageAndrey Kleshchev
2025-07-31Rich Presence support using Discord Social SDK (#4457)Erik Kundiman
* Rich Presence support using Discord Social SDK Download DiscordSocialSdk-1.4.9649.zip from https://discord.com/developers/applications/1394782217405862001/social-sdk/downloads Add -DUSE_DISCORD:BOOL=ON to your cmake line. The Discord app needs to be set to be a public client in the OAuth2 tab. All Discord-related code are contained within one file, llstartup.cpp, and other classes access it through some opaque layer, static functions, otherwise we'd get these "duplicate symbol" linking errors. * Move Discord-related code to llappviewer.cpp The doFrame is the one called over and over again, so running the Discord callbacks from there shouldn't have one extra function overhead, while running the Discord initialisation is only once so it's much more okay to have the extra function overhead there. * panel_preferences_privacy tabs Add tab and checkboxes for discord social SDK integration options to panel_preferences_privacy.xml * Shorten Discord-related local variable names * Connect to Discord now through privacy tab Now the access token is saved the way passwords are saved, but without a username, so we can have some persistence without having to implement an OAuth2 backend server cause we would have to store those tokens there anyway still, and it's just simpler to not go that way. Discord Social SDK doesn't have a helper for sending code to a custom server anyway, that we would have to have some asynchronous HTTP requestor ready. Show location check button gets enabled only when Discord integration is enabled, though it's not functioning yet. * Location for Discord Rich Presence Activity State I was going to use LLAgentUI::buildLocationString but there's no location format that shows only region and coords without having to have the parcel name empty, so I copied buildLocationString implementation in the case of LOCATION_FORMAT_NO_MATURITY but when the parcel name is empty. I had to make updateDiscordActivity check agent's ID and the existence of agent avatar pointer first before trying to set Activity Details or State, cause I like the "Show location" button be checkable not only after online when both the ID & pointer will have existed. I think this way is simpler than programmatically enabling the "Show location" button after the user is logged in. I put a trigger to Activity update somewhere after the user is logged in for now, not yet after a TP. The elapsed time gets reset whenever Activity is updated for now, but I'll try to make elapsed time extended instead. No Party for now, because I couldn't find a way to make a Party shown without showing its CurrentSize (I could still get away not showing its MaxSize by setting it to 0), so the State (location) is shown above the elapsed time, not on the right of it. I'll try to figure out to get some representative numbers for its CurrentSize & MaxSize next. Also no privacy on hiding the username for now, until the UI is ready. * Update Rich Presence location on region change I had to find a spot in source code where it doesn't cause a crash (it did in LLAgent::setRegion), but I'm not removing the one in llstartup.cpp because on login, the one in llviewermessage.cpp gets only the placeholder coords (10, 10, 10). * Show display name too on Discord Rich Presence Avatar name cache can be used right away upon login now after I moved the update call to the end of PRECACHE section in llstartup. * Show Discord Rich Presence Activity Party By setting CurrentSize to the number of people within chat radius, and MaxSize to the number of people within near range. * Call updateDiscordActivity too in Discord init so when the user enables the integration after being logged in, the init can show the name and location right away. * Discord Rich Presence: Hide name & connect to llappviewer.cpp Add option to show/hide avatar name in privacy panel & connect rich presense directly to llappviewer.cpp * Discord time elapsed not reset on region change Time elapses right after viewer launch even before login. Plus parameter name change in header to make it the same as in implementation. * Cache bool setting retrievals in updateDiscordActivity As suggested by Andrey Kleschev. getBOOL and getF32 are expensive, so using `static LLCachedControl<>` is the way to do it in llappviewer.cpp. * Check Discord creds existence before getting token as suggested by Andrey Kleshchev, anticipating external factors such as user moving settings from another PC. * Tracy visibility for looped Discord function calls As suggested by Andrey Kleshchev. They likely can get pricey so they need to be visible in the profiler. * Discord-related error handling/logging plus delay saving Discord credentials to only after the access token is successfully updated on Discord, and try to disconnect from Discord when the integration gets disabled regardless whether there are credentials to delete or not and whether there's an access token to revoke or not. * Use getAvatars already called for Discord Party numbers so we don't have to make any extra getAvatars calls just for this, as it's pricy in crowds, and we'll just be piggybacking `updateSpeakerList` and `updateNearbyList`. * Assemble Discord Activity Details only once by saving it to a static global string for reuse. * Remove updateDiscordActivity call in startup loop The State field (region & coords) is updated well enough without it now. * Rename handleDiscordSocial to toggleDiscordIntegration * Update Discord Activity only when integration is enabled No need to check setting for the status change callback one, because getting there would need to be connected to Discord first, which in turn needs the integration to be enabled first. --------- Co-authored-by: Secret Foxtail <remmy@megapahit.net>
2025-07-21Merge branch 'main' into 2025.05Erik Kundiman
2025-07-19Exclude Debian arm64 from WebRTCErik Kundiman
When WebRTC was compiled with the viewer, we got this: Fatal error in: ../webrtc/src/media/engine/adm_helpers.cc, line 39 last system error: 88 Check failed: 0 == adm->Init() (0 vs. -1) Failed to initialize the ADM. This commit hasn't included the additional preprocessor macro for the platform in indra/newview/llvoiceclient.cpp yet, because there's no such macro yet to distinguish such distro from any other GNU/Linux distro.
2025-07-18Merge branch 'main' into 2025.05Erik Kundiman
2025-07-12Rich Presence support using Discord Social SDKErik Kundiman
Download DiscordSocialSdk-1.4.9649.zip https://discord.com/developers/applications/1393451183741599796/social-sdk/downloads to your ~/Downloads folder. Add -DUSE_DISCORD:BOOL=ON to your cmake line. The authorisation is triggered by selecting Help > Discord Social. It seems that the user will need to do this every time they want Rich Presence support on the viewer while using Discord. The Discord app is still set to be a public client in the OAuth2 tab, I'm going to try to make it work with the app set to be a confidential client, next. All Discord-related code are contained within one file, llstartup.cpp, and other classes access it through some opaque layer, static functions, otherwise we'd get these "duplicate symbol" linking errors.
2025-07-08Debian arm64 can use system nanosvgErik Kundiman
cause it's available now on trixie.
2025-07-08Windows can use vcpkg nanosvgErik Kundiman
2025-07-08Turn NDOF back on for Windows x64Erik Kundiman
and don't rebuild NDOF on non x86-64 Linux when it's already installed.
2025-07-08NDOF support for non x86-64 LinuxErik Kundiman
2025-07-07Get the viewer installable on Debian arm64Erik Kundiman
The Debian version supported is 13 (trixie), because that's the version I could install on my M1, hence the Boost default version is 1.83 & we can use system's OpenJPEG 2.5.3. Somehow CMake's FindOpenGL wasn't effective, but we can get around this by setting the GL libraries paths when running cmake. Debian aarch64 suffers from the same problem Fedora aarch64 had when compiling libcurl, and it's assumed that it's Linux aarch64 thing. When trying to build ColladaDOM when building the viewer, it couldn't find Boost somehow, so building ColladaDOM is done in configuration stage instead. Upstream Variables.cmake is full of assumptions regarding architecture, and ARCH is used in many places already for Debian/Ubuntu, so we have to make sure ARCH is set with the correct value at the root level. Pipewire on trixie is also too new, so it's cancelled here. Some dependencies have the t64 suffixes on them, just like the currently supported Ubuntu (because I guess 24.04 *is*, based on trixie). The executable still crashes when launched on my M1, however, but we'll commit the progress so far for now.
2025-07-03Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-06-25Revert "Attempt to replace __cpuid, on arm64 using cpuinfo"Erik Kundiman
This reverts commit 32871ee579bfbd4828f7888550897f619fdfd9d7.
2025-06-23No NVAPI on Windows ARM64Erik Kundiman