Date: Sat, 3 Dec 2022 23:39:16 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 82cb0c560e71 - 2022Q4 - graphics/mesa-devel: update to 22.3.b.1543 Message-ID: <202212032339.2B3NdGfY048169@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=82cb0c560e71f1e58f690c05ea01935ab839231f commit 82cb0c560e71f1e58f690c05ea01935ab839231f Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-12-03 14:41:29 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-12-03 23:39:12 +0000 graphics/mesa-devel: update to 22.3.b.1543 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/921cfcf4c4f...55ffbf867b7 (cherry picked from commit 11ca4fcbec8656e71905e2a19c9efcaf49482766) --- graphics/mesa-devel/Makefile | 8 ++++---- graphics/mesa-devel/distinfo | 6 +++--- graphics/mesa-devel/files/patch-suffix | 34 ++++++++++------------------------ 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index ad1daf1fbc47..eeac98e17175 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 22.3-branchpoint-1336 -DISTVERSIONSUFFIX= -g921cfcf4c4f +DISTVERSION= 22.3-branchpoint-1543 +DISTVERSIONSUFFIX= -g55ffbf867b7 CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -155,10 +155,10 @@ post-patch: ${WRKSRC}/bin/git_sha1_gen.py post-patch-COINST-on: - @${MV} ${WRKSRC}/src/amd/vulkan/00-radv-defaults.conf \ - ${WRKSRC}/src/amd/vulkan/00-radv${PKGNAMESUFFIX}-defaults.conf @${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 post-install-COINST-on: @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 67e9c7f13e56..6395ac1b833c 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1669852694 -SHA256 (mesa3d-mesa-22.3-branchpoint-1336-g921cfcf4c4f_GH0.tar.gz) = 179c8fba70c0b0c4211028be161ae5aac478158ba2f103a39d8619b2d8815ece -SIZE (mesa3d-mesa-22.3-branchpoint-1336-g921cfcf4c4f_GH0.tar.gz) = 27302685 +TIMESTAMP = 1670078489 +SHA256 (mesa3d-mesa-22.3-branchpoint-1543-g55ffbf867b7_GH0.tar.gz) = 606514ba18c5a809d0c0d58a7b2969d1b697f2345a37686d1dd84aba18697f3e +SIZE (mesa3d-mesa-22.3-branchpoint-1543-g55ffbf867b7_GH0.tar.gz) = 27350606 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index 08a324710606..61af28390c1c 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -40,18 +40,9 @@ Library selection is handled by libglvnd and/or libmap.conf. endif _xa = get_option('gallium-xa') ---- src/amd/vulkan/meson.build.orig 2022-08-08 22:10:24 UTC +--- src/amd/vulkan/meson.build.orig 2022-12-03 14:41:29 UTC +++ src/amd/vulkan/meson.build -@@ -97,7 +97,7 @@ libradv_files = files( - 'vk_format.h', - ) - --files_drirc = files('00-radv-defaults.conf') -+files_drirc = files('00-radv@0@-defaults.conf'.format(get_option('egl-lib-suffix'))) - - install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d')) - -@@ -163,7 +163,7 @@ libvulkan_radeon = shared_library( +@@ -162,7 +162,7 @@ libvulkan_radeon = shared_library( endif libvulkan_radeon = shared_library( @@ -169,23 +160,18 @@ Library selection is handled by libglvnd and/or libmap.conf. [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h], c_args : [ _glapi_c_args, ---- src/util/meson.build.orig 2021-02-24 18:55:02 UTC +--- src/util/meson.build.orig 2022-12-03 14:41:29 UTC +++ src/util/meson.build -@@ -135,7 +135,7 @@ files_mesa_util = files( - 'xxhash.h', +@@ -170,10 +170,10 @@ files_mesa_util = files( + 'mesa_cache_db.h', ) -files_drirc = files('00-mesa-defaults.conf') +files_drirc = files('00-mesa@0@-defaults.conf'.format(get_option('egl-lib-suffix'))) - install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d')) - -@@ -158,7 +158,7 @@ files_xmlconfig = files( + 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 - files_xmlconfig += custom_target( - 'driconf_static.h', -- input: ['driconf_static.py', '00-mesa-defaults.conf'], -+ input: ['driconf_static.py', '00-mesa@0@-defaults.conf'.format(get_option('egl-lib-suffix'))], - output: 'driconf_static.h', - command: [ - prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@' + if with_tests
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212032339.2B3NdGfY048169>