From 0de2e3570d506e05b76d46ed356082dba2f5d0a8 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 16 Jul 2026 10:05:23 +0800
Subject: Strip Discord Social SDK library file on Linux

---
 indra/cmake/Discord.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
index 51dd06ce0c..28d32cd668 100644
--- a/indra/cmake/Discord.cmake
+++ b/indra/cmake/Discord.cmake
@@ -45,6 +45,12 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
             COPY ${CMAKE_BINARY_DIR}/discord_social_sdk/lib/release${DISCORD_PLATFORM}/${LIBRARY_PREFIX}discord_partner_sdk.${LIBRARY_EXTENSION}
             DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             )
+        if (CMAKE_BUILD_TYPE MATCHES Release AND LINUX)
+            execute_process(
+                COMMAND ${CMAKE_STRIP} libdiscord_partner_sdk.so
+                WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
+            )
+        endif ()
     endif ()
     file(WRITE ${PREBUILD_TRACKING_DIR}/discord_sdk_installed "0")
 endif ()
-- 
cgit v1.3


From c26abf15e6ca3e867488190166fdc68cad7c026e Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 16 Jul 2026 10:06:59 +0800
Subject: Strip Dullahan/CEF binaries on Linux

Stripping dullahan_host on Fedora (maybe Arch too) needs to be done
after it's copied to prebuilt directory cause somehow when done
before, it wouldn't work somehow. Also, placing the snippet along
with the rest (down there) would cause the file to be corrupt
(the ELF patching must have been executed when the stripping wasn't
done yet).
Stripping CEF binaries on non Arch/Fedora is done before they're
installed to avoid eating too much storage from having unstripped
copies.
Flatpak already strips, so no need for additional stripping for
Flatpak only files. Gentoo already strips too but it's okay, no
need to rule Flatpak and/or Gentoo out.
---
 indra/cmake/CEFPlugin.cmake | 68 +++++++++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 18 deletions(-)

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 2546ec7993..34b267a756 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -59,6 +59,12 @@ if (${LINUX_DISTRO} MATCHES arch)
                 COPY ${CMAKE_BINARY_DIR}/dullahan-1.31.0-CEF_148.0.9/dullahan_host
                 DESTINATION ${LIBS_PREBUILT_DIR}/bin/release
             )
+            if (CMAKE_BUILD_TYPE MATCHES Release)
+                execute_process(
+                    COMMAND ${CMAKE_STRIP} dullahan_host
+                    WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/bin/release
+                )
+            endif ()
             file(
                 COPY ${CMAKE_BINARY_DIR}/dullahan-1.31.0-CEF_148.0.9/libdullahan.a
                 DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
@@ -127,6 +133,12 @@ elseif (${LINUX_DISTRO} MATCHES fedora)
                 COPY ${CMAKE_BINARY_DIR}/dullahan-1.29.0-CEF_146.0.12/dullahan_host
                 DESTINATION ${LIBS_PREBUILT_DIR}/bin/release
             )
+            if (CMAKE_BUILD_TYPE MATCHES Release)
+                execute_process(
+                    COMMAND ${CMAKE_STRIP} dullahan_host
+                    WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/bin/release
+                )
+            endif ()
             file(
                 COPY ${CMAKE_BINARY_DIR}/dullahan-1.29.0-CEF_146.0.12/libdullahan.a
                 DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
@@ -172,11 +184,29 @@ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
                 -DPROJECT_ARCH:STRING=${CMAKE_SYSTEM_PROCESSOR}
         )
         if (${DULLAHAN_RESULT})
+            if (CMAKE_BUILD_TYPE MATCHES Release)
+                execute_process(
+                    COMMAND ${CMAKE_STRIP}
+                        chrome-sandbox
+                        libEGL.so
+                        libGLESv2.so
+                        libcef.so
+                        libvk_swiftshader.so
+                        libvulkan.so.1
+                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40/_deps/cef_prebuild-src/${CMAKE_BUILD_TYPE}
+                )
+            endif ()
             execute_process(
                 COMMAND ${CMAKE_MAKE_PROGRAM} install
                 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40
                 OUTPUT_VARIABLE dullahan_installed
             )
