diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 223000208b8b..a7c41a78fe2e 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,43 +1,41 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.4.313 -PORTREVISION= 1 +DISTVERSION= 1.4.314 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.4.304-33-g43c29e6:volk/volk CMAKE_OFF= BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT= WAYLAND XCB XLIB 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 .include diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index 8e6a285dc9be..cf5bb9673502 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1745004285 -SHA256 (KhronosGroup-Vulkan-Tools-v1.4.313_GH0.tar.gz) = 930204695706d0f09075bbe26d935986fad3d63840254cecf751de5ad26ea155 -SIZE (KhronosGroup-Vulkan-Tools-v1.4.313_GH0.tar.gz) = 792944 -SHA256 (zeux-volk-1.4.304-33-g43c29e6_GH0.tar.gz) = f01b1d2c9f2cda0bddddc0449195b83b065abe0fb214c6062adb802b603d3c4b -SIZE (zeux-volk-1.4.304-33-g43c29e6_GH0.tar.gz) = 69702 +TIMESTAMP = 1746478854 +SHA256 (KhronosGroup-Vulkan-Tools-v1.4.314_GH0.tar.gz) = 720f10e8e5a8a816e869ab120a094480ba64c5a025822e88c5766c7938a435e0 +SIZE (KhronosGroup-Vulkan-Tools-v1.4.314_GH0.tar.gz) = 799525 diff --git a/graphics/vulkan-tools/files/patch-CMakeLists.txt b/graphics/vulkan-tools/files/patch-CMakeLists.txt deleted file mode 100644 index 15ce58b975b5..000000000000 --- a/graphics/vulkan-tools/files/patch-CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -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 2024-07-12 20:26:06 UTC -+++ CMakeLists.txt -@@ -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() - if ((APPLE OR BUILD_TESTS) AND NOT ANDROID) - find_package(VulkanLoader QUIET REQUIRED CONFIG) - endif()