# shared-glapi is required if at least two OpenGL APIs are being built
if not with_shared_glapi
- if ((with_gles1 == 'true' and with_gles2 == 'true') or
+ if ((with_gles1 == 'true' and with_gles2 == 'true') or
(with_gles1 == 'true' and with_opengl) or
(with_gles2 == 'true' and with_opengl))
error('shared-glapi required for building two or more of OpenGL, OpenGL ES 1.x, OpenGL ES 2.x')
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
- elif with_glx == 'gallium-xlib'
+ elif with_glx == 'gallium-xlib'
if not with_gallium
error('Gallium-xlib based GLX requires at least one gallium driver')
elif not with_gallium_softpipe
elif with_dri
error('gallium-xlib conflicts with any dri driver')
endif
- elif with_glx == 'xlib'
+ elif with_glx == 'xlib'
if with_dri
error('xlib conflicts with any dri driver')
endif
endif
endif
dep_xvmc = null_dep
+dep_xv = null_dep
with_gallium_xvmc = false
if _xvmc != 'false'
dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : _xvmc == 'true')
- with_gallium_xvmc = dep_xvmc.found()
+ dep_xv = dependency('xv', required : _xvmc == 'true')
+ with_gallium_xvmc = dep_xvmc.found() and dep_xv.found()
endif
xvmc_drivers_path = get_option('xvmc-libs-path')
endif
endif
else
- pre_args += '-DMESA_EGL_NO_X11_HEADERS'
- gl_pkgconfig_c_flags += '-DMESA_EGL_NO_X11_HEADERS'
+ pre_args += '-DEGL_NO_X11'
+ gl_pkgconfig_c_flags += '-DEGL_NO_X11'
endif
if with_platform_drm
if with_egl and not with_gbm
# Check for generic C arguments
c_args = []
foreach a : ['-Werror=implicit-function-declaration',
- '-Werror=missing-prototypes', '-Werror=return-type',
+ '-Werror=missing-prototypes',
+ '-Werror=return-type',
'-Werror=incompatible-pointer-types',
'-Werror=format',
'-Wformat-security',
+ '-Wno-missing-field-initializers',
+ '-Wno-format-truncation',
'-fno-math-errno',
- '-fno-trapping-math', '-Qunused-arguments']
+ '-fno-trapping-math',
+ '-Qunused-arguments']
if cc.has_argument(a)
c_args += a
endif
endforeach
-foreach a : ['missing-field-initializers', 'format-truncation']
- if cc.has_argument('-W' + a)
- c_args += '-Wno-' + a
- endif
-endforeach
-
c_vis_args = []
if cc.has_argument('-fvisibility=hidden')
c_vis_args += '-fvisibility=hidden'
foreach a : ['-Werror=return-type',
'-Werror=format',
'-Wformat-security',
- '-fno-math-errno', '-fno-trapping-math',
+ '-Wno-non-virtual-dtor',
+ '-Wno-missing-field-initializers',
+ '-Wno-format-truncation',
+ '-fno-math-errno',
+ '-fno-trapping-math',
'-Qunused-arguments']
if cpp.has_argument(a)
cpp_args += a
endif
endforeach
-# For some reason, the test for -Wno-foo always succeeds with gcc, even if the
-# option is not supported. Hence, check for -Wfoo instead.
-
-foreach a : ['non-virtual-dtor', 'missing-field-initializers', 'format-truncation']
- if cpp.has_argument('-W' + a)
- cpp_args += '-Wno-' + a
- endif
-endforeach
-
no_override_init_args = []
-foreach a : ['override-init', 'initializer-overrides']
- if cc.has_argument('-W' + a)
- no_override_init_args += '-Wno-' + a
+foreach a : ['-Wno-override-init',
+ '-Wno-initializer-overrides']
+ if cc.has_argument(a)
+ no_override_init_args += a
endif
endforeach
endif
# Check for standard headers and functions
-if cc.has_header_symbol('sys/sysmacros.h', 'major')
+if (cc.has_header_symbol('sys/sysmacros.h', 'major') and
+ cc.has_header_symbol('sys/sysmacros.h', 'minor') and
+ cc.has_header_symbol('sys/sysmacros.h', 'makedev'))
pre_args += '-DMAJOR_IN_SYSMACROS'
-elif cc.has_header_symbol('sys/mkdev.h', 'major')
+endif
+if (cc.has_header_symbol('sys/mkdev.h', 'major') and
+ cc.has_header_symbol('sys/mkdev.h', 'minor') and
+ cc.has_header_symbol('sys/mkdev.h', 'makedev'))
pre_args += '-DMAJOR_IN_MKDEV'
endif
name : 'dynamic-list')
with_ld_dynamic_list = true
endif
-ld_args_build_id = []
-if build_machine.system() != 'darwin'
- ld_args_build_id += '-Wl,--build-id=sha1'
-endif
+
+ld_args_build_id = cc.get_supported_link_arguments('-Wl,--build-id=sha1')
# check for dl support
dep_dl = null_dep
endif
llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
-llvm_optional_modules = []
+llvm_optional_modules = ['coroutines']
if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo']
if with_gallium_r600
'lto', 'option', 'objcarcopts', 'profiledata',
]
endif
-if with_gallium_opencl or with_gallium_softpipe
- llvm_optional_modules += ['coroutines']
-endif
if with_amd_vk or with_gallium_radeonsi
_llvm_version = '>= 8.0.0'
endif
dep_glvnd = null_dep
+glvnd_missing_pc_files = false
if with_glvnd
dep_glvnd = dependency('libglvnd', version : '>= 0.2.0')
+ # GLVND until commit 0dfaea2bcb7cdcc785f9 ("Add pkg-config files for EGL, GL,
+ # GLES, and GLX.") was missing its pkg-config files, forcing every vendor to
+ # provide them and the distro maintainers to resolve the conflict.
+ glvnd_missing_pc_files = dep_glvnd.version().version_compare('< 1.2.0')
pre_args += '-DUSE_LIBGLVND=1'
endif
with_gallium_omx != 'disabled'))
dep_xcb = dependency('xcb')
dep_x11_xcb = dependency('x11-xcb')
+ if with_dri_platform == 'drm' and not dep_libdrm.found()
+ error('libdrm required for gallium video statetrackers when using x11')
+ endif
endif
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
if with_glx == 'dri' or with_glx == 'gallium-xlib'
dep_glproto = dependency('glproto', version : '>= 1.4.14')
endif
- if with_glx == 'dri'
+ if with_glx == 'dri'
if with_dri_platform == 'drm'
dep_dri2proto = dependency('dri2proto', version : '>= 2.8')
dep_xxf86vm = dependency('xxf86vm')
projects / mesa.git / blobdiff