From 2c3bebeec7c7490b5f2f22ee542ba99aeebfcb19 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Mon, 7 Jul 2025 22:32:30 +0800
Subject: Get the viewer installable on Debian arm64

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.
---
 indra/cmake/CURL.cmake        | 2 +-
 indra/cmake/LLPrimitive.cmake | 2 +-
 indra/cmake/OpenJPEG.cmake    | 4 ++--
 indra/cmake/Variables.cmake   | 1 +
 indra/cmake/WebRTC.cmake      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 211c3ae9a0..f8048ab324 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -37,7 +37,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
     INPUT ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
-  if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64 AND (${LINUX_DISTRO} MATCHES fedora))
+  if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
     execute_process(
       COMMAND sed -i netrc.c -e "s/defined(HAVE_GETPWUID_R)/0/g" netrc.c
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/lib
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index e6adea477f..b092f064c2 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -18,7 +18,7 @@ if( USE_CONAN )
     "${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" )
 endif()
 
-if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+if (LINUX AND NOT (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
   # Build of the collada-dom for Linux and FreeBSD is done in
   # indra/llprimitive/CMakeLists.txt
   return()
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 5729f6a10e..94dcde0d5c 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -19,7 +19,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
     DESTINATION ${CMAKE_BINARY_DIR}
     )
 
-  if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
+  if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR (${LINUX_DISTRO} MATCHES ubuntu))
     try_compile(OPENJPEG_RESULT
       PROJECT OPENJPEG
       SOURCE_DIR ${CMAKE_BINARY_DIR}/openjpeg-2.5.3
@@ -61,7 +61,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
   file(WRITE ${PREBUILD_TRACKING_DIR}/openjpeg_installed "${openjpeg_installed}")
 endif ()
 
-if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
+if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR (${LINUX_DISTRO} MATCHES ubuntu))
 target_link_libraries(ll::openjpeg INTERFACE openjp2 )
 else ()
     include(FindPkgConfig)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index c287f135fe..0720bbf53b 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -118,6 +118,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   else (ADDRESS_SIZE EQUAL 32)
     set(DEB_ARCHITECTURE amd64)
     set(FIND_LIBRARY_USE_LIB64_PATHS ON)
+    set(ARCH ${CMAKE_SYSTEM_PROCESSOR})
   endif (ADDRESS_SIZE EQUAL 32)
 
   execute_process(COMMAND dpkg-architecture -a${DEB_ARCHITECTURE} -qDEB_HOST_MULTIARCH 
diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake
index 5a750fe7f3..a7f43be13e 100644
--- a/indra/cmake/WebRTC.cmake
+++ b/indra/cmake/WebRTC.cmake
@@ -6,7 +6,7 @@ include_guard()
 
 add_library( ll::webrtc INTERFACE IMPORTED )
 target_include_directories( ll::webrtc SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/webrtc" "${LIBS_PREBUILT_DIR}/include/webrtc/third_party/abseil-cpp")
-if (${LINUX_DISTRO} MATCHES debian OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR WINDOWS)
+if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86-64 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR WINDOWS)
 use_prebuilt_binary(webrtc)
 elseif (NOT (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64)))
     target_compile_definitions(ll::webrtc INTERFACE CM_WEBRTC=1)
-- 
cgit v1.2.3


From e5a7ba4f8f807626e9602d7b231893e2d1ab92d7 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 8 Jul 2025 12:16:14 +0800
Subject: NDOF support for non x86-64 Linux

---
 indra/cmake/NDOF.cmake | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index d6e5e53ac9..4d8ca9fce5 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -43,7 +43,34 @@ if (NDOF)
       endif ()
     endif ()
   elseif (LINUX)
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
     use_prebuilt_binary(open-libndofdev)
+    else ()
+      file(DOWNLOAD
+        https://github.com/janoc/libndofdev/archive/refs/tags/v0.14.tar.gz
+        ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
+        )
+      file(ARCHIVE_EXTRACT
+        INPUT ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
+        DESTINATION ${CMAKE_BINARY_DIR}
+        )
+      set(ENV{USE_SDL2} 1)
+      execute_process(
+        COMMAND make -j${MAKE_JOBS}
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libndofdev-0.14
+        RESULT_VARIABLE libndofdev_installed
+        )
+      unset(ENV{USE_SDL2})
+      file(
+        COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/ndofdev_external.h
+        DESTINATION ${LIBS_PREBUILT_DIR}/include
+        )
+      file(
+        COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/libndofdev.a
+        DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
+        )
+      file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
+    endif ()
   endif (WINDOWS OR DARWIN)
 
   if (WINDOWS)
-- 
cgit v1.2.3


From f7b958e88e8cc3e867cbb6abf6f169df5e993261 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 8 Jul 2025 17:06:44 +0800
Subject: Turn NDOF back on for Windows x64

and don't rebuild NDOF on non x86-64 Linux when it's already installed.
---
 indra/cmake/NDOF.cmake | 59 ++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 4d8ca9fce5..9f33c6e220 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -7,9 +7,10 @@ include_guard()
 add_library( ll::ndof INTERFACE IMPORTED )
 
 if (NDOF)
-  if (WINDOWS OR DARWIN)
-    #use_prebuilt_binary(libndofdev)
-    if (DARWIN AND (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0))
+  if (WINDOWS)
+    use_prebuilt_binary(libndofdev)
+  elseif (DARWIN)
+    if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0)
       file(DOWNLOAD
         https://github.com/secondlife/3p-libndofdev/archive/refs/tags/v0.1.8e9edc7.tar.gz
         ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7.tar.gz
@@ -46,32 +47,34 @@ if (NDOF)
     if (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
     use_prebuilt_binary(open-libndofdev)
     else ()
-      file(DOWNLOAD
-        https://github.com/janoc/libndofdev/archive/refs/tags/v0.14.tar.gz
-        ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
-        )
-      file(ARCHIVE_EXTRACT
-        INPUT ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
-        DESTINATION ${CMAKE_BINARY_DIR}
-        )
-      set(ENV{USE_SDL2} 1)
-      execute_process(
-        COMMAND make -j${MAKE_JOBS}
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libndofdev-0.14
-        RESULT_VARIABLE libndofdev_installed
-        )
-      unset(ENV{USE_SDL2})
-      file(
-        COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/ndofdev_external.h
-        DESTINATION ${LIBS_PREBUILT_DIR}/include
-        )
-      file(
-        COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/libndofdev.a
-        DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
-        )
-      file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
+      if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0)
+        file(DOWNLOAD
+          https://github.com/janoc/libndofdev/archive/refs/tags/v0.14.tar.gz
+          ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
+          )
+        file(ARCHIVE_EXTRACT
+          INPUT ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
+          DESTINATION ${CMAKE_BINARY_DIR}
+          )
+        set(ENV{USE_SDL2} 1)
+        execute_process(
+          COMMAND make -j${MAKE_JOBS}
+          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libndofdev-0.14
+          RESULT_VARIABLE libndofdev_installed
+          )
+        unset(ENV{USE_SDL2})
+        file(
+          COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/ndofdev_external.h
+          DESTINATION ${LIBS_PREBUILT_DIR}/include
+          )
+        file(
+          COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/libndofdev.a
+          DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
+          )
+        file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
+      endif ()
     endif ()
-  endif (WINDOWS OR DARWIN)
+  endif ()
 
   if (WINDOWS)
     target_link_libraries( ll::ndof INTERFACE libndofdev)
-- 
cgit v1.2.3


From 84b8f4355322984a451967eaeb0bb1258b9ff2a6 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 8 Jul 2025 17:54:38 +0800
Subject: Windows can use vcpkg nanosvg

---
 indra/cmake/ViewerMiscLibs.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 4ab69e30aa..7a7a986d78 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -16,7 +16,7 @@ endif()
 use_prebuilt_binary(slvoice)
 endif (FALSE)
 
-if (${LINUX_DISTRO} MATCHES debian OR DARWIN OR WINDOWS)
+if (${LINUX_DISTRO} MATCHES debian OR DARWIN)
 use_prebuilt_binary(nanosvg)
 endif ()
 use_prebuilt_binary(viewer-fonts)
-- 
cgit v1.2.3


From a874360de2261be937d21bc01d706c141067df93 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 8 Jul 2025 18:01:02 +0800
Subject: Debian arm64 can use system nanosvg

cause it's available now on trixie.
---
 indra/cmake/ViewerMiscLibs.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 7a7a986d78..af13746c91 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -16,7 +16,7 @@ endif()
 use_prebuilt_binary(slvoice)
 endif (FALSE)
 
-if (${LINUX_DISTRO} MATCHES debian OR DARWIN)
+if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR DARWIN)
 use_prebuilt_binary(nanosvg)
 endif ()
 use_prebuilt_binary(viewer-fonts)