+            if (CMAKE_BUILD_TYPE MATCHES Release)
+                execute_process(
+                    COMMAND ${CMAKE_STRIP} dullahan_host
+                    WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/bin/release
+                )
+            endif ()
             file(
                 COPY
                     ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40/src/dullahan.h
@@ -189,23 +219,6 @@ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
 else ()
 use_prebuilt_binary(dullahan)
 endif ()
-
-execute_process(
-    COMMAND patchelf --set-rpath ${INSTALL_LIBRARY_DIR} bin/release/dullahan_host
-    WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}
-)
-
-if (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES fedora))
-    target_include_directories( ll::cef SYSTEM INTERFACE /usr/include/cef/include)
-    if (${LINUX_DISTRO} MATCHES fedora)
-        set(LIB_SUFFIX ${ADDRESS_SIZE})
-    endif ()
-    execute_process(
-        COMMAND patchelf --add-rpath ${INSTALL_PREFIX}/lib${LIB_SUFFIX}/cef bin/release/dullahan_host
-        WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}
-    )
-endif ()
-
 target_include_directories( ll::cef SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/cef)
 
 if (WINDOWS)
@@ -270,13 +283,32 @@ elseif (DARWIN)
             -output libdullahan.a
         WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
     )
-
 elseif (LINUX)
+    if (NOT USE_FLATPAK)
+        execute_process(
+            COMMAND patchelf --set-rpath ${INSTALL_LIBRARY_DIR} dullahan_host
+            WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/bin/release
+        )
+    endif ()
     if (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES fedora))
+        target_include_directories( ll::cef SYSTEM INTERFACE /usr/include/cef/include)
         if (${LINUX_DISTRO} MATCHES fedora)
             set(LIB_SUFFIX ${ADDRESS_SIZE})
         endif ()
         target_link_directories( ll::cef INTERFACE ${INSTALL_PREFIX}/lib${LIB_SUFFIX}/cef )
