diff options
| author | Eric Anholt <eric@anholt.net> | 2018-08-07 16:23:14 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-08-09 13:28:23 -0400 |
| commit | 97bd8bc9cb6d910420627760288696e2a0c5d226 (patch) | |
| tree | 88839c8d910a10a944578e19de5013f4398e47fb | |
| parent | db53c439ba785a16f789918fe66da6ba161a0742 (diff) | |
meson: Make xf86vidmodeproto mandatory.
This is silly to have optional based on detection of the protocol
headers, particularly now that we have a single protocol header repo
to install.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | include/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/meson.build b/include/meson.build index 43d70d594..52fb837b9 100644 --- a/include/meson.build +++ b/include/meson.build @@ -204,7 +204,7 @@ conf_data.set('XCSECURITY', build_xsecurity) conf_data.set('XDMCP', xdmcp_dep.found()) conf_data.set('XF86BIGFONT', build_xf86bigfont) conf_data.set('XF86DRI', build_dri1) -conf_data.set('XF86VIDMODE', build_xf86vidmode) +conf_data.set('XF86VIDMODE', 1) conf_data.set('XFIXES', '1') conf_data.set('XFreeXDGA', build_dga) conf_data.set('XINERAMA', build_xinerama) diff --git a/meson.build b/meson.build index cd1e4a58c..ec79479d9 100644 --- a/meson.build +++ b/meson.build @@ -81,7 +81,7 @@ dri2proto_dep = dependency('dri2proto', version: '>= 2.8', required: get_option( dri3proto_dep = dependency('dri3proto', version: '>= 1.2', required: get_option('dri3') == 'true') xineramaproto_dep = dependency('xineramaproto') xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0') -xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1', required: false) +xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1') windowswmproto_dep = dependency('windowswmproto', required: false) applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false) xshmfence_dep = dependency('xshmfence', version: '>= 1.1', required: false) @@ -438,7 +438,6 @@ endif # XXX: Allow configuration of these. build_xselinux = false -build_xf86vidmode = xf86vidmodeproto_dep.found() m_dep = cc.find_library('m', required : false) dl_dep = cc.find_library('dl', required : false) |