From nobody Sat Dec 21 08:10:53 2024
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 4YFcRd5S38z5X1j4;
	Sat, 21 Dec 2024 08:10:53 +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 "R10" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4YFcRd4xCPz4cdm;
	Sat, 21 Dec 2024 08:10:53 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1734768653;
	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=tHHwlHLCPH8+m/7mEru8gRw/Hu2/yTSlj2Y3M4RAR+o=;
	b=LxXnT0P/h4dRVOmyXvO8+xrQeA/GlOJlqzoCNlSAzeyIDTLbqsuY3x02VPUDCNNxdYl3zJ
	jVnI+bBPXTK8oICHmupK88+UDnC0L7rrQwIxidR13RB2CXGimD5K8AqVoi5gzUEaKN1sR+
	WFbzZFBIPuENr6kGq17h5Qfp8zqqxaGgkYRUOHsX1gnoW8P29YTbGsfVVMhGgNtA2sQ9bM
	+pHX4rzqsrga9CPtXqfOy5K7sTo4OBHa7JkHOtPcdjjtCkhkMpb8XNrqVdUNsAEaKOnRhJ
	mYUu88z3KZ7bve/AFbPFzGZPGNW/Ilfi4gb2M0jYL02vvUwezUDn3YI77EvT4g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1734768653;
	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=tHHwlHLCPH8+m/7mEru8gRw/Hu2/yTSlj2Y3M4RAR+o=;
	b=xEZNW7s1m2Bd+s1CnB8D5rc18W0gr5Qb267VY2pQF0U3QBpS6lkuIj3g2fX/2e1XlWJXqp
	IcW8BC2r9zqZAXneqDGwbrYroFk9cLh9oJF3ZwwqqpDDWQMCRYvFi+gZDB848ZkmQHvPf+
	NU3if//3awFrXWU6CS3mlgD+uaGbioe1OqQMy/ES1+i9u6etoaoW7qyv14JYW4ktcjJUkx
	iYZKtePhIJ07YdmGTAK+TGsIg6Wt11HjNlO2h2r4UNrnhcbZUs49pEHdUYTMeMxmHRmI7w
	6xXmS4pdrTIbFewEerDeqHv5qi0DzZhmvsCD30rfUV0eQE237pK7un18ooc5PA==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734768653; a=rsa-sha256; cv=none;
	b=YIJeG89YgQBvvL96ffoQd3BsgSGH4+V99AN2v/Lw+ni+CdoGOUjgpVLaRvrDhrECUL/IUT
	n45Qz7d5/wJkOmlHo2a5utrket2vffJqUKdkHjvGKe5Ys5fAL0L6k5XkJQgAg4Hl51Nh0F
	F3FB1uq4Z8ezB6SpuyDVRTHX/gxLWB7qY943AemDRtE8rwWhG9bl301WltnPq9fUfjng0w
	sm8oNfv6tIQm8PZoUvMSY10EsexI/ewIEk44Gn1SepGLTdwPOGtled2kBFPpkJCi8kWIhW
	A4IXTz03O0tpGG5KoDfGar+WLSdYvRdWhx2wXs5wz8GWH6TeFqPnroFQazitvw==
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 4YFcRd4P8zzGPh;
	Sat, 21 Dec 2024 08:10:53 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BL8Arc7072893;
	Sat, 21 Dec 2024 08:10:53 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BL8ArTn072890;
	Sat, 21 Dec 2024 08:10:53 GMT
	(envelope-from git)
Date: Sat, 21 Dec 2024 08:10:53 GMT
Message-Id: <202412210810.4BL8ArTn072890@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Jan Beich <jbeich@FreeBSD.org>
Subject: git: 79702563294a - main - graphics/vulkan-headers: update
  to 1.4.304
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-main@freebsd.org
Sender: owner-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: 79702563294af3150fc2747a6c2a5e4719780106
Auto-Submitted: auto-generated

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=79702563294af3150fc2747a6c2a5e4719780106

commit 79702563294af3150fc2747a6c2a5e4719780106
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-12-20 05:43:52 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-12-21 08:09:38 +0000

    graphics/vulkan-headers: update to 1.4.304
    
    Force rebuild vulkan-loader to make sure vulkaninfo shows the new version.
    
    Changes:        https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.3.303...v1.4.304
    Reported by:    Repology, portscout
---
 graphics/vulkan-headers/Makefile          |  3 +-
 graphics/vulkan-headers/distinfo          |  6 +--
 graphics/vulkan-headers/files/patch-32bit | 62 -------------------------------
 graphics/vulkan-loader/Makefile           |  2 +-
 graphics/vulkan-tools/Makefile            |  5 +++
 graphics/vulkan-tools/distinfo            |  2 +
 6 files changed, 12 insertions(+), 68 deletions(-)

diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile
index c0c578caf341..37670af049b0 100644
--- a/graphics/vulkan-headers/Makefile
+++ b/graphics/vulkan-headers/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	vulkan-headers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.303
-PORTREVISION=	1
+DISTVERSION=	1.4.304
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo
index a8cbe32f8f6b..de6e1d970ad4 100644
--- a/graphics/vulkan-headers/distinfo
+++ b/graphics/vulkan-headers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733300347
-SHA256 (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = fdf0e2e05356b455137ff97f837c9689ba253ec7d20f87ad81575b9bdbe7fdd4
-SIZE (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = 2440533
+TIMESTAMP = 1734673432
+SHA256 (KhronosGroup-Vulkan-Headers-v1.4.304_GH0.tar.gz) = 5e1a06b3f27e7581b55d1dea176fd97ee0a2f299406db2f437c1d2f297ceba5b
+SIZE (KhronosGroup-Vulkan-Headers-v1.4.304_GH0.tar.gz) = 2443071
diff --git a/graphics/vulkan-headers/files/patch-32bit b/graphics/vulkan-headers/files/patch-32bit
deleted file mode 100644
index 2413e6fe2618..000000000000
--- a/graphics/vulkan-headers/files/patch-32bit
+++ /dev/null
@@ -1,62 +0,0 @@
-https://github.com/KhronosGroup/Vulkan-Hpp/commit/c2c49478e9f2
-https://github.com/KhronosGroup/Vulkan-Hpp/issues/2009
-
---- include/vulkan/vulkan_handles.hpp.orig	2024-12-04 08:19:07 UTC
-+++ include/vulkan/vulkan_handles.hpp
-@@ -17706,5 +17706,56 @@ namespace VULKAN_HPP_NAMESPACE
-   VULKAN_HPP_NODISCARD typename ResultValueType<uint32_t>::type enumerateInstanceVersion( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
- #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
- 
-+// operators to compare vk::-handles
-+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator<=>( T const & lhs, T const & rhs )
-+{
-+  return static_cast<typename T::NativeType>( lhs ) <=> static_cast<typename T::NativeType>( rhs );
-+}
-+#else
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator==( T const & lhs, T const & rhs )
-+{
-+  return static_cast<typename T::NativeType>( lhs ) == static_cast<typename T::NativeType>( rhs );
-+}
-+
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator!=( T const & lhs, T const & rhs )
-+{
-+  return static_cast<typename T::NativeType>( lhs ) != static_cast<typename T::NativeType>( rhs );
-+}
-+
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator<( T const & lhs, T const & rhs )
-+{
-+  return static_cast<typename T::NativeType>( lhs ) < static_cast<typename T::NativeType>( rhs );
-+}
-+#endif
-+
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator==( T const & v, std::nullptr_t )
-+{
-+  return !v;
-+}
-+
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator==( std::nullptr_t, T const & v )
-+{
-+  return !v;
-+}
-+
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator!=( T const & v, std::nullptr_t )
-+{
-+  return !!v;
-+}
-+
-+template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
-+bool operator!=( std::nullptr_t, T const & v )
-+{
-+  return !!v;
-+}
-+
- }  // namespace VULKAN_HPP_NAMESPACE
- #endif
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index 605e95e9b699..e3fb6e038a9b 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vulkan-loader
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.303
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index 6d858837ee35..1af3d3db8c42 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -20,6 +20,11 @@ GH_TUPLE=	zeux:volk:1.3.295-23-ge767d0e:volk/volk
 CMAKE_OFF=	BUILD_ICD
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}"
 
+.if ${DISTVERSION:E} < 304
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:${DISTVERSIONFULL}:vkheaders/Vulkan-Headers
+CFLAGS+=	-I${WRKSRC_vkheaders}/include
+.endif
+
 OPTIONS_DEFINE=		WAYLAND XCB XLIB
 OPTIONS_DEFAULT=	WAYLAND XCB XLIB
 
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index 9ee57be7d277..08b2041f3a2f 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -3,3 +3,5 @@ SHA256 (KhronosGroup-Vulkan-Tools-v1.4.303_GH0.tar.gz) = 958b646bbc5ac0a54908342
 SIZE (KhronosGroup-Vulkan-Tools-v1.4.303_GH0.tar.gz) = 758514
 SHA256 (zeux-volk-1.3.295-23-ge767d0e_GH0.tar.gz) = 7e8e350717f3d30bc1bc4570c4a4d1896590dd4be21c872dbe3273e9cfea3b6e
 SIZE (zeux-volk-1.3.295-23-ge767d0e_GH0.tar.gz) = 65349
+SHA256 (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = fdf0e2e05356b455137ff97f837c9689ba253ec7d20f87ad81575b9bdbe7fdd4
+SIZE (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = 2440533