diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index f2730bc28b82..587a6249a84a 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,18 +1,18 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.190 +DISTVERSION= 1.2.191 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Headers for the Vulkan graphics API LICENSE= APACHE20 USES= cmake STRIP= # nothing to strip USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Headers .include diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index dfb6d6ecd791..593fa5a13d7d 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630274689 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.190_GH0.tar.gz) = ce997a3d6f43f9697c5ec232efb0f6e7826d0648412ed141f9495e88429075e0 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.190_GH0.tar.gz) = 1195608 +TIMESTAMP = 1631061289 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.191_GH0.tar.gz) = ff7c66144df271eeb5dec9ba6cd3773236b8d3a04df4bc55cc45a95e30287371 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.191_GH0.tar.gz) = 1198826 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 5309e93e184c..5d15b0f528e2 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,41 +1,42 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.2.190 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API LICENSE= APACHE20 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:${ARCH:Mi386:C/.+/gcc-/}c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Loader CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_OFF= BUILD_TESTS OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_DESC= ${X11_DESC} via libxcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XLIB_DESC= ${X11_DESC} via libX11 XLIB_USES= xorg XLIB_USE= XORG=x11,xrandr XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT post-patch: # _XOPEN_SOURCE enforces X/Open-compliance but alloca isn't there @${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/loader/CMakeLists.txt .include diff --git a/graphics/vulkan-validation-layers/files/patch-headers-1.2.191 b/graphics/vulkan-validation-layers/files/patch-headers-1.2.191 new file mode 100644 index 000000000000..4bad70735d68 --- /dev/null +++ b/graphics/vulkan-validation-layers/files/patch-headers-1.2.191 @@ -0,0 +1,27 @@ +In file included from layers/state_tracker.cpp:28: +layers/generated/vk_enum_string_helper.h:5559:14: error: use of undeclared identifier 'VK_VIDEO_CODING_QUALITY_PRESET_DEFAULT_BIT_KHR' + case VK_VIDEO_CODING_QUALITY_PRESET_DEFAULT_BIT_KHR: + ^ + +--- layers/generated/parameter_validation.cpp.orig 2021-08-30 21:04:49 UTC ++++ layers/generated/parameter_validation.cpp +@@ -80,7 +80,7 @@ const VkDisplayPlaneAlphaFlagsKHR AllVkDisplayPlaneAlp + const VkVideoChromaSubsamplingFlagsKHR AllVkVideoChromaSubsamplingFlagBitsKHR = VK_VIDEO_CHROMA_SUBSAMPLING_INVALID_BIT_KHR|VK_VIDEO_CHROMA_SUBSAMPLING_MONOCHROME_BIT_KHR|VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR|VK_VIDEO_CHROMA_SUBSAMPLING_422_BIT_KHR|VK_VIDEO_CHROMA_SUBSAMPLING_444_BIT_KHR; + const VkVideoCodecOperationFlagsKHR AllVkVideoCodecOperationFlagBitsKHR = VK_VIDEO_CODEC_OPERATION_INVALID_BIT_KHR|VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_EXT|VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_EXT|VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_EXT; + const VkVideoCodingControlFlagsKHR AllVkVideoCodingControlFlagBitsKHR = VK_VIDEO_CODING_CONTROL_DEFAULT_KHR|VK_VIDEO_CODING_CONTROL_RESET_BIT_KHR; +-const VkVideoCodingQualityPresetFlagsKHR AllVkVideoCodingQualityPresetFlagBitsKHR = VK_VIDEO_CODING_QUALITY_PRESET_DEFAULT_BIT_KHR|VK_VIDEO_CODING_QUALITY_PRESET_NORMAL_BIT_KHR|VK_VIDEO_CODING_QUALITY_PRESET_POWER_BIT_KHR|VK_VIDEO_CODING_QUALITY_PRESET_QUALITY_BIT_KHR; ++const VkVideoCodingQualityPresetFlagsKHR AllVkVideoCodingQualityPresetFlagBitsKHR = VK_VIDEO_CODING_QUALITY_PRESET_NORMAL_BIT_KHR|VK_VIDEO_CODING_QUALITY_PRESET_POWER_BIT_KHR|VK_VIDEO_CODING_QUALITY_PRESET_QUALITY_BIT_KHR; + const VkVideoComponentBitDepthFlagsKHR AllVkVideoComponentBitDepthFlagBitsKHR = VK_VIDEO_COMPONENT_BIT_DEPTH_INVALID_KHR|VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR|VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR|VK_VIDEO_COMPONENT_BIT_DEPTH_12_BIT_KHR; + const VkVideoSessionCreateFlagsKHR AllVkVideoSessionCreateFlagBitsKHR = VK_VIDEO_SESSION_CREATE_DEFAULT_KHR|VK_VIDEO_SESSION_CREATE_PROTECTED_CONTENT_BIT_KHR; + const VkVideoDecodeFlagsKHR AllVkVideoDecodeFlagBitsKHR = VK_VIDEO_DECODE_DEFAULT_KHR|VK_VIDEO_DECODE_RESERVED_0_BIT_KHR; +--- layers/generated/vk_enum_string_helper.h.orig 2021-08-30 21:04:49 UTC ++++ layers/generated/vk_enum_string_helper.h +@@ -5556,8 +5556,6 @@ static inline const char* string_VkVideoCodingQualityP + { + switch (input_value) + { +- case VK_VIDEO_CODING_QUALITY_PRESET_DEFAULT_BIT_KHR: +- return "VK_VIDEO_CODING_QUALITY_PRESET_DEFAULT_BIT_KHR"; + case VK_VIDEO_CODING_QUALITY_PRESET_NORMAL_BIT_KHR: + return "VK_VIDEO_CODING_QUALITY_PRESET_NORMAL_BIT_KHR"; + case VK_VIDEO_CODING_QUALITY_PRESET_POWER_BIT_KHR: