Added search_string.sh.

ggarra13 · May 21, 2024 · e578b29 · e578b29
1 parent 9fe7f27
commit e578b29
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/bin/search_string.sh b/bin/search_string.sh
@@ -11,4 +11,4 @@
 #
 
 echo "Searching for $1..."
-grep -rn --exclude-dir='BUILD-*' --exclude-dir='.git' --exclude-dir='tlRender' $1
+grep -rn --exclude-dir='BUILD-*' --exclude-dir='.git' --exclude-dir='tlRender' --exclude-dir='doc*' --exclude-dir='.github' $1
diff --git a/cmake/functions.cmake b/cmake/functions.cmake
@@ -74,26 +74,27 @@ function( is_system_lib TARGET ISSYSLIB )
 	libasound
 	libc
 	libdl
+	libdrm2
 	libharfbuzz
 	libfontconfig
 	libfreetype
 	libgcc_s
+	libglib
 	libgpg-error
 	libEGL
 	libGL
 	libGLdispatch
 	libGLX
-	libX
 	nvidia
-	libdrm2
-	libpthread
-	libresolv
 	libm
 	libOpenGL
+	libpthread
 	libpulse
 	libpulse-simple
+	libresolv
 	librt
 	libwayland
+	libX
 	libxcb
 	libxshmfence
 	libstdc

diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md
@@ -8,6 +8,10 @@ v1.1.8
 - Removed the padding that was added when first loading a clip full screen.
 - Fixed cursor disappearing when going to the action tool dock while a drawing
   tool was active.
+- Fixed libglib-2.0 being bundled in the distribution and creating
+  incompatibilities on modern distros.
+- Fixed mrv2 icon appearing on the taskbar when run under Wayland.
+
 
 v1.1.7
 ======

diff --git a/mrv2/lib/mrvApp/mrvApp.cpp b/mrv2/lib/mrvApp/mrvApp.cpp
@@ -77,6 +77,12 @@ namespace py = pybind11;
 #ifdef __linux__
 #    undef None // macro defined in X11 config files
 #    undef Status
+#    ifdef FLTK_USE_WAYLAND
+#        define USE_SIMPLE_CONFIG 1
+#        include <wayland-client.h>
+#        include <wayland-server.h>
+#        include <wayland-client-protocol.h>
+#    endif
 #endif
 
 #include "mrvFl/mrvIO.h"
@@ -85,6 +91,8 @@ namespace py = pybind11;
 #    include <Processing.NDI.Lib.h>
 #endif
 
+
+
 namespace
 {
     const char* kModule = "app";
@@ -488,9 +496,17 @@ namespace mrv
         Fl::option(Fl::OPTION_VISIBLE_FOCUS, false);
         Fl::use_high_res_GL(true);
         Fl::set_fonts("-*");
-
         Fl::lock(); // needed for NDI and multithreaded logging
 
+
+#ifdef FLTK_USE_WAYLAND
+        std::string app_id = "mrv2-64 ";
+        app_id += mrv::version();
+
+        // xdg_toplevel::set_app_id(app_id);
+#endif
+
+
         // Create the interface.
         ui = new ViewerUI();
         if (!ui)