diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 62a7d4f61e00..d67bd4eb9122 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,156 +1,156 @@ PORTNAME= mesa -DISTVERSION= 26.1-branchpoint-1876 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -gaddd09fb764 +DISTVERSION= 26.1-branchpoint-2478 +DISTVERSIONSUFFIX= -g095e4f5f1bb CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= de5cf0a44b50.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan) WWW= https://www.mesa3d.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/docs/license.rst ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= Limited scope: no old drivers and no software rendering. \ See also https://mesamatrix.net/ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ libglvnd>=1.3.2:graphics/libglvnd \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS= libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 USES= bison cpe compiler:c++11-lib meson pkgconfig python:build shebangfix CPE_VENDOR= mesa3d USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org BINARY_ALIAS= python=${PYTHON_CMD} SHEBANG_FILES= src/vulkan/*/*control.py MESON_DISABLED= android-libbacktrace gallium-mediafoundation \ libunwind lmsensors microsoft-clc valgrind MESON_TRUE= unversion-libgallium MESON_ARGS= -Dplatforms=${PLATFORMS:O:[-1..1]:ts,} -Dvideo-codecs=all LDFLAGS+= -Wl,--undefined-version # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8003 FORTIFY_UNSAFE= yes PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} OPTIONS_DEFINE= DRM LLVM LTO OPENCL VAAPI VKLAYERS WAYLAND X11 ZSTD OPTIONS_DEFAULT= DRM LLVM LTO OPENCL VAAPI VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= GALLIUM VULKAN OPTIONS_GROUP_GALLIUM= crocus iris panfrost r600 radeonsi OPTIONS_GROUP_VULKAN= anv radv OPTIONS_EXCLUDE_aarch64=LTO # OPENCL fails to build OPTIONS_EXCLUDE_i386= LTO # anv: vkcube fails on vkCreateSwapchainKHR OPTIONS_EXCLUDE+= ${ARCH:Naarch64:C/.+/panfrost/} OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:Nx86_64:C/.+/crocus/} OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:Nx86_64:Npowerpc64*:C/.+/anv iris/} OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:} OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:} OPTIONS_SUB= yes # Convert options to -D-drivers= .for i in ${OPTIONS_GROUP} MESON_ARGS+= -D${i:tl}-drivers=${${i}_DRIVERS:ts,} . for j in ${OPTIONS_GROUP_${i}} OPTIONS_DEFAULT+= ${j} ${j}_VARS+= ${i}_DRIVERS+=${j:S/anv/intel/:S/radv/amd/} . endfor .endfor GALLIUM_DESC= Unified OpenGL drivers crocus_DESC= Broadwater, Eaglelake, Ironlake, Sandybridge, Ivybridge, Haswell iris_DESC= Broadwell and newer (implies OPENCL) iris_IMPLIES= OPENCL panfrost_DESC= Midgard, Bifrost r600_DESC= R600, R700, Evergreen, Northern Islands radeonsi_DESC= Southern Islands and newer VULKAN_DESC= Vulkan drivers anv_DESC= Skylake and newer (implies OPENCL) anv_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ glslangValidator:graphics/glslang anv_MESON_ON= ${"${ARCH:Naarch64:Namd64}":?-Dintel-rt=disabled:} # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 anv_IMPLIES= OPENCL radv_DESC= Southern Islands and newer radv_BUILD_DEPENDS= glslangValidator:graphics/glslang COINST_DESC= Allow co-installation with another Mesa port COINST_MESON_ON= -Degl-lib-suffix=${PKGNAMESUFFIX} COINST_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri # ICD COINST_PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} COINST_SUB_FILES= libmap.conf COINST_SUB_LIST= SUFFIX=${PKGNAMESUFFIX} COINST_PLIST_SUB_OFF= SUFFIX= DRM_DESC= KMS console support for Vulkan (KHR_display) DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdisplay-info.so:sysutils/libdisplay-info DRM_MESON_ENABLED= display-info LLVM_DESC= Build with LLVM support (see implies) LLVM_USES= llvm:min=18,lib,noexport LLVM_CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} LLVM_MESON_ENABLED= llvm LLVM_MESON_TRUE= amd-use-llvm LTO_MESON_TRUE= b_lto allow-broken-lto OPENCL_DESC= Heterogeneous computing via OpenCL (implies LLVM) OPENCL_BUILD_DEPENDS= bindgen:devel/rust-bindgen-cli \ libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \ spirv-tools>0:graphics/spirv-tools \ rustc:lang/${RUST_DEFAULT} OPENCL_LIB_DEPENDS= libLLVMSPIRVLib.so.${OPENCL_SOVERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T} OPENCL_RUN_DEPENDS= libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} OPENCL_SOVERSION= ${LLVM_VERSION}${${LLVM_VERSION}>=18:?.1:} OPENCL_CONFIGURE_ENV= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" OPENCL_MESON_FALSE= b_lundef # environ OPENCL_MESON_TRUE= gallium-rusticl OPENCL_IMPLIES= LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM VAAPI_DESC= Hardware encoding/decoding (only r600, radeonsi) VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_ENABLED= gallium-va VKLAYERS_DESC= Vulkan layers: ${VKLAYERS_MESON_ON:C/.*=//} (implies ${VKLAYERS_IMPLIES}) VKLAYERS_BUILD_DEPENDS= glslangValidator:graphics/glslang VKLAYERS_LIB_DEPENDS= libpng.so:graphics/png VKLAYERS_MESON_ON= -Dvulkan-layers=anti-lag,device-select,overlay,screenshot,vram-report-limit VKLAYERS_IMPLIES= ${"${PORT_OPTIONS:Manv}":?anv:radv} # any from OPTIONS_GROUP_VULKAN WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland WAYLAND_VARS= PLATFORMS+=wayland X11_USES= xorg X11_USE= XORG=x11,xcb,xdamage,xext,xfixes,xorgproto,xrandr,xshmfence,xxf86vm X11_VARS= PLATFORMS+=x11 X11_MESON_OFF= -Dglx=disabled -Dxlib-lease=disabled ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= zstd post-patch: # Extract (snapshot) version from the port instead of empty string @${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \ ${WRKSRC}/bin/git_sha1_gen.py post-patch-COINST-on: - @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ - ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf - @${MV} ${WRKSRC}/src/util/00-radv-defaults.conf \ - ${WRKSRC}/src/util/00-radv${PKGNAMESUFFIX}-defaults.conf + @(cd ${WRKSRC}/src/util; for f in 00-*-defaults.conf; do \ + suffix=$${f#00-}; infix=$${suffix%-defaults.conf}; \ + ${MV} 00-$$infix-defaults.conf \ + 00-$$infix${PKGNAMESUFFIX}-defaults.conf; \ + done) post-install-COINST-on: @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf .include diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 941965f5aef6..69d1d1c9d819 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1779913838 -SHA256 (mesa-26.1-branchpoint-1876-gaddd09fb764.tar.bz2) = d331fc2cef1385c9a83a656f20a31d4825d036df6be6f98c5f238b92347e98d4 -SIZE (mesa-26.1-branchpoint-1876-gaddd09fb764.tar.bz2) = 110851739 +TIMESTAMP = 1780533649 +SHA256 (mesa-26.1-branchpoint-2478-g095e4f5f1bb.tar.bz2) = 567860a528e5b91332b45414ef6241b138efbe367967ed53ec1a541a839ebbee +SIZE (mesa-26.1-branchpoint-2478-g095e4f5f1bb.tar.bz2) = 111394005 SHA256 (de5cf0a44b50.patch) = c9e02e5eb1fb4e3aa2bc7a7e0a70f28f3ee609835ff0b59e827893a821983851 SIZE (de5cf0a44b50.patch) = 1108 diff --git a/graphics/mesa-devel/files/patch-cache_line b/graphics/mesa-devel/files/patch-cache_line deleted file mode 100644 index f9dd96a31056..000000000000 --- a/graphics/mesa-devel/files/patch-cache_line +++ /dev/null @@ -1,51 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/-/issues/5737 - ---- src/gallium/winsys/amdgpu/drm/amdgpu_bo.c.orig 2025-04-21 22:23:33 UTC -+++ src/gallium/winsys/amdgpu/drm/amdgpu_bo.c -@@ -833,7 +833,7 @@ struct pb_slab *amdgpu_bo_slab_alloc(void *priv, unsig - slab_bo->slab.group_index = group_index; - slab_bo->slab.entry_size = entry_size; - slab_bo->entries = os_malloc_aligned(slab_bo->slab.num_entries * sizeof(*slab_bo->entries), -- CACHE_LINE_SIZE); -+ MESA_CACHE_LINE_SIZE); - if (!slab_bo->entries) - goto fail; - ---- src/util/u_memory.h.orig 2025-04-21 22:23:33 UTC -+++ src/util/u_memory.h -@@ -84,7 +84,7 @@ mem_dup(const void *src, size_t size) - } - - /* TODO: this could be different on non-x86 architectures. */ --#define CACHE_LINE_SIZE 64 -+#define MESA_CACHE_LINE_SIZE 64 - - /** - * Declare a variable on its own cache line. -@@ -101,12 +101,12 @@ mem_dup(const void *src, size_t size) - * aligned, but we only want to align the field. - */ - #define EXCLUSIVE_CACHELINE(decl) \ -- union { char __cl_space[CACHE_LINE_SIZE]; \ -+ union { char __cl_space[MESA_CACHE_LINE_SIZE]; \ - decl; } - - /* Allocate a structure aligned to a cache line. (used to make atomic ops faster) */ --#define MALLOC_STRUCT_CL(T) (struct T *)align_malloc(sizeof(struct T), CACHE_LINE_SIZE) --#define CALLOC_STRUCT_CL(T) (struct T *)align_calloc(sizeof(struct T), CACHE_LINE_SIZE) -+#define MALLOC_STRUCT_CL(T) (struct T *)align_malloc(sizeof(struct T), MESA_CACHE_LINE_SIZE) -+#define CALLOC_STRUCT_CL(T) (struct T *)align_calloc(sizeof(struct T), MESA_CACHE_LINE_SIZE) - #define FREE_CL(ptr) align_free(ptr) - - #ifdef __cplusplus ---- src/vulkan/vram-report-limit-layer/vram_report_limit_layer.c.orig 2025-04-21 22:23:33 UTC -+++ src/vulkan/vram-report-limit-layer/vram_report_limit_layer.c -@@ -447,7 +447,7 @@ vram_report_limit_CreateInstance(const VkInstanceCreat - struct vram_report_limit_instance_data *instance_data = os_malloc_aligned( - sizeof(*instance_data) + sizeof(instance_data->active_pdevices_array[0]) * - active_pdevices_count, -- CACHE_LINE_SIZE); -+ MESA_CACHE_LINE_SIZE); - if (instance_data == NULL) { - result = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err_free_is_pdevice_active_array; diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index 9d15b8dbe565..529307f2a8da 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -1,185 +1,224 @@ Add library suffix to avoid conflict with mesa-libs + mesa-dri. Library selection is handled by libglvnd and/or libmap.conf. --- meson.build.orig 2024-04-06 18:40:47 UTC +++ meson.build @@ -100,7 +100,7 @@ if dri_drivers_path == '' dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' - dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') + dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' @@ -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 @@ -739,7 +738,7 @@ if va_drivers_path == '' va_drivers_path = get_option('va-libs-path') if va_drivers_path == '' - va_drivers_path = join_paths(get_option('libdir'), 'dri') + va_drivers_path = join_paths(get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) endif with_gallium_xa = get_option('gallium-xa') \ ---- src/amd/vulkan/meson.build.orig 2026-05-27 20:30:38 UTC +--- src/amd/vulkan/meson.build.orig 2026-06-03 18:25:19 UTC +++ src/amd/vulkan/meson.build -@@ -38,11 +38,11 @@ radv_drirc = custom_target( - '--import-path', join_paths(dir_source_root, 'src/util'), - '--drirc-src', '@OUTPUT0@', - '--drirc-hdr', '@OUTPUT1@', -- '--validate', join_paths(dir_source_root, 'src/util/00-radv-defaults.conf'), -+ '--validate', join_paths(dir_source_root, 'src/util/00-radv@0@-defaults.conf'.format(get_option('egl-lib-suffix'))), - ], - depend_files : files( - join_paths(dir_source_root, 'src/util/drirc_gen.py'), -- join_paths(dir_source_root, 'src/util/00-radv-defaults.conf'), -+ join_paths(dir_source_root, 'src/util/00-radv@0@-defaults.conf'.format(get_option('egl-lib-suffix'))), - ), - ) - -@@ -252,7 +252,7 @@ libvulkan_radeon = shared_library( +@@ -31,7 +31,7 @@ radv_drirc = custom_target( + + radv_drirc = custom_target( + 'radv_drirc', +- input : [files('radv_drirc_gen.py'), drirc_gen, join_paths(dir_source_root, 'src/util/00-radv-defaults.conf')], ++ input : [files('radv_drirc_gen.py'), drirc_gen, join_paths(dir_source_root, 'src/util/00-radv@0@-defaults.conf'.format(get_option('egl-lib-suffix')))], + output : ['radv_drirc.c', 'radv_drirc.h'], + command : [ + prog_python, '@INPUT0@', +@@ -250,7 +250,7 @@ libvulkan_radeon = shared_library( endif libvulkan_radeon = shared_library( - 'vulkan_radeon', + 'vulkan_radeon' + get_option('egl-lib-suffix'), [libradv_files, radv_entrypoints, radv_drirc, sha1_h, radix_sort_spv, bvh_spv, radv_annotate_layer], vs_module_defs : vulkan_api_def, include_directories : [ --- src/egl/meson.build.orig 2020-12-03 22:36:27 UTC +++ src/egl/meson.build @@ -144,7 +144,7 @@ if not with_glvnd egl_lib_name = 'EGL' + get_option('egl-lib-suffix') egl_lib_version = '1.0.0' else - egl_lib_name = 'EGL_@0@'.format(glvnd_vendor_name) + egl_lib_name = 'EGL_@0@'.format(glvnd_vendor_name) + get_option('egl-lib-suffix') egl_lib_version = '0.0.0' deps_for_egl += dep_glvnd files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] --- src/gallium/targets/dri/meson.build.orig 2024-08-31 18:55:15 UTC +++ src/gallium/targets/dri/meson.build @@ -29,7 +29,7 @@ libgallium_dri = shared_library( endif libgallium_dri = shared_library( - libgallium_name, + libgallium_name + get_option('egl-lib-suffix'), files('dri_target.c'), include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, --- src/gbm/backends/dri/meson.build.orig 2024-11-27 22:48:04 UTC +++ src/gbm/backends/dri/meson.build @@ -9,7 +9,7 @@ shared_library( endif shared_library( - 'dri_gbm', + 'dri' + get_option('egl-lib-suffix') + '_gbm', files('gbm_dri.c', 'gbm_driint.h'), include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux], link_args : [ld_args_gc_sections], --- src/gbm/meson.build.orig 2022-09-12 22:59:56 UTC +++ src/gbm/meson.build @@ -52,7 +52,7 @@ libgbm = shared_library( endif libgbm = shared_library( - libgbm_name, + libgbm_name + get_option('egl-lib-suffix'), files_gbm, include_directories : incs_gbm, c_args : [args_gbm], --- src/glx/meson.build.orig 2020-12-03 22:36:27 UTC +++ src/glx/meson.build @@ -108,10 +108,10 @@ elif with_dri_platform == 'windows' endif if not with_glvnd - gl_lib_name = 'GL' + gl_lib_name = 'GL' + get_option('egl-lib-suffix') gl_lib_version = '1.2.0' else - gl_lib_name = 'GLX_@0@'.format(glvnd_vendor_name) + gl_lib_name = 'GLX_@0@'.format(glvnd_vendor_name) + get_option('egl-lib-suffix') gl_lib_version = '0.0.0' files_libglx += files( 'g_glxglvnddispatchfuncs.c', ---- src/intel/vulkan/meson.build.orig 2026-05-27 20:30:38 UTC +--- src/intel/vulkan/meson.build.orig 2026-06-03 18:25:19 UTC +++ src/intel/vulkan/meson.build -@@ -102,7 +102,7 @@ libanv_drirc_files = custom_target( - libanv_drirc_args, - '--drirc-src', '@OUTPUT0@', - '--drirc-hdr', '@OUTPUT1@', -- '--validate', join_paths(dir_source_root, 'src/util/00-mesa-defaults.conf')], -+ '--validate', join_paths(dir_source_root, 'src/util/00-mesa@0@-defaults.conf'.format(get_option('egl-lib-suffix')))], - ) - - libanv_drirc = static_library( +@@ -95,7 +95,7 @@ libanv_drirc_files = custom_target( + + libanv_drirc_files = custom_target( + 'libanv_drirc', +- input : ['anv_drirc_gen.py', drirc_gen, join_paths(dir_source_root, 'src/util/00-anv-defaults.conf')], ++ input : ['anv_drirc_gen.py', drirc_gen, join_paths(dir_source_root, 'src/util/00-anv@0@-defaults.conf'.format(get_option('egl-lib-suffix')))], + output : ['anv_drirc.c', 'anv_drirc.h'], + command : [prog_python, '@INPUT0@', + '-p', join_paths(dir_source_root, 'src/util/'), @@ -302,7 +302,7 @@ libvulkan_intel = shared_library( ) libvulkan_intel = shared_library( - 'vulkan_intel', + 'vulkan_intel' + get_option('egl-lib-suffix'), [files('anv_gem.c'), anv_entrypoints[0], bvh_spv], include_directories : [ inc_include, inc_src, inc_intel, --- src/mesa/glapi/es1api/meson.build.orig 2025-08-06 21:21:09 UTC +++ src/mesa/glapi/es1api/meson.build @@ -23,7 +23,7 @@ libglesv1_cm = shared_library( ) libglesv1_cm = shared_library( - 'GLESv1_CM' + get_option('gles-lib-suffix'), + 'GLESv1_CM' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'), ['libgles1_public.c', es1_glapi_mapi_tmp_h], vs_module_defs : gles1_def, c_args : [ --- src/mesa/glapi/es2api/meson.build.orig 2025-08-06 21:21:09 UTC +++ src/mesa/glapi/es2api/meson.build @@ -23,7 +23,7 @@ libgles2 = shared_library( ) libgles2 = shared_library( - 'GLESv2' + get_option('gles-lib-suffix'), + 'GLESv2' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'), ['libgles2_public.c', es2_glapi_mapi_tmp_h], vs_module_defs : gles2_def, c_args : [ --- src/mesa/glapi/shared-glapi/meson.build.orig 2025-08-06 21:21:09 UTC +++ src/mesa/glapi/shared-glapi/meson.build @@ -11,7 +11,7 @@ libglapi = static_library( ) libglapi = static_library( - 'glapi', + 'glapi' + get_option('egl-lib-suffix'), ['core.c', shared_glapi_mapi_tmp_h], c_args : [ c_msvc_compat_args, ---- src/util/meson.build.orig 2022-12-03 14:41:29 UTC +--- src/util/meson.build.orig 2026-06-03 18:25:19 UTC +++ src/util/meson.build -@@ -170,10 +170,10 @@ files_mesa_util = files( - 'mesa_cache_db.h', - ) +@@ -211,33 +211,33 @@ endif + files_mesa_util += files('cache_ops_null.c') + endif -files_drirc = files('00-mesa-defaults.conf') +files_drirc = files('00-mesa@0@-defaults.conf'.format(get_option('egl-lib-suffix'))) - if with_amd_vk -- files_drirc += files('00-radv-defaults.conf') -+ files_drirc += files('00-radv@0@-defaults.conf'.format(get_option('egl-lib-suffix'))) - endif + foreach i : [ +- [with_amd_vk, '00-radv-defaults.conf'], +- [with_intel_vk, '00-anv-defaults.conf'], +- [with_intel_hasvk, '00-hasvk-defaults.conf'], +- [with_nouveau_vk, '00-nvk-defaults.conf'], +- [with_microsoft_vk, '00-dzn-defaults.conf'], +- [with_freedreno_vk, '00-turnip-defaults.conf'], +- [with_gallium_r300, '00-r300-defaults.conf'], +- [with_gallium_iris, '00-iris-defaults.conf'], +- [with_gallium_crocus, '00-crocus-defaults.conf'], +- [with_gallium_asahi, '00-asahi-defaults.conf'], +- [with_gallium_v3d, '00-v3d-defaults.conf'], +- [with_asahi_vk, '00-hk-defaults.conf'], +- [with_panfrost_vk, '00-panvk-defaults.conf'], +- [with_gallium_virgl, '00-virtio_gpu-defaults.conf'], +- [with_gallium_panfrost, '00-panfrost-defaults.conf'], +- [with_gallium_radeonsi, '00-radeonsi-defaults.conf'], +- [with_gallium_zink, '00-zink-defaults.conf'], +- [with_gallium_r600, '00-r600-defaults.conf'], +- [with_gallium_freedreno, '00-msm-defaults.conf'], +- [with_gallium_d3d12, '00-d3d12-defaults.conf'], +- [with_gallium_svga, '00-vmwgfx-defaults.conf'], ++ [with_amd_vk, '00-radv@0@-defaults.conf'], ++ [with_intel_vk, '00-anv@0@-defaults.conf'], ++ [with_intel_hasvk, '00-hasvk@0@-defaults.conf'], ++ [with_nouveau_vk, '00-nvk@0@-defaults.conf'], ++ [with_microsoft_vk, '00-dzn@0@-defaults.conf'], ++ [with_freedreno_vk, '00-turnip@0@-defaults.conf'], ++ [with_gallium_r300, '00-r300@0@-defaults.conf'], ++ [with_gallium_iris, '00-iris@0@-defaults.conf'], ++ [with_gallium_crocus, '00-crocus@0@-defaults.conf'], ++ [with_gallium_asahi, '00-asahi@0@-defaults.conf'], ++ [with_gallium_v3d, '00-v3d@0@-defaults.conf'], ++ [with_asahi_vk, '00-hk@0@-defaults.conf'], ++ [with_panfrost_vk, '00-panvk@0@-defaults.conf'], ++ [with_gallium_virgl, '00-virtio_gpu@0@-defaults.conf'], ++ [with_gallium_panfrost, '00-panfrost@0@-defaults.conf'], ++ [with_gallium_radeonsi, '00-radeonsi@0@-defaults.conf'], ++ [with_gallium_zink, '00-zink@0@-defaults.conf'], ++ [with_gallium_r600, '00-r600@0@-defaults.conf'], ++ [with_gallium_freedreno, '00-msm@0@-defaults.conf'], ++ [with_gallium_d3d12, '00-d3d12@0@-defaults.conf'], ++ [with_gallium_svga, '00-vmwgfx@0@-defaults.conf'], + ] + if i[0] +- files_drirc += files(i[1]) ++ files_drirc += files(i[1].format(get_option('egl-lib-suffix'))) + endif + endforeach - if with_tests diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 4b2ba4129aac..d6febc1cee91 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -1,51 +1,57 @@ %%VKLAYERS%%bin/mesa-overlay-control.py %%VKLAYERS%%bin/mesa-screenshot-control.py %%OPENCL%%etc/OpenCL/vendors/rusticl.icd %%COINST%%etc/libmap.d/mesa%%SUFFIX%%.conf %%NO_COINST%%include/EGL/eglext_angle.h %%NO_COINST%%include/EGL/eglmesaext.h %%NO_COINST%%include/GL/internal/dri_interface.h %%NO_COINST%%include/gbm.h %%NO_COINST%%include/gbm_backend_abi.h %%crocus%%lib/dri%%SUFFIX%%/crocus_dri.so %%iris%%lib/dri%%SUFFIX%%/iris_dri.so %%X11%%lib/dri%%SUFFIX%%/libdril_dri.so %%panfrost%%lib/dri%%SUFFIX%%/panfrost_dri.so %%r600%%lib/dri%%SUFFIX%%/r600_dri.so %%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_dri.so %%panfrost%%lib/dri%%SUFFIX%%/rockchip_dri.so %%VAAPI%%%%r600%%lib/dri%%SUFFIX%%/r600_drv_video.so %%VAAPI%%%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_drv_video.so lib/gbm/dri%%SUFFIX%%_gbm.so %%NO_COINST%%lib/libEGL_mesa%%SUFFIX%%.so lib/libEGL_mesa%%SUFFIX%%.so.0 lib/libEGL_mesa%%SUFFIX%%.so.0.0.0 %%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so %%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0 %%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0 %%OPENCL%%lib/libRusticlOpenCL.so %%OPENCL%%lib/libRusticlOpenCL.so.1 %%OPENCL%%lib/libRusticlOpenCL.so.1.0.0 %%VKLAYERS%%lib/libVkLayer_MESA_anti_lag.so %%VKLAYERS%%lib/libVkLayer_MESA_device_select.so %%VKLAYERS%%lib/libVkLayer_MESA_overlay.so %%VKLAYERS%%lib/libVkLayer_MESA_screenshot.so %%VKLAYERS%%lib/libVkLayer_MESA_vram_report_limit.so lib/libgallium_dri%%SUFFIX%%.so %%NO_COINST%%lib/libgbm%%SUFFIX%%.so lib/libgbm%%SUFFIX%%.so.1 lib/libgbm%%SUFFIX%%.so.1.0.0 %%anv%%lib/libvulkan_intel%%SUFFIX%%.so %%radv%%lib/libvulkan_radeon%%SUFFIX%%.so %%NO_COINST%%libdata/pkgconfig/dri.pc %%NO_COINST%%libdata/pkgconfig/gbm.pc +%%anv%%share/drirc.d/00-anv%%SUFFIX%%-defaults.conf +%%crocus%%share/drirc.d/00-crocus%%SUFFIX%%-defaults.conf +%%iris%%share/drirc.d/00-iris%%SUFFIX%%-defaults.conf share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf +%%panfrost%%share/drirc.d/00-panfrost%%SUFFIX%%-defaults.conf +%%r600%%share/drirc.d/00-r600%%SUFFIX%%-defaults.conf +%%radeonsi%%share/drirc.d/00-radeonsi%%SUFFIX%%-defaults.conf %%radv%%share/drirc.d/00-radv%%SUFFIX%%-defaults.conf %%NO_COINST%%share/glvnd/egl_vendor.d/50_mesa.json %%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json %%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_screenshot.json %%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_vram_report_limit.json %%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json %%radv%%%%NO_COINST%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json %%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_anti_lag.json %%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json