+        execute_process(
+            COMMAND patchelf --add-rpath ${INSTALL_PREFIX}/lib${LIB_SUFFIX}/cef dullahan_host
+            WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/bin/release
+        )
+    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 AND (CMAKE_BUILD_TYPE MATCHES Release))
+        execute_process(
+            COMMAND ${CMAKE_STRIP}
+                bin/release/chrome-sandbox
+                bin/release/dullahan_host
+                lib/release/libEGL.so
+                lib/release/libvk_swiftshader.so
+            WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}
+        )
     endif ()
     target_link_libraries( ll::cef INTERFACE
         libdullahan.a
-- 
cgit v1.3


From dfccce9695ccca60b2892c39576693fca2557e7b Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 16 Jul 2026 10:17:13 +0800
Subject: Use runtime's OpenAL on Flatpak

Just remove OpenAL files and leave out FreeALUT's to avoid having
a custom prebuilt package and modifying autobuild.xml.
---
 indra/cmake/OPENAL.cmake          | 38 +++++++++++++++++++++++++++-----------
 indra/newview/ViewerInstall.cmake |  3 ---
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 3a36c64fd3..dcb74ad36d 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -18,21 +18,26 @@ endif()
 
 if (USE_OPENAL)
   add_library( ll::openal INTERFACE IMPORTED )
-
-  if (NOT USE_FLATPAK)
-    target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
-    include(FindPkgConfig)
-    pkg_check_modules(Openal REQUIRED freealut)
-    target_include_directories(ll::openal SYSTEM INTERFACE ${Openal_INCLUDE_DIRS})
-    target_link_directories(ll::openal INTERFACE ${Openal_LIBRARY_DIRS})
-    target_link_libraries(ll::openal INTERFACE ${Openal_LIBRARIES})
-    return ()
-  endif ()
-
+  if (USE_FLATPAK)
   target_include_directories( ll::openal SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/AL")
+  endif ()
   target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
+  if (USE_FLATPAK)
   use_prebuilt_binary(openal)
+      file(REMOVE
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.so
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.so.1
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.so.1.24.2
+          ${LIBS_PREBUILT_DIR}/include/AL/al.h
+          ${LIBS_PREBUILT_DIR}/include/AL/alc.h
+          ${LIBS_PREBUILT_DIR}/include/AL/alext.h
+          ${LIBS_PREBUILT_DIR}/include/AL/efx-creative.h
+          ${LIBS_PREBUILT_DIR}/include/AL/efx-presets.h
+          ${LIBS_PREBUILT_DIR}/include/AL/efx.h
+  )
+  endif ()
 
+  if (FALSE)
   find_library(OPENAL_LIBRARY
       NAMES
       OpenAL32
@@ -40,7 +45,11 @@ if (USE_OPENAL)
       libopenal.dylib
       libopenal.so
       PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+  endif ()
 
+  include(FindPkgConfig)
+  if (USE_FLATPAK)
+      pkg_search_module(Openal REQUIRED openal)
   find_library(ALUT_LIBRARY
       NAMES
       alut
@@ -49,5 +58,12 @@ if (USE_OPENAL)
       PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
   target_link_libraries(ll::openal INTERFACE ${OPENAL_LIBRARY} ${ALUT_LIBRARY})
+  else ()
+      pkg_search_module(Openal REQUIRED freealut)
+  endif ()
+
+  target_include_directories(ll::openal SYSTEM INTERFACE ${Openal_INCLUDE_DIRS})
+  target_link_directories(ll::openal INTERFACE ${Openal_LIBRARY_DIRS})
+  target_link_libraries(ll::openal INTERFACE ${Openal_LIBRARIES})
 
 endif ()
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 6c60d8cb79..ea28b51364 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -247,9 +247,6 @@ if (LINUX)
                   ${ARCH_PREBUILT_DIRS_RELEASE}/libalut.so
                   ${ARCH_PREBUILT_DIRS_RELEASE}/libalut.so.0
                   ${ARCH_PREBUILT_DIRS_RELEASE}/libalut.so.0.0.0
-                  ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.so
-                  ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.so.1
-                  ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.so.1.24.2
                 DESTINATION ${_LIB}
                 )
         endif ()
-- 
cgit v1.3


From 8c7124c51366165c3a73ddbb66863a891372f92b Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 16 Jul 2026 10:20:18 +0800
Subject: Use runtime's LibXML2 on Flatpak

and fix some warning of sed not finding some file that was caused
by using BSD's syntax for sed on GNU.
---
 indra/cmake/LLPrimitive.cmake | 230 ++++++++++++++++++++++--------------------
 1 file changed, 121 insertions(+), 109 deletions(-)

diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index eb1f23b2a3..a574bfadaa 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -18,57 +18,96 @@ if( USE_CONAN )
     "${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" )
 endif()
 
+#use_system_binary( colladadom )
+
+#use_prebuilt_binary(colladadom)
+if (USE_FLATPAK)
+use_prebuilt_binary(minizip-ng) # needed for colladadom
+#use_prebuilt_binary(libxml2)
+
+find_library(MINIZIPNG_LIBRARY
+    NAMES
+    minizip.lib
+    libminizip.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::minizip-ng INTERFACE ${MINIZIPNG_LIBRARY})
+endif ()
+
+if (FALSE)
+find_library(LIBXML2_LIBRARY
+    NAMES
+    libxml2.lib
+    libxml2.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::libxml INTERFACE ${LIBXML2_LIBRARY})
+
+if (WINDOWS)
+    target_link_libraries( ll::libxml INTERFACE Bcrypt.lib)
+endif()
+endif (FALSE)
+
+include(FindPkgConfig)
 if (NOT USE_FLATPAK)
-  include(FindPkgConfig)
-  pkg_check_modules(Minizip REQUIRED minizip)
-  if (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES gentoo) OR DARWIN OR WINDOWS)
+    pkg_search_module(Minizip REQUIRED minizip)
+endif ()
+if (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES gentoo) OR DARWIN OR WINDOWS)
     set(Minizip_INCLUDE_DIRS ${Minizip_INCLUDE_DIRS}/minizip)
-  endif ()
-  pkg_check_modules(Libxml2 REQUIRED libxml-2.0)
-  target_link_libraries( ll::minizip-ng INTERFACE ${Minizip_LIBRARIES} )
-  target_link_libraries( ll::libxml INTERFACE ${Libxml2_LIBRARIES} )
-  if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0)
+elseif (USE_FLATPAK)
+    set(Minizip_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/minizip-ng)
+    set(Minizip_LIBRARY_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
+endif ()
+pkg_search_module(Libxml2 REQUIRED libxml-2.0)
+target_link_libraries( ll::minizip-ng INTERFACE ${Minizip_LIBRARIES} )
+target_link_libraries( ll::libxml INTERFACE ${Libxml2_LIBRARIES} )
+if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0)
     if (NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11.tar.gz)
