Index: head/graphics/mesa-dri/files/patch-meson.build =================================================================== --- head/graphics/mesa-dri/files/patch-meson.build (revision 538007) +++ head/graphics/mesa-dri/files/patch-meson.build (revision 538008) @@ -1,26 +1,47 @@ - Do not define GLX_USE_TLS, this doesn't work on all FreeBSD version Later mesa version rename this to USE_ELF_TLS and make it conditional on some platform, but for now simply comment it here. See https://github.com/dumbbell/test-tls-initial-exec for more info - Add dependency on libxv for xvmc, this is fixed in later mesa version. --- meson.build.orig 2019-06-26 20:14:08 UTC +++ meson.build +@@ -25,7 +25,7 @@ project( + [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] + ).stdout(), + license : 'MIT', +- meson_version : '>= 0.45', ++ meson_version : '>= 0.46', + default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'] + ) + @@ -336,7 +336,7 @@ if with_egl and not (with_platform_drm or with_platfor endif endif -pre_args += '-DGLX_USE_TLS' +#pre_args += '-DGLX_USE_TLS' 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') @@ -458,7 +458,8 @@ dep_xvmc = 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') +@@ -1053,10 +1054,7 @@ if cc.links('int main() { return 0; }', + 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 + if cc.has_function('dlopen')