summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2026-04-19Merge branch 'main' into 2026.02Erik Kundiman
2026-04-19Merge tag 'Second_Life_Release#8ffb73b4-26.2' into 2026.02Erik Kundiman
2026-04-18Merge tag 'Second_Life_Release#f4bc7652-26.2' into 2026.02Erik Kundiman
2026-04-18FMOD has been upgradedErik Kundiman
2026-04-18Merge remote-tracking branch 'secondlife/main'Erik Kundiman
2026-04-10Merge pull request #5475 from secondlife/project/Flat_UIJonathan "Geenz" Goodman
Flat UI Alpha
2026-04-07Release/26.1.1 (#5530)Jonathan "Geenz" Goodman
* Integrate Velopack installer and update framework * Add Velopack update support for macOS and VVM integration * Update Velopack version and dependencies * Improve Velopack packaging for macOS * #5346 Uninstall older non-velopack viewer (#5363) * #5335 Fix silent uninstall asking about registry * #5346 Uninstall older non-velopack viewer * Use runtime viewer exe name, handle Velopack URL * Velopack download failure diagnostic (#5520) * Velopack download failure diagnostic * Fix up velopack downloading updates. Handle updates internally then hand them off to velopack. (#5524) * More velopack changes. Should download updates properly now. * Don't include NSI files * Restore optional updates, refine viewer restart behavior. (#5527) * Add support for optional updates. * Don't restart the viewer after the update unless it was optional. * Setup UpdaterServiceSetting with velopack properly. * Refine the restart behavior a bit - readd the old "the viewer must update" UX. * If the update is still downloading, close should just reopen the downloading dialog. --------- Co-authored-by: Jonathan "Geenz" Goodman <geenz@lindenlab.com> * Remove SLVersionChecker from the viewer with velopack. (#5528) * Remove SLVersionChecker updater integration * Ensure that the portable install has the correct version number. * Don't produce shortcuts with VPK - we do this with our post install. * Bump viewer version from 26.1.0 to 26.1.1 * Potential fix for uninstaller not being functional. * Fix for UpdaterServiceSetting being ignored. * Filter for release channel when generating shortcuts. * Add some more logging for icons on Windows builds. * More VPK logging. * Move velopack packaging in CI to the sign and package step. * Enable velopack downgrade and skip older updates * Move the version required checking into velopack's checks. * Potential fix for downgrade prompts. * Make sure our macOS flow mirrors Windows. * Make sure to use the dev version of the mac sign and package. * p#553 Only one of two uninstallers displayed * #5346 Don't force user to shutdown velopack build for NSIS uninstall * #5346 Ignore option for the uninstall dialog * #5346 Fix early exit crash * #5346 Properly reset version flag. * Add some autodetect logic on macOS. * p#564 Clear legacy links * p#553 Handle uninstall records * p#549 Permit testing release notes on a test build * p#564 Remake nsis to velopack update flow * p#564 Remake nsis to velopack update flow #2 * p#564 Fix incorrect value type * p#553 Clear velopack's own registry entry in favor of a custom one * #5346 Resolve duplicated window class name * Bump to 2.1.0 of sign and package. --------- Co-authored-by: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
2026-04-07Release/26.1.1 (#5530)Jonathan "Geenz" Goodman
* Integrate Velopack installer and update framework * Add Velopack update support for macOS and VVM integration * Update Velopack version and dependencies * Improve Velopack packaging for macOS * #5346 Uninstall older non-velopack viewer (#5363) * #5335 Fix silent uninstall asking about registry * #5346 Uninstall older non-velopack viewer * Use runtime viewer exe name, handle Velopack URL * Velopack download failure diagnostic (#5520) * Velopack download failure diagnostic * Fix up velopack downloading updates. Handle updates internally then hand them off to velopack. (#5524) * More velopack changes. Should download updates properly now. * Don't include NSI files * Restore optional updates, refine viewer restart behavior. (#5527) * Add support for optional updates. * Don't restart the viewer after the update unless it was optional. * Setup UpdaterServiceSetting with velopack properly. * Refine the restart behavior a bit - readd the old "the viewer must update" UX. * If the update is still downloading, close should just reopen the downloading dialog. --------- Co-authored-by: Jonathan "Geenz" Goodman <geenz@lindenlab.com> * Remove SLVersionChecker from the viewer with velopack. (#5528) * Remove SLVersionChecker updater integration * Ensure that the portable install has the correct version number. * Don't produce shortcuts with VPK - we do this with our post install. * Bump viewer version from 26.1.0 to 26.1.1 * Potential fix for uninstaller not being functional. * Fix for UpdaterServiceSetting being ignored. * Filter for release channel when generating shortcuts. * Add some more logging for icons on Windows builds. * More VPK logging. * Move velopack packaging in CI to the sign and package step. * Enable velopack downgrade and skip older updates * Move the version required checking into velopack's checks. * Potential fix for downgrade prompts. * Make sure our macOS flow mirrors Windows. * Make sure to use the dev version of the mac sign and package. * p#553 Only one of two uninstallers displayed * #5346 Don't force user to shutdown velopack build for NSIS uninstall * #5346 Ignore option for the uninstall dialog * #5346 Fix early exit crash * #5346 Properly reset version flag. * Add some autodetect logic on macOS. * p#564 Clear legacy links * p#553 Handle uninstall records * p#549 Permit testing release notes on a test build * p#564 Remake nsis to velopack update flow * p#564 Remake nsis to velopack update flow #2 * p#564 Fix incorrect value type * p#553 Clear velopack's own registry entry in favor of a custom one * #5346 Resolve duplicated window class name * Bump to 2.1.0 of sign and package. --------- Co-authored-by: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
2026-03-31Merge branch 'main' into 2026.02Erik Kundiman
2026-03-31Add "minizip" to its pkgconf include dir variableErik Kundiman
on Arch and macOS. Somehow `pkg-config --cflags minizip` of current minizip packages on those 2 OSes doesn't include the encapsulating folder "minizip".
2026-03-07Merge tag 'Second_Life_Release#3529bc5f-2026.02' into 2026.02Erik Kundiman
2026-03-07Merge branch 'main' into 2026.01Erik Kundiman
2026-03-07Gentoo Portage's Boost just got upgraded to 1.90Erik Kundiman
2026-02-25Merge branch 'release/2026.02' into maxim/flat-ui-fonts-updateMnikolenko Productengine
# Conflicts: # indra/newview/skins/default/xui/en/panel_preferences_general.xml
2026-01-29Merge branch 'main' into 2026.01Erik Kundiman
2026-01-29FMOD lib directory when building using it on macOSErik Kundiman
2026-01-21Merge branch 'main' into 2026.01Erik Kundiman
2026-01-21Upgrade Discord SDKErik Kundiman
2026-01-21FMOD has been upgradedErik Kundiman
2026-01-19Use CMake find_package(Python3) for automatic Python supportCarbon Cowboy
Replaced manual version-specific detection with CMake's built-in Python finder. This eliminates the need up update update Python.cmake for new Python releases.
2026-01-15Merge branch 'project/fonts-update' into project/flat-ui-fonts-updateMnikolenko Productengine
2026-01-14#5271 Update zlib-ng and libraries that depend on itAndrey Kleshchev
2026-01-11Merge branch 'main' into 2026.01Erik Kundiman
2026-01-11Update meshoptimizer to v1.0.1Erik Kundiman
for OSes/distros that don't link to system library meshoptimizer.
2026-01-11Upgrade VLC to 3.0.23 on macOSErik Kundiman
2025-12-24Merge branch 'main' into 2026.01Erik Kundiman
2025-12-24Boost has been upgraded to 1.90 in vcpkgErik Kundiman
2025-12-04Merge remote-tracking branch 'secondlife/release/2026.01' into 2026.01Erik Kundiman
2025-11-28Merge branch 'main' into 2025.08Erik Kundiman
2025-11-25Merge branch develop into project/fonts-updateAndrey Kleshchev
# Conflicts: # indra/llrender/llfontfreetype.cpp
2025-11-21Use FLTK 1.4 on Debian instead of 1.3Erik Kundiman
which fixes the problem of freezing/crashing or disappearing of the viewer, at least on default GNOME-based Debian.
2025-11-19Merge branch 'main' into 2025.08Erik Kundiman
2025-11-19FMOD has been upgradedErik Kundiman
2025-11-18#4939 Bugsplat updateAndrey Kleshchev
to version 1.2.6
2025-11-07Merge branch 'main' into 2025.08Erik Kundiman
2025-11-07Update the upstream ColladaDOM revision used to 10Erik Kundiman
As the maintenance using an external patch is getting harder, I had to revert the patching to internal and the building to be in the configuration phase, made worse by CMake 4 on Arch, Gentoo and Tumbleweed that treats the absence of a minimum requirement as an error (the BSD sed condition is put there as an anticipation for when in the future (Mac)Ports' CMake gets updated to 4 too).
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-22Updated APR library and removed hotfix patch in APR cmakeHecklezz
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.