diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile index 505026e73320..a66ee5b81423 100644 --- a/graphics/vulkan-extension-layer/Makefile +++ b/graphics/vulkan-extension-layer/Makefile @@ -1,21 +1,27 @@ PORTNAME= vulkan-extension-layer DISTVERSIONPREFIX= v DISTVERSION= 1.3.235 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Layer providing Vulkan features when native support is unavailable WWW= https://github.com/KhronosGroup/Vulkan-ExtensionLayer LICENSE= APACHE20 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++11-lib USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ExtensionLayer CMAKE_OFF= BUILD_TESTS +.if ${DISTVERSION:E} < 236 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.235:vkheaders/Vulkan-Headers +CMAKE_ARGS+= -DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}" +CFLAGS+= -isystem${LOCALBASE}/include +.endif + .include diff --git a/graphics/vulkan-extension-layer/distinfo b/graphics/vulkan-extension-layer/distinfo index 5b87e45b6ba6..3ce4395701bb 100644 --- a/graphics/vulkan-extension-layer/distinfo +++ b/graphics/vulkan-extension-layer/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1669664308 SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.235_GH0.tar.gz) = 125d87cb8572589eeba43df7aec20300886ada90414b5c5a83bc2acde385eff9 SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.235_GH0.tar.gz) = 520533 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.235_GH0.tar.gz) = fca90d27e60816b5d72a700c241206c57e7d909e8ab4adfc340f5a5e9a019448 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.235_GH0.tar.gz) = 1752489 diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index 28daeefd0b26..75d0d9a0197a 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,26 +1,26 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.235 +DISTVERSION= 1.3.236 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Headers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Headers LICENSE= APACHE20 USES= cmake USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Headers STRIP= # nothing to strip NO_ARCH= yes post-patch: # XXX Drop after FreeBSD 12.* EOL around 2024-06-30 @if [ -L /usr/include/sched.h ]; then \ ${REINPLACE_CMD} $$'/^namespace/i\\\n#undef major\\\n#undef minor\\\n\\\n' \ ${WRKSRC}/include/vulkan/vulkan_structs.hpp; \ fi .include diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index 1da729eeb79d..99e4617cee1d 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668690126 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.235_GH0.tar.gz) = fca90d27e60816b5d72a700c241206c57e7d909e8ab4adfc340f5a5e9a019448 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.235_GH0.tar.gz) = 1752489 +TIMESTAMP = 1669904661 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.236_GH0.tar.gz) = a86b8c38618b764057b359cf0f18c12a7c81b7760fe6fca1acf9adb471d55d4c +SIZE (KhronosGroup-Vulkan-Headers-v1.3.236_GH0.tar.gz) = 1764329 diff --git a/graphics/vulkan-headers/pkg-plist b/graphics/vulkan-headers/pkg-plist index f61bb4dfd70b..2300180972aa 100644 --- a/graphics/vulkan-headers/pkg-plist +++ b/graphics/vulkan-headers/pkg-plist @@ -1,52 +1,52 @@ include/vk_video/vulkan_video_codec_h264std.h include/vk_video/vulkan_video_codec_h264std_decode.h include/vk_video/vulkan_video_codec_h264std_encode.h include/vk_video/vulkan_video_codec_h265std.h include/vk_video/vulkan_video_codec_h265std_decode.h include/vk_video/vulkan_video_codec_h265std_encode.h 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/vk_sdk_platform.h include/vulkan/vulkan.h include/vulkan/vulkan.hpp include/vulkan/vulkan_android.h include/vulkan/vulkan_beta.h include/vulkan/vulkan_core.h include/vulkan/vulkan_directfb.h include/vulkan/vulkan_enums.hpp include/vulkan/vulkan_format_traits.hpp include/vulkan/vulkan_fuchsia.h include/vulkan/vulkan_funcs.hpp include/vulkan/vulkan_ggp.h include/vulkan/vulkan_handles.hpp include/vulkan/vulkan_hash.hpp include/vulkan/vulkan_ios.h include/vulkan/vulkan_macos.h include/vulkan/vulkan_metal.h include/vulkan/vulkan_raii.hpp include/vulkan/vulkan_screen.h include/vulkan/vulkan_static_assertions.hpp include/vulkan/vulkan_structs.hpp include/vulkan/vulkan_to_string.hpp include/vulkan/vulkan_vi.h include/vulkan/vulkan_wayland.h include/vulkan/vulkan_win32.h include/vulkan/vulkan_xcb.h include/vulkan/vulkan_xlib.h include/vulkan/vulkan_xlib_xrandr.h -share/cmake/VulkanHeaders/VulkanHeadersConfig.cmake -share/cmake/VulkanHeaders/VulkanHeadersConfigVersion.cmake +lib/cmake/VulkanHeaders/VulkanHeadersConfig.cmake +lib/cmake/VulkanHeaders/VulkanHeadersConfigVersion.cmake share/vulkan/registry/apiconventions.py share/vulkan/registry/cgenerator.py share/vulkan/registry/generator.py share/vulkan/registry/genvk.py share/vulkan/registry/profiles/VP_KHR_roadmap_2022.json share/vulkan/registry/reg.py share/vulkan/registry/spec_tools/conventions.py share/vulkan/registry/spec_tools/util.py share/vulkan/registry/validusage.json share/vulkan/registry/video.xml share/vulkan/registry/vk.xml share/vulkan/registry/vkconventions.py diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 93df98f88e9f..0a4197949f30 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,52 +1,53 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v PORTVERSION= 1.3.235 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Loader LICENSE= APACHE20 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= alias cmake compiler: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: # Extract (snapshot) version from the port # Respect PREFIX when XDG_CONFIG_DIRS and XDG_DATA_DIRS are unset @${REINPLACE_CMD} -e '/find_.*Git/d' \ -e '/BRANCH/s/--unknown--/main/' \ -e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \ -e '/FALLBACK/s,/etc,${PREFIX}&,' \ -e 's,/usr/local,${PREFIX},' \ ${WRKSRC}/CMakeLists.txt # https://github.com/llvm/llvm-project/issues/46692 @if [ "${CHOSEN_COMPILER_TYPE}-${ARCH}-${_OSRELEASE:C/.*-//}" = "clang-i386-CURRENT" ]; then \ ${ECHO} "disabled" >${WRKSRC}/loader/asm_test_x86.S; \ fi .include diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 5d8a61523518..a27e9a9d9b38 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,43 +1,49 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.3.235 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-ValidationLayers LICENSE= APACHE20 BUILD_DEPENDS= robin-hood-hashing>0:devel/robin-hood-hashing \ spirv-tools>0:graphics/spirv-tools \ vulkan-headers>0:graphics/vulkan-headers USES= alias cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-187-g85a1ed2:headers/external/spirv-headers CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" \ -DVULKAN_HEADERS_INSTALL_DIR:PATH="${LOCALBASE}" +.if ${DISTVERSION:E} < 236 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.235:vkheaders/Vulkan-Headers +CMAKE_ARGS+= -DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}" +CFLAGS+= -isystem${LOCALBASE}/include +.endif + OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-egl.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 .include diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index ab20f0c48868..8b4cbf66703d 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1668722888 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.235_GH0.tar.gz) = a10a7a34169febb5ac707c0a4ec121ab0c06faf4a89abae6c0d5aa47b8f63b56 SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.235_GH0.tar.gz) = 4466792 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-187-g85a1ed2_GH0.tar.gz) = 2a8b49657434cbb96c20e0c1558a70d32fc8eadf80e1d611c73ff721fb3d8212 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-187-g85a1ed2_GH0.tar.gz) = 440065 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.235_GH0.tar.gz) = fca90d27e60816b5d72a700c241206c57e7d909e8ab4adfc340f5a5e9a019448 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.235_GH0.tar.gz) = 1752489