frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Make xf86vidmode optional 

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon TURNEY 2017-05-04 13:46:24 +01:00 committed by Adam Jackson
parent 3b3ce4a55b
commit 4925348133
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/meson.build
View File

@ -162,7 +162,7 @@ conf_data.set('XCSECURITY', build_xsecurity)
conf_data.set('XDMCP', get_option('xdmcp')) conf_data.set('XDMCP', get_option('xdmcp'))
conf_data.set('XF86BIGFONT', build_xf86bigfont) conf_data.set('XF86BIGFONT', build_xf86bigfont)
conf_data.set('XF86DRI', build_dri1) conf_data.set('XF86DRI', build_dri1)
conf_data.set('XF86VIDMODE', '1') conf_data.set('XF86VIDMODE', build_xf86vidmode)
conf_data.set('XFIXES ', '1') conf_data.set('XFIXES ', '1')
conf_data.set('XINERAMA', build_xinerama) conf_data.set('XINERAMA', build_xinerama)
conf_data.set('XINPUT', '1') conf_data.set('XINPUT', '1')

3
meson.build
View File

@ -38,7 +38,7 @@ dri3proto_dep = dependency('dri3proto', version: '>= 1.0')
xineramaproto_dep = dependency('xineramaproto') xineramaproto_dep = dependency('xineramaproto')
xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0') xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0')
xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1') xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1')
xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1') xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1', required: false)
windowswmproto_dep = dependency('windowswmproto', required: false) windowswmproto_dep = dependency('windowswmproto', required: false)
applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false) applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false)
xshmfence_dep = dependency('xshmfence', version: '>= 1.1') xshmfence_dep = dependency('xshmfence', version: '>= 1.1')
@ -235,6 +235,7 @@ build_xinerama = true
build_xselinux = false build_xselinux = false
build_xv = true build_xv = true
build_dga = false build_dga = false
build_xf86vidmode = xf86vidmodeproto_dep.found()
m_dep = cc.find_library('m', required : false) m_dep = cc.find_library('m', required : false)
dl_dep = cc.find_library('dl', required : false) dl_dep = cc.find_library('dl', required : false)