From be731e0bdc7d76ad3782d5b533b6bcc8378f41ad Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 9 Feb 2020 15:12:39 +0000 Subject: [PATCH] glx: unbreak on Unix without /usr/include/drm In file included from ../glx/glxdri2.c:35: /usr/local/include/GL/internal/dri_interface.h:43:10: fatal error: 'drm.h' file not found #include ^~~~~~~ In file included from ../glx/glxdriswrast.c:39: /usr/local/include/GL/internal/dri_interface.h:43:10: fatal error: 'drm.h' file not found #include ^~~~~~~ --- glx/meson.build | 1 + hw/xfree86/dixmods/meson.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/glx/meson.build b/glx/meson.build index 1140522f6..292e7a59d 100644 --- a/glx/meson.build +++ b/glx/meson.build @@ -38,6 +38,7 @@ if build_glx dependencies: [ common_dep, dl_dep, + dri_dep, dependency('glproto', version: '>= 1.4.17'), dependency('gl', version: '>= 1.2'), ], diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build index e4ac02228..a1afbe8b9 100644 --- a/hw/xfree86/dixmods/meson.build +++ b/hw/xfree86/dixmods/meson.build @@ -33,7 +33,7 @@ if build_glx include_directories: [ inc, xorg_inc, glx_inc ], c_args: [ xorg_c_args, glx_align64 ], - dependencies: [ common_dep, dl_dep ], + dependencies: [ common_dep, dl_dep, dri_dep ], link_whole: libxserver_glx, link_with: e,