diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 769d785decd9..cade21ea898d 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,63 +1,63 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.3.270 +DISTVERSION= 1.3.271 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 -LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader 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-4-g1b05bb5:volk/volk CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" 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 c211a64c1d52..f63627472024 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1699645467 -SHA256 (KhronosGroup-Vulkan-Tools-v1.3.270_GH0.tar.gz) = 8b570500f99a8133fff1a55e82dc7bf2bb5afacdfecd6fc08c45d2fe2a85d9ad -SIZE (KhronosGroup-Vulkan-Tools-v1.3.270_GH0.tar.gz) = 779426 +TIMESTAMP = 1701123736 +SHA256 (KhronosGroup-Vulkan-Tools-v1.3.271_GH0.tar.gz) = 8cbc2fd27326de0e7d16ceab6463f4c1c116f8c0699e5621cdc0eded07f3105a +SIZE (KhronosGroup-Vulkan-Tools-v1.3.271_GH0.tar.gz) = 746528 +SHA256 (zeux-volk-1.3.270-4-g1b05bb5_GH0.tar.gz) = ce2329889a5cf36b207f887180821b244fe01ad61f4f63b2eebf12631f8c3398 +SIZE (zeux-volk-1.3.270-4-g1b05bb5_GH0.tar.gz) = 60097 diff --git a/graphics/vulkan-tools/files/patch-CMakeLists.txt b/graphics/vulkan-tools/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..1e5bfa7bcbed --- /dev/null +++ b/graphics/vulkan-tools/files/patch-CMakeLists.txt @@ -0,0 +1,23 @@ +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 +@@ -53,6 +53,9 @@ find_package(volk QUIET CONFIG) + find_package(VulkanHeaders QUIET CONFIG) + find_package(VulkanLoader QUIET CONFIG) + find_package(volk QUIET CONFIG) ++if (NOT TARGET volk::volk_headers) ++ add_subdirectory(volk EXCLUDE_FROM_ALL SYSTEM) ++endif() + + include(GNUInstallDirs) +