From nobody Sat Dec 3 23:39:16 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPmVY1f6Xz4jm2K; Sat, 3 Dec 2022 23:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPmVY0qnWz3hNm; Sat, 3 Dec 2022 23:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670110757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tCifCGIbKoSpYtvAFfhr+8SjYnhRKXFEvniqLXtL1s=; b=TC0ovYwDyUUWwRaCl57XeY9wbNb5qqr2ekq9UfyY055hGPnLoPtUC61/YTJFUJy4OJttoJ jmLaYt5VyWAqjmSi97/jW0VttPM31+zziwooCEMwAGgqi1ZKyiSB14Xc5foW+JusHW9YsI Pd2HTXCOHJtPFVSqVdMcB+Y0tTsakuszgmvirYS/Ao/blBdhouKnTPL9WUQnzIy/EK+zL1 eMUnrlYqLrWepP+lYpfCV6p2F6GON386zi5TxwbZwytOrxT45yPe90ov8DpMYbUrt1snhz zUiU6njp4HOxlHRRPKu99ta709f4qvS+2XAmZmk0ac0kxydX5nD+KheilLOFqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670110757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tCifCGIbKoSpYtvAFfhr+8SjYnhRKXFEvniqLXtL1s=; b=RfpB4TEhe1rnn/SF6P4HWu2PmNiIlRRT83ItsoURwYm8aq3+51a/ZiGw7J53hUweUshrtU tc4q6/nWh8PdkYEdKb6vLmPI/D9FehZ6jtPDzwg6tuQbTjykeZifc2WxDMR0ifZy1DHyeQ xbc+R3iUeL+RE11H3LjOtyXA/A39tF8JikllaUVz4glb3hhi+Zgcy6mS/LYzapY73dzs29 y0qmKegZc0N7OU5mhw2TOWqgu3NBMQKUFLgz/+dP2+PJ1sgnvfMCoTGdJj/UcmRt7+rOYs tazVMtUfwWb5V6v2pOBTK5qFL+tqaGSpq36+5xs34QHr0J4U/YLv4AyGHbDFng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670110757; a=rsa-sha256; cv=none; b=csA8C1HhTBSc91uXAs7l0uc9ZCn/wa5L+ubq1QQncrQKaq4qcqF9MeAYS4rsJF4h4dkRHD whulgOagL9Mk7Hq5BE3hrtapRYKkIU5kvsrYL8oMnuyu5DwDvnJbe9CjYbCxWwHo6qTLu5 nTFC5nkBVlufnzCg/u7RSEBBG3MMf0kPUdBZo929CPhxWvnBzyMKrmqpLc1RtpJRVcGBWp wGpF+IZx3ffFkCitapUcEgHV3jZzbQ8ThoHNZQEm3/LQxujkUkVsHMu5Wpn51BZYRwKgEl V534wNKQ33sJ+UCmeX7luD5MNqA1Y1qGA/Q1ItTA2+v0R4dDlvpQfpQIJwjSJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NPmVX71B2z1CJM; Sat, 3 Dec 2022 23:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B3NdGtq048170; Sat, 3 Dec 2022 23:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B3NdGfY048169; Sat, 3 Dec 2022 23:39:16 GMT (envelope-from git) Date: Sat, 3 Dec 2022 23:39:16 GMT Message-Id: <202212032339.2B3NdGfY048169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 82cb0c560e71 - 2022Q4 - graphics/mesa-devel: update to 22.3.b.1543 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 82cb0c560e71f1e58f690c05ea01935ab839231f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=82cb0c560e71f1e58f690c05ea01935ab839231f commit 82cb0c560e71f1e58f690c05ea01935ab839231f Author: Jan Beich AuthorDate: 2022-12-03 14:41:29 +0000 Commit: Jan Beich 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