From dbed987d07b7f81b836c8356e25063ba71266f21 Mon Sep 17 00:00:00 2001
From: Nicky Dasmijn <nicky.dasmijn@posteo.nl>
Date: Thu, 10 Oct 2024 19:46:05 +0200
Subject: Implement the groundwork for wayland support. (#2803)

During compile time try to detect libwayland-client-dev is installed,
  - If yes, compile a viewer which can run and start under wayland. libwayland-client is needed to detect if the viewer is hidden/minimized.
  - if no, disable wayland support and refuse to start the viewer under wayland (xwayland is okay).

To not introduce a hard link dependency on libwayland-client.so the object will be loaded dynamically if needed.
---
 indra/cmake/UI.cmake | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index ae039b4a47..a407f68db3 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -13,6 +13,15 @@ if (LINUX)
     return()
   endif()
 
+  include(FindPkgConfig)
+  pkg_check_modules(WAYLAND_CLIENT wayland-client)
+
+  if( WAYLAND_CLIENT_FOUND )
+      target_compile_definitions( ll::uilibraries INTERFACE LL_WAYLAND=1)
+  else()
+      message("pkgconfig could not find wayland client, compiling without full wayland support")
+  endif()
+
   target_link_libraries( ll::uilibraries INTERFACE
           fltk
           Xrender
-- 
cgit v1.2.3


From a60b8039f5007a760569d6c12b3b39899a345a5f Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Fri, 11 Oct 2024 18:09:33 +0900
Subject: Remove FLTK (#2832)

---
 indra/cmake/UI.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index a407f68db3..23bd8018dd 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -7,7 +7,7 @@ add_library( ll::uilibraries INTERFACE IMPORTED )
 
 if (LINUX)
   use_prebuilt_binary(fltk)
-  target_compile_definitions(ll::uilibraries INTERFACE LL_FLTK=1 LL_X11=1 )
+  target_compile_definitions(ll::uilibraries INTERFACE LL_X11=1 )
 
   if( USE_CONAN )
     return()
@@ -23,7 +23,6 @@ if (LINUX)
   endif()
 
   target_link_libraries( ll::uilibraries INTERFACE
-          fltk
           Xrender
           Xcursor
           Xfixes
-- 
cgit v1.2.3


From a6a3a1771b81e551e2d7fcd68e9df0cec092b27b Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Fri, 11 Oct 2024 06:35:10 -0700
Subject: Rework GHA matrix config to fix linux build

---
 indra/cmake/UI.cmake | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 23bd8018dd..595f394af4 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -6,7 +6,6 @@ include(GLIB)
 add_library( ll::uilibraries INTERFACE IMPORTED )
 
 if (LINUX)
-  use_prebuilt_binary(fltk)
   target_compile_definitions(ll::uilibraries INTERFACE LL_X11=1 )
 
   if( USE_CONAN )
-- 
cgit v1.2.3