fix-build-without-wayland

commit 5cc93d5002f1f3f22738eddc28724191e28cbfb3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Mon Dec 30 21:59:03 2024 +0100

    meson: Fix build with gtk3 but not wayland

Gbp-Pq: Name 0001-fix-build-without-wayland.patch

diff --git a/ext/gtk/meson.build b/ext/gtk/meson.build
index 0c94a71dfcd2f622a4a5c1feb0c605c72243426e..ad9888056dcf5bb01282fb0c97af7116c044413f 100644 (file)
--- a/ext/gtk/meson.build
+++ b/ext/gtk/meson.build
@@ -7,9 +7,11 @@ gtkwayland_sources = [
 ]
 
 gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
-gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : get_option('gtk3'))
+if use_wayland
+  gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : get_option('gtk3'))
+endif
 
-if gtk_dep.found() and gtk_wayland_dep.found() and use_wayland
+if use_wayland and gtk_dep.found() and gtk_wayland_dep.found() and use_wayland
   gstgtkwayland = library('gstgtkwayland',
     gtkwayland_sources,
     c_args :  gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],

diff --git a/tests/examples/gtk/meson.build b/tests/examples/gtk/meson.build
index 1ed0dee5f17c521763a48f0ea8e3ed2d35222af6..97a29d520124392b0fe530bd3c40e3b5ae97b4e0 100644 (file)
--- a/tests/examples/gtk/meson.build
+++ b/tests/examples/gtk/meson.build
@@ -1,4 +1,4 @@
-if gtk_dep.found() and gtk_wayland_dep.found() and use_wayland
+if use_wayland and gtk_dep.found() and gtk_wayland_dep.found()
   executable('gtkwaylandsink',
     'gtkwaylandsink.c',
     extra_files: ['window.ui'],

diff --git a/tests/examples/meson.build b/tests/examples/meson.build
index aec685bf65dd3bb59ef727462a65e212ffd1453e..ba82a1ed0e0ea7bc7b0e8210f8fd258a3c8b4107 100644 (file)
--- a/tests/examples/meson.build
+++ b/tests/examples/meson.build
@@ -18,7 +18,9 @@ subdir('qsv')
 subdir('qt6d3d11')
 subdir('uvch264')
 subdir('va')
-subdir('waylandsink')
+if use_wayland
+  subdir('waylandsink')
+endif
 subdir('webrtc')
 subdir('wpe')