AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

meson: check for xinerama

Browse Source
This commit is contained in:
Tim-Philipp Müller 2017-03-24 11:34:49 +00:00 committed by Emmanuele Bassi
parent 25cdd19bb0
commit 1c14e93e69
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/x11/meson.build
View File

@ -64,6 +64,7 @@ gdk_x11_deps = [
xfixes_dep, xfixes_dep,
xcomposite_dep, xcomposite_dep,
xrandr_dep, xrandr_dep,
xinerama_dep,
] ]
libgdk_x11 = static_library('libgdk-x11', libgdk_x11 = static_library('libgdk-x11',

20
meson.build
View File

@ -122,8 +122,6 @@ endforeach
# Maths functions might be implemented in libm # Maths functions might be implemented in libm
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
# FIXME: HAVE_XFREE_XINERAMA
check_functions = [ check_functions = [
'dcgettext', 'dcgettext',
'getpagesize', 'getpagesize',
@ -231,8 +229,6 @@ if x11_enabled
fontconfig_dep = dependency('fontconfig') fontconfig_dep = dependency('fontconfig')
atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req) atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req)
# FIXME: check for xinerama + add to x11_pkgs
x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr'] x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr']
if xcursor_dep.found() if xcursor_dep.found()
@ -281,6 +277,20 @@ if x11_enabled
endif endif
endif endif
enable_xinerama = get_option('enable-xinerama')
if enable_xinerama != 'no'
want_xinerama = enable_xinerama == 'yes'
xinerama_dep = dependency('xinerama', required : want_xinerama)
if xinerama_dep.found() and cc.has_header_symbol('X11/extensions/Xinerama.h', 'XineramaQueryExtension', dependencies : xinerama_dep)
cdata.set('HAVE_XFREE_XINERAMA', 1)
x11_pkgs += ['xinerama']
elif want_xinerama
error('No function XineramaQueryExtension in xinerama dependency which was explicitly requested.')
endif
else
xinerama_dep = []
endif
cdata.set('HAVE_RANDR', xrandr_dep.found()) cdata.set('HAVE_RANDR', xrandr_dep.found())
cdata.set('HAVE_RANDR15', xrandr15_dep.found()) cdata.set('HAVE_RANDR15', xrandr15_dep.found())
endif endif
@ -329,6 +339,8 @@ if enable_vulkan != 'no'
if vulkan_lib.found() and cc.has_function('vkCreateInstance', dependencies : vulkan_lib) and cc.has_header('vulkan/vulkan.h') if vulkan_lib.found() and cc.has_function('vkCreateInstance', dependencies : vulkan_lib) and cc.has_header('vulkan/vulkan.h')
have_vulkan = true have_vulkan = true
pc_gdk_extra_libs += ['-lvulkan'] pc_gdk_extra_libs += ['-lvulkan']
elif enable_vulkan == 'yes'
error('Vulkan support not found, but was explicitly requested.')
endif endif
else else
message('Vulkan support explicitly disabled') message('Vulkan support explicitly disabled')

2
meson_options.txt
View File

@ -18,3 +18,5 @@ option('enable-papi-print-backend', type: 'combo', choices : ['yes', 'no', 'auto
description : 'Enable the papi print backend') description : 'Enable the papi print backend')
option('enable-cloudprint-print-backend', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', option('enable-cloudprint-print-backend', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
description : 'Enable the cloudprint print backend') description : 'Enable the cloudprint print backend')
option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
description : 'Enable support for the Xinerama extension')