summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
3 daysNot use address size suffix for Flatpak library dirHEADmainErik Kundiman
so upstream dullahan_host's rpath, which is meant to have $ORIGIN/../lib, would correctly refer to the library dir (where libcef.so is), without having to manipulate dullahan_host (cause Flatpak SDK doesn't have patchelf). But Dullahan/CEF is still not working on Flatpak just yet (LibVLC does, now, after I changed the prebuilt package from Debian 13 binaries to Fedora 44 binaries, where libvlccore links to libidn with the same compatibility version.
4 daysFlatpak supportErik Kundiman
Still uses prebuilt GLU, could be improved by using the glu shared module. Still uses prebuilt OpenAL, could be improved by separating the ALUT dependency (which isn't available on the runtime) from it, so we could use runtime's OpenAL. Still uses prebuilt LibXML2, could be improved by separating the Minizip & ColladaDOM from it (which aren't available on the runtime) from it, so we could use runtime's LibXML2 but have ColladaDOM built against it (and a still non-runtime Minizip). Still uses FLTK 1.3, when I tried using 1.4, it still had linking errors (might need to just add Cairo libraries to the target_link_libraries). VLC plugins are installed in vlc/plugins path relative to the vlc & vlccore libraries, the way they are in the distro I got the binaries from (Debian), cause I think it's the libraries that are compiled with that path. Still uses prebuilt dependencies in general, could be improved by having them as modules to be built. _FORTIFY_SOURCE needs to be skipped to avoid redefinition cause Flatpak build system already defines it. The conditionals for deciding installation paths need to be reorganised to accomodate installation that doesn't require an encapsulating namespace (because the installed files are already encapsulated in the app sandbox). The library directory naming scheme used here is lib64. The libGLESv2.so & libvulkan.so.1 installed are still copies, not links yet, because I'm still not familiar yet with the runtime hierarchies (they might reside just in /usr/lib/x86_64-linux-gnu).
10 daysFix typo in 8bde6901477280e7eaf719daebbf978143e2d0cbErik Kundiman
12 daysUpgrade Dullahan to 1.31 on ArchErik Kundiman
as its system CEF has been upgraded to 148. 1.31 is chosen here instead of the newer 1.35 because 1.31 is the one used so far in SL's callum/cef-148 branch.
12 daysWindows arm64 & macOS x86-64 use LL's packaged GLMErik Kundiman
so we don't have to keep 1.0.1 on vcpkg or MacPorts around any more (the last version they compile with, in the code's current state).
13 daysAdd minizip to its pkgconf include dir var on vcpkgErik Kundiman
See commit b8a0eb6b9c7735eb910f6faf2d23229519a23b75
2026-06-07Add Windows x64 & macOS actionsHadetTheUndying
2026-06-01Upgrade Discord Social SDKErik Kundiman
There are binaries for Win arm64 too now.
2026-05-29Inconsistent missing overrides were errors on FBSD ClangErik Kundiman
2026-05-26Arch package links to system CEF instead of bundling itErik Kundiman
Arch's system CEF version is 147 so we choose Dullahan version 1.30.
2026-05-26Fedora package links to system CEF instead of bundling itErik Kundiman
Fedora's system CEF version is 146.0.11 so we choose the Dullahan version that uses the next closest CEF version (146.0.12 and not 146.0.10), which is Dullahan 1.29 and not 1.28. System libcef_dll is somehow distributed only in source form (on Arch too), so in order to be able to link to it, we have to compile it first, but its CMakeLists.txt is a sub one, incomplete, so we use the solution of adding an empty macro: https://www.magpcss.org/ceforum/viewtopic.php?f=6&t=17732 System CEF's library encapsulating folder that contains libcef.so, hence needs to be add to runtime path.
2026-05-26Update CEF to 139 & Dullahan to 1.25/1.24 on LinuxErik Kundiman
For convenience, on x86-64 we choose the next closest version that has prebuilt binary so we don't have to build (we could, I've tried and it worked too). While on aarch64, we have to compile like before and we choose the same Dullahan version too as on Windows and macOS, for this parity branch with SLv's.
2026-05-26Install dynamic libs, etc in folder on Linux & BSDErik Kundiman
This includes files of WebRTC, Discord, VLC & CEF and their media plugins & resources. This is so they won't clash just in case some other packages install files with the same names in system library directories. Furthermore, this seems to prevent Dullahan/CEF from breaking in general. The path to this encapsulating folder needs to be added as a runtime path to especially dullahan_host & libmedia_plugin_cef.so so they can find libcef.so etc, also for the viewer to find libllwebrtc.so & libdiscord_partner_sdk.so. And that's why `patchelf` needs to be made sure it's installed.
2026-05-20Use updated LL's 3p cURL and ColladaDOMErik Kundiman
2026-05-19Merge branch 'main' into 2026.02Erik Kundiman
2026-05-19Debian should've been using prepared system nanosvgErik Kundiman
2026-05-19Ubuntu & openSUSE Tumbleweed can use system GLM nowErik Kundiman
2026-05-19Use FLTK 1.4 on Ubuntu instead of 1.3 now on 26.04Erik Kundiman
See commit 21ef63545ca07ef625edb742b2b3d1473bf33f13
2026-05-18Merge branch 'main' into 2026.02Erik Kundiman
2026-05-18Ubuntu can use system OpenJPEG library now on 26.04Erik Kundiman
Also, its private headers haven't been used, for other platforms either, so no need to use the encapsulating folder any more. The last line in .cmake is kept though, otherwise somehow on Gentoo llrender wouldn't have packages/include as its target include directories for finding glh's header directories. None of the Linux distros bundle OpenJPEG any more now.
2026-05-17Merge branch 'main' into 2026.02Erik Kundiman
2026-05-17Revert "Exclude Debian arm64 from WebRTC"Erik Kundiman
This reverts commit 8d34bb549736c341e84123760901bc981c46b184.
2026-05-17Revert "Exclude Gentoo from WebRTC too"Erik Kundiman
This reverts commit 00a44adfbeac89ed646b517446cbade82da531f8.
2026-05-14Merge branch 'main' into 2026.02Erik Kundiman
2026-05-14Exclude Gentoo from WebRTC tooErik Kundiman
Similar crash as on Debian arm64. I thought it was because I hadn't had sound working yet on my installation, but after I got sound working, it still crashed with WebRTC on. See commit 8d34bb549736c341e84123760901bc981c46b184
2026-05-10Merge branch 'main' into 2026.02Erik Kundiman
2026-05-10Add minizip to its pkgconf include dir var on GentooErik Kundiman
See commit 950815943ac6f31e9135be1b22b397dfa47a9761
2026-05-09Merge branch 'main' into 2026.02Erik Kundiman
2026-05-09Boost has been upgraded to 1.91 in vcpkgErik Kundiman
2026-05-09Merge branch 'main' into 2026.02Erik Kundiman
2026-05-09Boost on Ubuntu 26.04 is 1.90Erik Kundiman
2026-04-23Merge branch 'main' into 2026.02Erik Kundiman
2026-04-23Microsoft VS 18 2026 project extension is now slnxErik Kundiman
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