-      file(DOWNLOAD
-        https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r11.tar.gz
-        ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11.tar.gz
+        file(DOWNLOAD
+            https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r11.tar.gz
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11.tar.gz
         )
     endif ()
     file(ARCHIVE_EXTRACT
-      INPUT ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11.tar.gz
-      DESTINATION ${CMAKE_BINARY_DIR}
+        INPUT ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11.tar.gz
+        DESTINATION ${CMAKE_BINARY_DIR}
       )
     if (WINDOWS OR CMAKE_COMMAND MATCHES /usr/bin/cmake)
-      execute_process(
-        COMMAND sed -i "s/include_directories/cmake_minimum_required(VERSION 3.28)\\ninclude_directories/" CMakeLists.txt
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
+        execute_process(
+            COMMAND sed -i "s/include_directories/cmake_minimum_required(VERSION 3.28)\\ninclude_directories/" CMakeLists.txt
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
         )
     else ()
-      execute_process(
-        COMMAND sed -i "" -e "s/include_directories/cmake_minimum_required(VERSION 3.28)\\ninclude_directories/" CMakeLists.txt
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
+        execute_process(
+            COMMAND sed -i "" -e "s/include_directories/cmake_minimum_required(VERSION 3.28)\\ninclude_directories/" CMakeLists.txt
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
         )
     endif ()
     if (WINDOWS)
-      execute_process(
-        COMMAND sed -i "s/SHARED/STATIC/" 1.4/CMakeLists.txt
-        COMMAND sed -i "/#include <cstdarg>/a #define WIN32" dae/daeUtils.cpp
-        COMMAND sed -i "/using namespace cdom;/a namespace boost{void boost::throw_exception(class std::exception const &){}}" dae/daeURI.cpp
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/src
+        execute_process(
+            COMMAND sed -i "s/SHARED/STATIC/" 1.4/CMakeLists.txt
+            COMMAND sed -i "/#include <cstdarg>/a #define WIN32" dae/daeUtils.cpp
+            COMMAND sed -i "/using namespace cdom;/a namespace boost{void boost::throw_exception(class std::exception const &){}}" dae/daeURI.cpp
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/src
+        )
+    elseif (CMAKE_COMMAND MATCHES /usr/bin/cmake)
+        execute_process(
+            COMMAND sed -i "s/SHARED/STATIC/" src/1.4/CMakeLists.txt
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
         )
     else ()
-      execute_process(
-        COMMAND sed -i "" -e "s/SHARED/STATIC/" src/1.4/CMakeLists.txt
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
+        execute_process(
+            COMMAND sed -i "" -e "s/SHARED/STATIC/" src/1.4/CMakeLists.txt
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
         )
     endif ()
     if (DARWIN)
-      set(BOOST_CFLAGS -I${Libxml2_LIBRARY_DIRS}exec/boost/1.88/include)
-      set(BOOST_LIBS -L${Minizip_LIBRARY_DIRS}exec/boost/1.88/lib)
-      set(BOOST_LIBRARY_SUFFIX -mt)
+        set(BOOST_CFLAGS -I${Libxml2_LIBRARY_DIRS}exec/boost/1.88/include)
+        set(BOOST_LIBS -L${Minizip_LIBRARY_DIRS}exec/boost/1.88/lib)
+        set(BOOST_LIBRARY_SUFFIX -mt)
     elseif (WINDOWS)
-      set(BOOST_CFLAGS -I${prefix_result}/../include)
-      set(BOOST_LIBS -L${prefix_result})
+        set(BOOST_CFLAGS -I${prefix_result}/../include)
+        set(BOOST_LIBS -L${prefix_result})
       # Detect actual toolset/version suffix from vcpkg-installed libs.
       file(GLOB _boost_context_libs "${prefix_result}/boost_context-*.lib")
       if (_boost_context_libs)
@@ -84,98 +123,71 @@ if (NOT USE_FLATPAK)
         message(WARNING "Could not detect Boost suffix via glob in LLPrimitive; using fallback.")
       endif ()
     elseif (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
-      set(BOOST_CFLAGS -I/usr/local/include)
-      execute_process(
-        COMMAND sed -i "" -e "s/endif 0/endif/" dae/daeUtils.cpp
-        COMMAND sed -i "" -e "s/linux/FreeBSD/" dae/daeUtils.cpp
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/src
+        set(BOOST_CFLAGS -I/usr/local/include)
+        execute_process(
+            COMMAND sed -i "" -e "s/endif 0/endif/" dae/daeUtils.cpp
+            COMMAND sed -i "" -e "s/linux/FreeBSD/" dae/daeUtils.cpp
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/src
         )
+    elseif (USE_FLATPAK)
+        set(BOOST_CFLAGS -I${LIBS_PREBUILT_DIR}/include)
+        set(BOOST_LIBS -L${ARCH_PREBUILT_DIRS_RELEASE})
     endif ()
     file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4)
     try_compile(COLLADADOM_RESULT
-      PROJECT colladadom
-      SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
-      BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
-      TARGET collada14dom
-      CMAKE_FLAGS
-        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-        -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-        -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
-        -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
-        -DCMAKE_CXX_STANDARD:STRING=17
-        -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
-        -DBoost_CFLAGS:STRING=${BOOST_CFLAGS}
-        -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
-        "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} ${BOOST_LIBS}"
-        -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem${BOOST_LIBRARY_SUFFIX}
-        -DBoost_SYSTEM_LIBRARY:STRING=boost_system${BOOST_LIBRARY_SUFFIX}
-        -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
-        -DOPT_COLLADA14:BOOL=ON
-        -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:PATH=${LIBS_PREBUILT_DIR}/include/collada
+        PROJECT colladadom
+        SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
+        BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
+        TARGET collada14dom
+        CMAKE_FLAGS
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+            -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+            -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
+            -DCMAKE_CXX_STANDARD:STRING=17
+            -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
+            -DBoost_CFLAGS:STRING=${BOOST_CFLAGS}
+            -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
+            "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} ${BOOST_LIBS}"
+            -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem${BOOST_LIBRARY_SUFFIX}
+            -DBoost_SYSTEM_LIBRARY:STRING=boost_system${BOOST_LIBRARY_SUFFIX}
+            -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
+            -DOPT_COLLADA14:BOOL=ON
+            -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:PATH=${LIBS_PREBUILT_DIR}/include/collada
       )
     if (WINDOWS)
-      execute_process(
-        COMMAND MSBuild.exe ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/Project.slnx -p:Configuration=${CMAKE_BUILD_TYPE}
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
-        OUTPUT_VARIABLE colladadom_installed
+        execute_process(
+            COMMAND MSBuild.exe ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/Project.slnx -p:Configuration=${CMAKE_BUILD_TYPE}
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
+            OUTPUT_VARIABLE colladadom_installed
         )
-      file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/include/collada)
-      file(
-        COPY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/include
-        DESTINATION ${LIBS_PREBUILT_DIR}/include
+        file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/include/collada)
+        file(
+            COPY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/include
+            DESTINATION ${LIBS_PREBUILT_DIR}/include
         )
-      file(RENAME
-        ${LIBS_PREBUILT_DIR}/include/include
-        ${LIBS_PREBUILT_DIR}/include/collada
+        file(RENAME
+            ${LIBS_PREBUILT_DIR}/include/include
+            ${LIBS_PREBUILT_DIR}/include/collada
         )
-      file(MAKE_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE})
-      file(RENAME
-        ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/src/1.4/${CMAKE_BUILD_TYPE}/collada14dom.lib
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom23-s.lib
+        file(MAKE_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE})
+        file(RENAME
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/src/1.4/${CMAKE_BUILD_TYPE}/collada14dom.lib
+            ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom23-s.lib
         )
     elseif (${COLLADADOM_RESULT})
-      execute_process(
-        COMMAND ${CMAKE_MAKE_PROGRAM} install
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
-        OUTPUT_VARIABLE colladadom_installed
+        execute_process(
+            COMMAND ${CMAKE_MAKE_PROGRAM} install
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11
+            OUTPUT_VARIABLE colladadom_installed
         )
-      file(RENAME
-        ${ARCH_PREBUILT_DIRS}/libcollada14dom.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom.a
+        file(RENAME
+            ${ARCH_PREBUILT_DIRS}/libcollada14dom.a
+            ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom.a
         )
     endif ()
     file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "${colladadom_installed}")
-  endif ()
-
-else (NOT USE_FLATPAK)
-
-#use_system_binary( colladadom )
-
-use_prebuilt_binary(colladadom)
-use_prebuilt_binary(minizip-ng) # needed for colladadom
-use_prebuilt_binary(libxml2)
-
-find_library(MINIZIPNG_LIBRARY
-    NAMES
-    minizip.lib
-    libminizip.a
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-target_link_libraries(ll::minizip-ng INTERFACE ${MINIZIPNG_LIBRARY})
-
-find_library(LIBXML2_LIBRARY
-    NAMES
-    libxml2.lib
-    libxml2.a
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-target_link_libraries(ll::libxml INTERFACE ${LIBXML2_LIBRARY})
-
-if (WINDOWS)
-    target_link_libraries( ll::libxml INTERFACE Bcrypt.lib)
-endif()
-
-endif (NOT USE_FLATPAK)
+endif ()
 
 target_include_directories( ll::colladadom SYSTEM INTERFACE
         ${LIBS_PREBUILT_DIR}/include/collada
-- 
cgit v1.3