aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2023-06-30 13:30:05 +0000
committerJan Beich <jbeich@FreeBSD.org>2023-06-30 21:32:58 +0000
commit2ddbe6ca86b8a7fcf37a90b044c4ce5093a81430 (patch)
treef1358b03ad267fc8a5a34120d962b1bfbc3a6fdd
parent7d6bb145a74f9f827d4b70f2a40be0b77ca306fc (diff)
downloadports-2ddbe6ca86b8a7fcf37a90b044c4ce5093a81430.tar.gz
ports-2ddbe6ca86b8a7fcf37a90b044c4ce5093a81430.zip
graphics/vulkan-headers: update to 1.3.256
Force rebuild vulkan-loader to make sure vulkaninfo shows the new version. Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.3.255...v1.3.256 Reported by: Repology, portscout
-rw-r--r--games/warzone2100/files/patch-lib_ivis__opengl_gfx__api__vk.cpp67
-rw-r--r--graphics/vulkan-headers/Makefile2
-rw-r--r--graphics/vulkan-headers/distinfo6
-rw-r--r--graphics/vulkan-headers/pkg-plist1
-rw-r--r--graphics/vulkan-loader/Makefile1
-rw-r--r--graphics/vulkan-tools/Makefile5
-rw-r--r--graphics/vulkan-tools/distinfo2
7 files changed, 80 insertions, 4 deletions
diff --git a/games/warzone2100/files/patch-lib_ivis__opengl_gfx__api__vk.cpp b/games/warzone2100/files/patch-lib_ivis__opengl_gfx__api__vk.cpp
new file mode 100644
index 000000000000..66c1fc070497
--- /dev/null
+++ b/games/warzone2100/files/patch-lib_ivis__opengl_gfx__api__vk.cpp
@@ -0,0 +1,67 @@
+lib/ivis_opengl/gfx_api_vk.cpp:524:3: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'?
+ vk::throwResultException( result, "vmaCreateBuffer" );
+ ^~~~~~~~~~~~~~~~~~~~~~~~
+ vk::detail::throwResultException
+/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here
+ [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message )
+ ^
+lib/ivis_opengl/gfx_api_vk.cpp:1543:4: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'?
+ vk::throwResultException(result.result, "createGraphicsPipeline");
+ ^~~~~~~~~~~~~~~~~~~~~~~~
+ vk::detail::throwResultException
+/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here
+ [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message )
+ ^
+lib/ivis_opengl/gfx_api_vk.cpp:1607:3: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'?
+ vk::throwResultException( result, "vmaCreateBuffer" );
+ ^~~~~~~~~~~~~~~~~~~~~~~~
+ vk::detail::throwResultException
+/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here
+ [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message )
+ ^
+lib/ivis_opengl/gfx_api_vk.cpp:1740:3: error: no member named 'throwResultException' in namespace 'vk'; did you mean 'vk::detail::throwResultException'?
+ vk::throwResultException( result, "vmaCreateImage" );
+ ^~~~~~~~~~~~~~~~~~~~~~~~
+ vk::detail::throwResultException
+/usr/local/include/vulkan/vulkan.hpp:6639:41: note: 'vk::detail::throwResultException' declared here
+ [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message )
+ ^
+
+--- lib/ivis_opengl/gfx_api_vk.cpp.orig 2023-04-16 17:42:55 UTC
++++ lib/ivis_opengl/gfx_api_vk.cpp
+@@ -521,7 +521,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t m
+ if (result != vk::Result::eSuccess)
+ {
+ // Failed to allocate memory!
+- vk::throwResultException( result, "vmaCreateBuffer" );
++ vk::detail::throwResultException( result, "vmaCreateBuffer" );
+ }
+
+ if (autoMap)
+@@ -1540,7 +1540,7 @@ VkPSO::VkPSO(vk::Device _dev,
+ object = std::move(result.value);
+ break;
+ default:
+- vk::throwResultException(result.result, "createGraphicsPipeline");
++ vk::detail::throwResultException(result.result, "createGraphicsPipeline");
+ }
+ }
+
+@@ -1604,7 +1604,7 @@ void VkBuf::allocateBufferObject(const std::size_t& si
+ if (result != vk::Result::eSuccess)
+ {
+ // Failed to allocate memory!
+- vk::throwResultException( result, "vmaCreateBuffer" );
++ vk::detail::throwResultException( result, "vmaCreateBuffer" );
+ }
+
+ buffer_size = size;
+@@ -1737,7 +1737,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::si
+ if (result != vk::Result::eSuccess)
+ {
+ // Failed to allocate memory!
+- vk::throwResultException( result, "vmaCreateImage" );
++ vk::detail::throwResultException( result, "vmaCreateImage" );
+ }
+
+ if (root.debugUtilsExtEnabled)
diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile
index d2da1f61bb17..193b7a83b726 100644
--- a/graphics/vulkan-headers/Makefile
+++ b/graphics/vulkan-headers/Makefile
@@ -1,6 +1,6 @@
PORTNAME= vulkan-headers
DISTVERSIONPREFIX= v
-DISTVERSION= 1.3.255
+DISTVERSION= 1.3.256
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org
diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo
index b617d109d3c4..a7cb984c6af6 100644
--- a/graphics/vulkan-headers/distinfo
+++ b/graphics/vulkan-headers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687522754
-SHA256 (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 8e1db7041ad6dbaf4f3326a297b4aee17f3178a0d1cf9cd76a3f934c855357b5
-SIZE (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 1934452
+TIMESTAMP = 1688131805
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.256_GH0.tar.gz) = fcd3021d5f504941aa285836125fc61e6b0636bb61da6f33d9ae9299786f729b
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.256_GH0.tar.gz) = 1954053
diff --git a/graphics/vulkan-headers/pkg-plist b/graphics/vulkan-headers/pkg-plist
index a3f781a434cc..0d1fe883eb64 100644
--- a/graphics/vulkan-headers/pkg-plist
+++ b/graphics/vulkan-headers/pkg-plist
@@ -8,6 +8,7 @@ include/vk_video/vulkan_video_codecs_common.h
include/vulkan/vk_icd.h
include/vulkan/vk_layer.h
include/vulkan/vk_platform.h
+include/vulkan/vulkan.cppm
include/vulkan/vulkan.h
include/vulkan/vulkan.hpp
include/vulkan/vulkan_android.h
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index 7d9c2d29d497..00acd9575d19 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,6 +1,7 @@
PORTNAME= vulkan-loader
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.255
+PORTREVISION= 1
CATEGORIES= graphics devel
MAINTAINER= jbeich@FreeBSD.org
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index 6e0a75004d19..c9c6ffd4726b 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -20,6 +20,11 @@ GH_PROJECT= Vulkan-Tools
CMAKE_OFF= BUILD_CUBE BUILD_ICD
CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}"
+.if ${DISTVERSION:E} < 256
+GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.255:vkheaders/Vulkan-Headers
+CFLAGS+= -I${WRKSRC_vkheaders}/include
+.endif
+
OPTIONS_DEFINE= WAYLAND XCB XLIB
OPTIONS_DEFAULT= WAYLAND XCB XLIB
OPTIONS_SLAVE= DISPLAY
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index 095e4db6b05e..ca15d22ea719 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,3 +1,5 @@
TIMESTAMP = 1687555001
SHA256 (KhronosGroup-Vulkan-Tools-v1.3.255_GH0.tar.gz) = ccd9175eec671b9ebff2486d1fb3e3d2f318028bbc873378ff9e1382b432abc6
SIZE (KhronosGroup-Vulkan-Tools-v1.3.255_GH0.tar.gz) = 788501
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 8e1db7041ad6dbaf4f3326a297b4aee17f3178a0d1cf9cd76a3f934c855357b5
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.255_GH0.tar.gz) = 1934452