git: 79702563294a - main - graphics/vulkan-headers: update to 1.4.304
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 21 Dec 2024 08:10:53 UTC
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