diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2026-07-08 21:43:56 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2026-07-09 00:48:23 +0000 |
| commit | 9689791e7c5087a25b18c66cc9b609f941a66cc7 (patch) | |
| tree | 37eb5d6b0d1051fd41e337d7b2a1770b038f05f6 | |
| parent | e64765f11a1c45e38413bf0614fe6c26f0232888 (diff) | |
graphics/mesa-devel: update to 26.1.b.4644
Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/68468b6d1b9...712ebaa4b1a
(cherry picked from commit 95f2a571694982eb82de3f2692337f72d9e40bdc)
| -rw-r--r-- | graphics/mesa-devel/Makefile | 14 | ||||
| -rw-r--r-- | graphics/mesa-devel/distinfo | 6 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/patch-suffix | 83 |
3 files changed, 9 insertions, 94 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 890ad0bd3b5c..f1dd152aba61 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 26.1-branchpoint-3676 -DISTVERSIONSUFFIX= -g68468b6d1b9 +DISTVERSION= 26.1-branchpoint-4644 +DISTVERSIONSUFFIX= -g712ebaa4b1a CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -142,15 +142,13 @@ post-patch: @${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \ ${WRKSRC}/bin/git_sha1_gen.py -post-patch-COINST-on: - @(cd ${WRKSRC}/src/util; for f in 00-*-defaults.conf; do \ +post-install-COINST-on: + @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ + ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf + @(cd ${STAGEDIR}${PREFIX}/share/drirc.d; 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 <bsd.port.mk> diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 4d687451f205..b922596b3326 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1782330806 -SHA256 (mesa-26.1-branchpoint-3676-g68468b6d1b9.tar.bz2) = 36cdbb8c4026d2e6f32f0d81ff13f2329d94615e76b9104930d45f39d24f123b -SIZE (mesa-26.1-branchpoint-3676-g68468b6d1b9.tar.bz2) = 111482856 +TIMESTAMP = 1783547036 +SHA256 (mesa-26.1-branchpoint-4644-g712ebaa4b1a.tar.bz2) = 500b3d904fa9c356e03c302e0fc6f14461fa4cde0a617f49d74408ebb96d97aa +SIZE (mesa-26.1-branchpoint-4644-g712ebaa4b1a.tar.bz2) = 100797422 SHA256 (de5cf0a44b50.patch) = c9e02e5eb1fb4e3aa2bc7a7e0a70f28f3ee609835ff0b59e827893a821983851 SIZE (de5cf0a44b50.patch) = 1108 diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index e6b9b998f98f..3afe71a5df99 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -33,15 +33,6 @@ Library selection is handled by libglvnd and/or libmap.conf. with_gallium_xa = get_option('gallium-xa') \ --- src/amd/vulkan/meson.build.orig 2026-06-03 18:25:19 UTC +++ src/amd/vulkan/meson.build -@@ -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 @@ -112,15 +103,6 @@ Library selection is handled by libglvnd and/or libmap.conf. 'g_glxglvnddispatchfuncs.c', --- src/intel/vulkan/meson.build.orig 2026-06-03 18:25:19 UTC +++ src/intel/vulkan/meson.build -@@ -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( ) @@ -163,68 +145,3 @@ 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 2026-06-10 20:57:35 UTC -+++ src/util/meson.build -@@ -211,36 +211,36 @@ 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'))) - - 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_imagination_vk, '00-pvr-defaults.conf'], -- [with_broadcom_vk, '00-v3dv-defaults.conf'], -- [with_freedreno_vk, '00-turnip-defaults.conf'], -- [with_virtio_vk, '00-venus-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_imagination_vk, '00-pvr@0@-defaults.conf'], -+ [with_broadcom_vk, '00-v3dv@0@-defaults.conf'], -+ [with_freedreno_vk, '00-turnip@0@-defaults.conf'], -+ [with_virtio_vk, '00-venus@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 - |
