From nobody Sat Feb 26 00:43:01 2022 X-Original-To: dev-commits-ports-main@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 2292719E8C83; Sat, 26 Feb 2022 00:43:02 +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 4K57Cn5wDxz4dR3; Sat, 26 Feb 2022 00:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645836182; 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=rK8UWEvjJMg9dAg6b61YsuIHjvpMY9ix/jY6VMVGpa8=; b=MUqNL2AfcEVi8XDfBRKTNc+RCGbJVDr35ZEWWZkpRLagY8bENdUEnTpm/wLPrXROyKGXGz tXqcopIm3Jc0tyNvVg6wfsHcvLTfV6NsB7uv8QJw4j1TN0mK5hPmpzAQY1kL/vbYgPQMXO 2K+frpCxA9Ny4dyyKdyKvaM9vmUi1FVLShAAb+OqYaOalXcQ5r3NS1GP36/6yo8Fr743ZW VyucFjVzyN+1FAJf4HGJ8hrrEei7U3+BvyTxj3hvxTAEs3G2tTD2j7lvXrDmT9Pf1147Bk mP8NIFoFkAJPzWIl0A6hGc7fIasU7zsvmD0CtVS9vYAm7yMP/ncfmYjr6JU9Gg== 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 684871E12; Sat, 26 Feb 2022 00:43:01 +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 21Q0h1Nt017037; Sat, 26 Feb 2022 00:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21Q0h1ub017036; Sat, 26 Feb 2022 00:43:01 GMT (envelope-from git) Date: Sat, 26 Feb 2022 00:43:01 GMT Message-Id: <202202260043.21Q0h1ub017036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d34d11c6944f - main - graphics/mesa-devel: update to 21.4.b.828 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: d34d11c6944f82fcb0c183cdae196bd417fda781 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645836182; 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=rK8UWEvjJMg9dAg6b61YsuIHjvpMY9ix/jY6VMVGpa8=; b=My9QRrQiDfVoW02CQXitzvexKL7COyDq9UgCl6zXI4+HC2iIocvvdnetQcoZ3p/StX//rU 6H5OKWu7/5NjBtdzLK7sVGUC15IYb1rmZftc4Um5MzKUOKzbM7QxYYpsqr/BaGI6lexvYS z2+rvMLdaxEqeb3aPCKP+A+It4lOmGawxe7ryIWLZ+YElybnlvE19f1zxc/Hv3W0obWCVP 1z+7HOym/RSlVw5VLHodoluPawK15IZuwTr3tUHbjZdWa7ALPFdaQy/4RLBgnjiVq9akKx CkUNQIUng3/8YfbmnenQcB+orCPDZtYQsKwbn/+9J3csHjbQI0Y17tU7f6mRlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645836182; a=rsa-sha256; cv=none; b=QoKKN1RPffmbiuJxFyFlfMO8jbdaRs2mIC43fGcrKGZGpN8hAtXVqkZQigBet+yStkv5rG DlFLagBf2m9CfEHy/dU+lnPXbRSSNaPxF0v0JyRitmtFgWKj6iadXNpqakVWZzimC2fq5A jUrLWLeoJAy6SNoMs2UJWRvUxPYtFBF7AyA3dH24b7EfXxL0PBIi6mf7uI9wuN7CRPsSd9 jFm/lp/A9SbR2rHbFdOqlyvmcPAV5F5Ogt01hsw2aGCEG8SbgDvuOp9DhoDkEqzyblytIj Wn05F+uVmYy8dbQiVNokpHRFLKE1ctYqBrRSBQr5on9IiO+pbilajJGP0ZFwKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d34d11c6944f82fcb0c183cdae196bd417fda781 commit d34d11c6944f82fcb0c183cdae196bd417fda781 Author: Jan Beich AuthorDate: 2022-02-25 13:08:39 +0000 Commit: Jan Beich CommitDate: 2022-02-26 00:42:46 +0000 graphics/mesa-devel: update to 21.4.b.828 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/b4bef890ee4...e5c39bc427f --- graphics/mesa-devel/Makefile | 6 ++++-- graphics/mesa-devel/distinfo | 6 +++--- graphics/mesa-devel/files/patch-suffix | 17 +++++++++++++---- graphics/mesa-devel/pkg-plist | 1 + 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index c7174bdf7870..f4f07c519a4a 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 22.0-branchpoint-752 -DISTVERSIONSUFFIX= -gb4bef890ee4 +DISTVERSION= 22.0-branchpoint-828 +DISTVERSIONSUFFIX= -ge5c39bc427f CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -147,6 +147,8 @@ 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 diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index a420af09feb7..1ce787579f35 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1645651522 -SHA256 (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = b2c8da58866ae27270a27607cff8745a60f93d067ed29eeccdeda8a02d16b2c1 -SIZE (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = 23598120 +TIMESTAMP = 1645828462 +SHA256 (mesa3d-mesa-22.0-branchpoint-828-ge5c39bc427f_GH0.tar.gz) = 75dee3abdd483c5c23859c8182f8886e997b4ad6b10f78b1e057959fc5070b3b +SIZE (mesa3d-mesa-22.0-branchpoint-828-ge5c39bc427f_GH0.tar.gz) = 23610402 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 1f9cf9358d2c..b2003b02bd54 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -40,17 +40,26 @@ Library selection is handled by libglvnd and/or libmap.conf. endif _xa = get_option('gallium-xa') ---- src/amd/vulkan/meson.build.orig 2021-02-15 15:47:31 UTC +--- src/amd/vulkan/meson.build.orig 2022-02-25 15:38:08 UTC +++ src/amd/vulkan/meson.build -@@ -150,7 +150,7 @@ if with_llvm and with_ld_version_script - endif +@@ -92,7 +92,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')) + +@@ -150,7 +150,7 @@ endif + vulkan_radv_def = 'vulkan_radv.def' libvulkan_radeon = shared_library( - 'vulkan_radeon', + 'vulkan_radeon' + get_option('egl-lib-suffix'), [libradv_files, radv_entrypoints, sha1_h], + vs_module_defs : vulkan_radv_def, include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi, --- src/egl/meson.build.orig 2020-12-03 22:36:27 UTC +++ src/egl/meson.build @@ -144,7 +144,7 @@ if not with_glvnd diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 9d795ca0130f..19bbfb5ad595 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -37,6 +37,7 @@ lib/libglapi%%SUFFIX%%.so.0.0.0 %%NO_COINST%%libdata/pkgconfig/dri.pc %%NO_COINST%%libdata/pkgconfig/gbm.pc share/drirc.d/00-mesa%%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 %%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json