summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2026-06-23 20:02:41 +0800
committerErik Kundiman <erik@megapahit.org>2026-06-23 20:02:41 +0800
commit0f5b40798a6c122b7104d6bafefcb7decaad2fc3 (patch)
treee8c08cd613129c8e3696053b3173aff188e929dd /indra/media_plugins
parent3f27cd9a683360843524a42628faa6310e196645 (diff)
Not use address size suffix for Flatpak library dirHEADmain
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.
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/cef/CMakeLists.txt2
-rw-r--r--indra/media_plugins/libvlc/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 98b8bdf538..ee9a709c1e 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -158,7 +158,7 @@ if (INSTALL)
)
elseif (LINUX)
if (USE_FLATPAK)
- set(_LIB lib${ADDRESS_SIZE})
+ set(_LIB lib)
elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME})
elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo))
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 30a0edf80e..24174a6ef0 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -95,7 +95,7 @@ if (INSTALL)
DESTINATION ${_LIB}/plugins
)
elseif (USE_FLATPAK)
- set(_LIB lib${ADDRESS_SIZE})
+ set(_LIB lib)
install(
DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}/vlc
DESTINATION ${_LIB}