XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Make driprotos and libdrm optional

Browse Source 
Add options for DRI{1,2,3}
shmfence is required for DRI3
libdrm is required for any DRI{1,2,3}
Consolidate calls to dependency('libdrm')
Set WITH_LIBDRM when building with libdrm

v2:
Initialize libxserver_dri3 to []
Manually flatten libxserver, since meson doesn't (currently)
Use version_compare rather than circumloctions with dependency()

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Jon TURNEY
2017-05-09 12:23:48 +01:00
committed by Adam Jackson
parent fdb11e2274
commit 820a4cbe9f
9 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/meson.build
View File

@@ -61,8 +61,8 @@ conf_data.set_quoted('SHMDIR', '/tmp')
conf_data.set('HAVE_SIGACTION', '1') # XXX
conf_data.set('BUSFAULT', '1') # XXX
conf_data.set('XSHMFENCE', '1') # XXX
conf_data.set('WITH_LIBDRM', '1') # XXX
conf_data.set('XSHMFENCE', xshmfence_dep.found())
conf_data.set('WITH_LIBDRM', libdrm_dep.found())
conf_data.set('GLAMOR_HAS_DRM_NAME_FROM_FD_2',
dependency('libdrm', version: '>= 2.4.74', required: false).found())
conf_data.set('GLXEXT', build_glx)