1From e16117fc92688d76a042ad2c590c77d5a987a4ac Mon Sep 17 00:00:00 2001
2From: Erik Faye-Lund <erik.faye-lund@collabora.com>
3Date: Fri, 24 Mar 2023 13:31:58 +0100
4Subject: [PATCH] meson: fix glx-detection without glvnd
5
6When build without GLVND, Mesa provides GLX as a part of libGL, just
7like XQuartz does on MacOS. There's nothing really macOS specific about
8this fallback, so let's drop the condition.
9
10And just for good measure, let's add in dep_gl as a dependency for
11the header-check here, in case some one decides to install libGL outside
12of the default include directory.
13
14Fixes: 34300551 ("meson: explicitly check for glx dependency")
15Closes: https://gitlab.freedesktop.org/mesa/demos/-/issues/36
16Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
17
18Upstream-Status: Backport
19Signed-off-by: Ross Burton <ross.burton@arm.com>
20---
21 meson.build | 9 +++++----
22 1 file changed, 5 insertions(+), 4 deletions(-)
23
24diff --git a/meson.build b/meson.build
25index c1853f94..bc3278e1 100644
26--- a/meson.build
27+++ b/meson.build
28@@ -99,10 +99,11 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
29 endif
30
31 dep_glx = dependency('glx', required: false, disabler : true)
32-if not dep_glx.found() and host_machine.system() == 'darwin'
33-  # xquartz doesn't have a glx.pc, but it does have the header. And all the
34-  # symbols reside in libGL, so let's just use that.
35-  if cc.check_header('GL/glx.h', dependencies: dep_x11)
36+if not dep_glx.found()
37+  # Both Mesa build without GLVND and XQuartz lacks a glx.pc, but does
38+  # provide the header. And all the symbols reside in libGL, so let's
39+  # just use that.
40+  if cc.check_header('GL/glx.h', dependencies: [dep_x11, dep_gl])
41     dep_glx = dep_gl
42   endif
43 endif
44--
452.43.0
46
47