diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index b237da18d388..9c8172093b52 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,45 +1,44 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.3.232 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= spirv-tools>0:graphics/spirv-tools \ +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 \ - martinus:robin-hood-hashing:3.11.5:robin_hood/external/robin-hood-hashing +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= -DROBIN_HOOD_HASHING_INSTALL_DIR:PATH="${WRKSRC_robin_hood}" \ - -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" \ +CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" \ -DVULKAN_HEADERS_INSTALL_DIR:PATH="${LOCALBASE}" CFLAGS+= ${WITH_DEBUG:U-DNDEBUG} 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 b4fd8c710ec7..89712e9fb342 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,5 @@ TIMESTAMP = 1666929290 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.232_GH0.tar.gz) = 4c138c5cd7de5dbeb5fabcbb64f2ec7e63153e77e50a43f4820f37178339cda3 SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.232_GH0.tar.gz) = 4423574 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 (martinus-robin-hood-hashing-3.11.5_GH0.tar.gz) = 3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0 -SIZE (martinus-robin-hood-hashing-3.11.5_GH0.tar.gz) = 177134 diff --git a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt index 95461361098d..3891812819f3 100644 --- a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt +++ b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt @@ -1,59 +1,33 @@ CMake Error at CMakeLists.txt:220 (find_package): Could not find a package configuration file provided by "SPIRV-Headers" with any of the following names: SPIRV-HeadersConfig.cmake spirv-headers-config.cmake Add the installation prefix of "SPIRV-Headers" to CMAKE_PREFIX_PATH or set "SPIRV-Headers_DIR" to a directory containing one of the above files. If "SPIRV-Headers" provides a separate development package or SDK, be sure it has been installed. -CMake Error at CMakeLists.txt:255 (find_package): - Could not find a package configuration file provided by "robin_hood" with - any of the following names: - - robin_hoodConfig.cmake - robin_hood-config.cmake - - Add the installation prefix of "robin_hood" to CMAKE_PREFIX_PATH or set - "robin_hood_DIR" to a directory containing one of the above files. If - "robin_hood" provides a separate development package or SDK, be sure it has - been installed. - --- CMakeLists.txt.orig 2022-10-28 03:54:50 UTC +++ CMakeLists.txt -@@ -89,12 +89,16 @@ if (ROBIN_HOOD_HASHING_INSTALL_DIR) - # Dependencies can be installed in arbitrary locations. This is done by update_deps.py / users. - if (ROBIN_HOOD_HASHING_INSTALL_DIR) - list(APPEND CMAKE_PREFIX_PATH ${ROBIN_HOOD_HASHING_INSTALL_DIR}) -+ add_library(robin_hood::robin_hood INTERFACE IMPORTED) -+ target_include_directories(robin_hood::robin_hood INTERFACE ${ROBIN_HOOD_HASHING_INSTALL_DIR}/src/include) - endif() - if (GLSLANG_INSTALL_DIR) - list(APPEND CMAKE_PREFIX_PATH ${GLSLANG_INSTALL_DIR}) +@@ -95,6 +95,8 @@ if (SPIRV_HEADERS_INSTALL_DIR) endif() if (SPIRV_HEADERS_INSTALL_DIR) list(APPEND CMAKE_PREFIX_PATH ${SPIRV_HEADERS_INSTALL_DIR}) + add_library(SPIRV-Headers::SPIRV-Headers INTERFACE IMPORTED) + target_include_directories(SPIRV-Headers::SPIRV-Headers INTERFACE ${SPIRV_HEADERS_INSTALL_DIR}/include) endif() if (SPIRV_TOOLS_INSTALL_DIR) list(APPEND CMAKE_PREFIX_PATH ${SPIRV_TOOLS_INSTALL_DIR}) -@@ -209,11 +213,15 @@ if (USE_ROBIN_HOOD_HASHING) - option(BUILD_LAYER_SUPPORT_FILES "Generate layer files" OFF) # For generating files when not building layers - option(USE_ROBIN_HOOD_HASHING "Use robin-hood-hashing" ON) - if (USE_ROBIN_HOOD_HASHING) -+ if (NOT TARGET robin_hood::robin_hood) - find_package(robin_hood REQUIRED CONFIG) -+ endif() +@@ -213,7 +215,9 @@ if(BUILD_LAYERS OR BUILD_TESTS) endif() if(BUILD_LAYERS OR BUILD_TESTS) + if (NOT TARGET SPIRV-Headers::SPIRV-Headers) find_package(SPIRV-Headers REQUIRED CONFIG QUIET) + endif() include(VVLGenerateSourceCode)