diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index d96773d2acea..05f279e8d482 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,68 +1,68 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.3.289 +DISTVERSION= 1.3.290 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Tools and demos for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Tools LICENSE= APACHE20 BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers USES= alias cmake compiler:c++11-lib pkgconfig python:build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools -GH_TUPLE= zeux:volk:1.3.270-61-g692bef4:volk/volk +GH_TUPLE= zeux:volk:1.3.270-63-g4660854:volk/volk CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" .if ${DISTVERSION:E} < 281 GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.280:vkheaders/Vulkan-Headers CFLAGS+= -I${WRKSRC_vkheaders}/include .endif OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT= WAYLAND XCB XLIB OPTIONS_SLAVE= DISPLAY OPTIONS_SUB= yes WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols 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 XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT # https://github.com/KhronosGroup/Vulkan-Tools/issues/307 .for _wsi in display wayland xcb xlib do-configure-${_wsi:tu}-on: ${_wsi}-configure ${_wsi}-configure: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \ -DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \ -DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \ -B${CONFIGURE_WRKSRC}-${_wsi} do-build-${_wsi:tu}-on: ${_wsi}-build ${_wsi}-build: @${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi} do-install-${_wsi:tu}-on: ${_wsi}-install ${_wsi}-install: . for _file in vkcube vkcubepp ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \ ${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi} . endfor .endfor .include diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index d337d2464114..1996579f265a 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1719605721 -SHA256 (KhronosGroup-Vulkan-Tools-v1.3.289_GH0.tar.gz) = 1b012a16e990d6290822b45925881be650e299f34727c40fc0e8cb8aaed148bb -SIZE (KhronosGroup-Vulkan-Tools-v1.3.289_GH0.tar.gz) = 754266 -SHA256 (zeux-volk-1.3.270-61-g692bef4_GH0.tar.gz) = e71a065aecaa9a2f4f206c933e5fa970ac1c201549538ba87dfa577eed3e72da -SIZE (zeux-volk-1.3.270-61-g692bef4_GH0.tar.gz) = 62576 +TIMESTAMP = 1720815966 +SHA256 (KhronosGroup-Vulkan-Tools-v1.3.290_GH0.tar.gz) = e07c900f770a8bb596ee5c5ba427eab473ec3bc6b70df2554ebce8a51d1b282a +SIZE (KhronosGroup-Vulkan-Tools-v1.3.290_GH0.tar.gz) = 754747 +SHA256 (zeux-volk-1.3.270-63-g4660854_GH0.tar.gz) = 02bf5f67ba3e65d5b7e0ecf07ccded2959d8722e94f50295b8b3b798c1103afa +SIZE (zeux-volk-1.3.270-63-g4660854_GH0.tar.gz) = 62575 diff --git a/graphics/vulkan-tools/files/patch-CMakeLists.txt b/graphics/vulkan-tools/files/patch-CMakeLists.txt index 1e5bfa7bcbed..15ce58b975b5 100644 --- a/graphics/vulkan-tools/files/patch-CMakeLists.txt +++ b/graphics/vulkan-tools/files/patch-CMakeLists.txt @@ -1,23 +1,25 @@ CMake Error at cube/CMakeLists.txt:237 (target_link_libraries): Target "vkcube" links to: volk::volk_headers but the target was not found. Possible reasons include: * There is a typo in the target name. * A find_package call is missing for an IMPORTED target. * An ALIAS target is missing. ---- CMakeLists.txt.orig 2023-11-27 22:22:16 UTC +--- CMakeLists.txt.orig 2024-07-12 20:26:06 UTC +++ CMakeLists.txt -@@ -53,6 +53,9 @@ find_package(volk QUIET CONFIG) - find_package(VulkanHeaders QUIET CONFIG) - find_package(VulkanLoader QUIET CONFIG) - find_package(volk QUIET CONFIG) +@@ -56,7 +56,10 @@ find_package(VulkanHeaders QUIET REQUIRED CONFIG) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + + find_package(VulkanHeaders QUIET REQUIRED CONFIG) +-find_package(volk QUIET REQUIRED CONFIG) ++find_package(volk QUIET CONFIG) +if (NOT TARGET volk::volk_headers) + add_subdirectory(volk EXCLUDE_FROM_ALL SYSTEM) +endif() - - include(GNUInstallDirs) - + if ((APPLE OR BUILD_TESTS) AND NOT ANDROID) + find_package(VulkanLoader QUIET REQUIRED CONFIG) + endif()