New xserver meson patch for non-default install locations

2 files changed, 74 insertions, 0 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index a317e9a..0eb63a2 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -362,6 +362,7 @@ def BuilderList(slaves):
                   'app-sessreg' : [ '0001-Don-t-try-to-use-utmpx-functions-if-WTMPX_FILE-isn-t.patch' ],
                   'app-xdm' :     [ '0001-Workaround-Cygwin-s-failure-to-prototype-initgroups.patch' ],
                   'khronos-opengl-registry' : [ 'Makefile.patch' ],
+                  'xserver-meson' : [ '0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch' ],
 	        }
 
       if name in patches:
diff --git a/patches/xserver-meson/0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch b/patches/xserver-meson/0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch
new file mode 100644
index 0000000..e0a0c5c
--- /dev/null
+++ b/patches/xserver-meson/0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch
@@ -0,0 +1,73 @@
+From d3629f6c75c6a94dfb78ddbf546fcfb830ed3224 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue, 9 Jan 2018 23:56:20 +0000
+Subject: [PATCH xserver] meson.build: Fix compilation in hw/xwin when
+ dependencies are installed in a non-default location
+
+---
+ hw/xwin/glx/glthunk.c            |  1 +
+ hw/xwin/glx/meson.build          | 13 ++++++++++++-
+ hw/xwin/winclipboard/meson.build |  1 +
+ 3 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xwin/glx/glthunk.c b/hw/xwin/glx/glthunk.c
+index 3d2702ddb..c03c1b7d6 100644
+--- a/hw/xwin/glx/glthunk.c
++++ b/hw/xwin/glx/glthunk.c
+@@ -33,6 +33,7 @@
+ 
+ #include <X11/Xwindows.h>
+ 
++// N.B. We expect to get GL/gl.h from libGL, not w32api
+ #define GL_GLEXT_LEGACY
+ #include <GL/gl.h>
+ #undef GL_ARB_imaging
+diff --git a/hw/xwin/glx/meson.build b/hw/xwin/glx/meson.build
+index e9969536d..05bba3adc 100644
+--- a/hw/xwin/glx/meson.build
++++ b/hw/xwin/glx/meson.build
+@@ -75,7 +75,7 @@ xwin_glx = static_library(
+         top_srcdir_inc,
+         include_directories('../'),
+     ],
+-    dependencies: pixman_dep,
++    dependencies: common_dep,
+     c_args: xwin_glx_c_args,
+ )
+ 
+@@ -84,10 +84,21 @@ srcs_wgl_thunk = [
+     gl_thunks,
+ ]
+ 
++# We use GL headers from libGL, but link with opengl32. This is wacky, but works
++# the best due to version skew between Khronos XML and w32api's GL headers.
++#
++# More wacky: dependency('gl', method: 'pkg-config') doesn't behave like a
++# pkg-config dependency, so for the moment, use another dependency ('dri') we
++# know will give the same include path.
++# See https://github.com/mesonbuild/meson/issues/2905
++
++gl_inc = include_directories(dependency('dri', method:'pkg-config').get_pkgconfig_variable('includedir'))
++
+ WGLthunk = shared_library(
+     'nativeGLthunk',
+     srcs_wgl_thunk,
+     include_directories: [
++        gl_inc,
+         inc,
+         top_srcdir_inc,
+     ],
+diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
+index 1c784c384..dd7b2d20e 100644
+--- a/hw/xwin/winclipboard/meson.build
++++ b/hw/xwin/winclipboard/meson.build
+@@ -27,5 +27,6 @@ executable(
+     srcs_xwinclip,
+     link_with: xwin_clipboard,
+     link_args: ['-lgdi32', '-lpthread'],
++    dependencies: [dependency('x11')],
+     install: true,
+ )
+-- 
+2.15.1
+