Date: Thu, 04 Jun 2026 00:48:30 +0000 From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 502bab5f4bd9 - main - graphics/mesa-devel: update to 26.1.b.2478 Message-ID: <6a20cb5e.2236d.4f889783@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=502bab5f4bd94c68232a7d2775dfc7192ba4d4d9 commit 502bab5f4bd94c68232a7d2775dfc7192ba4d4d9 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2026-06-03 18:25:19 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2026-06-04 00:47:37 +0000 graphics/mesa-devel: update to 26.1.b.2478 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/addd09fb764...095e4f5f1bb --- graphics/mesa-devel/Makefile | 14 ++-- graphics/mesa-devel/distinfo | 6 +- graphics/mesa-devel/files/patch-cache_line | 51 -------------- graphics/mesa-devel/files/patch-suffix | 109 ++++++++++++++++++++--------- graphics/mesa-devel/pkg-plist | 6 ++ 5 files changed, 90 insertions(+), 96 deletions(-) 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,7 +1,6 @@ PORTNAME= mesa -DISTVERSION= 26.1-branchpoint-1876 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -gaddd09fb764 +DISTVERSION= 26.1-branchpoint-2478 +DISTVERSIONSUFFIX= -g095e4f5f1bb CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -144,10 +143,11 @@ post-patch: ${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 \ 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 @@ -31,23 +31,18 @@ Library selection is handled by libglvnd and/or libmap.conf. 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( @@ -115,17 +110,17 @@ Library selection is handled by libglvnd and/or libmap.conf. 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( ) @@ -168,18 +163,62 @@ Library selection is handled by libglvnd and/or libmap.conf. ['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 @@ -39,7 +39,13 @@ lib/libgbm%%SUFFIX%%.so.1.0.0 %%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.jsonhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a20cb5e.2236d.4f889783>