From 348974089c6f5f441deda9cec028210b5a298d50 Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Thu, 23 Oct 2025 05:47:55 -0400
Subject: Restore linux CEF build support including changes from
 archive/develop Fix various files missing linden_common

Signed-off-by: Rye <rye@alchemyviewer.org>
---
 indra/cmake/LibVLCPlugin.cmake | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'indra/cmake/LibVLCPlugin.cmake')

diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index 6361028c0c..a38c660a33 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -5,20 +5,31 @@ include(Prebuilt)
 include_guard()
 add_library( ll::libvlc INTERFACE IMPORTED )
 
-use_prebuilt_binary(vlc-bin)
 set(LIBVLCPLUGIN ON CACHE BOOL
         "LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
 
-find_library(VLC_LIBRARY
-    NAMES
-    libvlc.lib
-    libvlc.dylib
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+if (LIBVLCPLUGIN)
+    if(LINUX)
+        find_package(PkgConfig REQUIRED)
 
-find_library(VLCCORE_LIBRARY
-    NAMES
-    libvlccore.lib
-    libvlccore.dylib
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+        pkg_check_modules(libvlc REQUIRED IMPORTED_TARGET libvlc)
+        target_link_libraries( ll::libvlc INTERFACE PkgConfig::libvlc)
+        return()
+    endif()
 
-target_link_libraries(ll::libvlc INTERFACE ${VLC_LIBRARY} ${VLCCORE_LIBRARY})
+    use_prebuilt_binary(vlc-bin)
+
+    find_library(VLC_LIBRARY
+        NAMES
+        libvlc.lib
+        libvlc.dylib
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    find_library(VLCCORE_LIBRARY
+        NAMES
+        libvlccore.lib
+        libvlccore.dylib
+        PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+    target_link_libraries(ll::libvlc INTERFACE ${VLC_LIBRARY} ${VLCCORE_LIBRARY})
+endif()
-- 
cgit v1.3