From: Maintainers of GStreamer packages <gst-plugins-bad1.0@packages.debian.org>
Date: Wed, 19 Feb 2025 12:04:59 +0000 (+0100)
Subject: fix-build-without-wayland
X-Git-Tag: archive/raspbian/1.24.12-3+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd66aa4a6596725f32be01b52b14a9f2bc875b81;p=gst-plugins-bad1.0.git

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 70a45b8..1ae9739 100644
--- a/ext/gtk/meson.build
+++ b/ext/gtk/meson.build
@@ -11,9 +11,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()
+if 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 a09fed3..08145db 100644
--- a/tests/examples/gtk/meson.build
+++ b/tests/examples/gtk/meson.build
@@ -2,7 +2,7 @@ if not use_wayland
   subdir_done()
 endif
 
-if gtk_dep.found() and gtk_wayland_dep.found()
+if gtk_dep.found() and gtk_wayland_dep.found() and use_wayland
   executable('gtkwaylandsink',
     'gtkwaylandsink.c',
     extra_files: ['window.ui'],
diff --git a/tests/examples/meson.build b/tests/examples/meson.build
index aec685b..ba82a1e 100644
--- 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')