-- 
cgit v1.2.3


From 74b0178b7b4d672c7f6b317102b0ecd26f1ea033 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 12 Jul 2025 21:49:15 +0800
Subject: Rich Presence support using Discord Social SDK

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.
---
 indra/cmake/CMakeLists.txt |  1 +
 indra/cmake/Discord.cmake  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 indra/cmake/Discord.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 5525ac9f24..a77e0fca06 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -19,6 +19,7 @@ set(cmake_SOURCE_FILES
         Copy3rdPartyLibs.cmake
         DBusGlib.cmake
         DeploySharedLibs.cmake
+        Discord.cmake
         DragDrop.cmake
         EXPAT.cmake
         FindAutobuild.cmake
diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
new file mode 100644
index 0000000000..52c0765ae7
--- /dev/null
+++ b/indra/cmake/Discord.cmake
@@ -0,0 +1,45 @@
+include(Prebuilt)
+
+add_library(ll::discord INTERFACE IMPORTED)
+target_compile_definitions(ll::discord INTERFACE LL_DISCORD=1)
+
+if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/discord_installed OR NOT ${discord_installed} EQUAL 0)
+    file(ARCHIVE_EXTRACT
+        INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.4.9649.zip
+        DESTINATION ${CMAKE_BINARY_DIR}
+        )
+    file(
+        COPY
+          ${CMAKE_BINARY_DIR}/discord_social_sdk/include/cdiscord.h
+          ${CMAKE_BINARY_DIR}/discord_social_sdk/include/discordpp.h
+        DESTINATION ${LIBS_PREBUILT_DIR}/include
+        )
+    if (WINDOWS)
+        file(
+            COPY ${CMAKE_BINARY_DIR}/discord_social_sdk/bin/release/discord_partner_sdk.dll
+            DESTINATION ${LIBS_PREBUILT_DIR}/bin/release
+            )
+        set(LIBRARY_EXTENSION lib)
+    else ()
+        set(LIBRARY_PREFIX lib)
+        set(LIBRARY_EXTENSION so)
+    endif ()
+    if (DARWIN)
+        execute_process(
+            COMMAND lipo
+                libdiscord_partner_sdk.dylib
+                -thin ${CMAKE_OSX_ARCHITECTURES}
+                -output ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscord_partner_sdk.dylib
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/discord_social_sdk/lib/release
+            )
+    else ()
+        file(
+            COPY ${CMAKE_BINARY_DIR}/discord_social_sdk/lib/release/${LIBRARY_PREFIX}discord_partner_sdk.${LIBRARY_EXTENSION}
+            DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
+            )
+    endif ()
+    file(WRITE ${PREBUILD_TRACKING_DIR}/discord_installed "0")
+endif ()
+
+target_include_directories(ll::discord SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
+target_link_libraries(ll::discord INTERFACE discord_partner_sdk)
-- 
cgit v1.2.3