diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2024-04-06 09:33:29 +0200 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2024-04-06 23:32:23 +0200 |
commit | e2aacd12c294a3b2e76a42c2836d7d9a5a73cd72 (patch) | |
tree | cebe095b30cd0c43bf3041fc5c39f0d55fdd51d2 /graphics/mesa-devel/files/patch-suffix | |
parent | x11-servers/xwayland-devel: avoid relying on 770a563c2fec (diff) |
graphics/mesa-devel: update to 24.0.b.4478
Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/5fa70730da1...d5aefb7a16d
Diffstat (limited to 'graphics/mesa-devel/files/patch-suffix')
-rw-r--r-- | graphics/mesa-devel/files/patch-suffix | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index a5b531aca1e2..610e7244a02b 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -1,9 +1,9 @@ Add library suffix to avoid conflict with mesa-libs + mesa-dri. Library selection is handled by libglvnd and/or libmap.conf. ---- meson.build.orig 2020-05-30 21:28:01 UTC +--- meson.build.orig 2024-04-06 18:40:47 UTC +++ meson.build -@@ -79,7 +79,7 @@ with_imgui = with_intel_tools or with_vulkan_overlay_l +@@ -100,7 +100,7 @@ if dri_drivers_path == '' dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' @@ -12,26 +12,26 @@ Library selection is handled by libglvnd and/or libmap.conf. endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' -@@ -427,9 +427,6 @@ if with_glvnd - elif with_glx == 'disabled' and not with_egl - error('glvnd requires DRI based GLX and/or EGL') - endif -- if get_option('egl-lib-suffix') != '' -- error('''EGL lib suffix can't be used with libglvnd''') -- endif - endif +@@ -550,8 +550,7 @@ _glvnd = get_option('glvnd') \ + error_message: 'Cannot build glvnd support for GLX that is not DRI based.') \ + .require(with_glx != 'disabled' or with_egl, + error_message: 'glvnd requires DRI based GLX and/or EGL') \ +- .require(get_option('egl-lib-suffix') == '', +- error_message: '''EGL lib suffix can't be used with libglvnd''') ++ + dep_glvnd = dependency('libglvnd', version : '>= 1.3.2', required : _glvnd) + with_glvnd = dep_glvnd.found() + if with_glvnd +@@ -622,7 +621,7 @@ if vdpau_drivers_path == '' - if with_vulkan_icd_dir == '' -@@ -491,7 +488,7 @@ if with_gallium_vdpau - endif vdpau_drivers_path = get_option('vdpau-libs-path') if vdpau_drivers_path == '' - vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau') + vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau' + get_option('egl-lib-suffix')) endif - if with_gallium_zink -@@ -638,7 +635,7 @@ endif + prog_glslang = find_program('glslangValidator', native : true, required : with_vulkan_overlay_layer or with_aco_tests or with_amd_vk or with_intel_vk) +@@ -739,7 +738,7 @@ if va_drivers_path == '' va_drivers_path = get_option('va-libs-path') if va_drivers_path == '' @@ -39,7 +39,7 @@ Library selection is handled by libglvnd and/or libmap.conf. + va_drivers_path = join_paths(get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) endif - _xa = get_option('gallium-xa') + with_gallium_xa = get_option('gallium-xa') \ --- src/amd/vulkan/meson.build.orig 2024-03-20 22:46:44 UTC +++ src/amd/vulkan/meson.build @@ -207,7 +207,7 @@ libvulkan_radeon = shared_library( |