From nobody Fri Oct 28 11:31:40 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MzL3d0BQYz4gp8x; Fri, 28 Oct 2022 11:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MzL3c6tBxz3XZB; Fri, 28 Oct 2022 11:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666956701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAirx1irtan3aBRoiY0PkSxcZ/ONMHgmyv9msgOm8EM=; b=xTPM6khQQYPfwUU79Il6fn1Hkm2GAC1w2qOIXmn6qYY+IrHsPK+7OBhKjUoZwcbfksCtot uB1jt4qWy4jkD2T7o5GadvTJH64l1DD4shHQHkatBwn3vWN52fWx7oAc6PQpf6hgC2iFsj mnejdv2Q9WO6SIi39K96FIyPb1SHFCqKE6Z2IK0jezOp3WkGW1m4kcpB8ILVFf7YvZxQvB a+3fzdN6/ZVTdUtphhil0Tf6yYvoBS5V1m2cJ04DO2stCq7Qu1isCdmDHqK0SL1VHVsYM8 rn/jaKDzbhAadJrDjO4BUbbyaC08UctDXZzpX7BO6SenB1ww+dN+/jSuOMToaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MzL3c5rngzbyq; Fri, 28 Oct 2022 11:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29SBVe3A011608; Fri, 28 Oct 2022 11:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29SBVeE8011607; Fri, 28 Oct 2022 11:31:40 GMT (envelope-from git) Date: Fri, 28 Oct 2022 11:31:40 GMT Message-Id: <202210281131.29SBVeE8011607@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 84137f3accde - main - graphics/vulkan-validation-layers: unbundle robin-hood-hashing after f465f8506f78 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84137f3accde140d4853b17347a057278732f0ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666956701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAirx1irtan3aBRoiY0PkSxcZ/ONMHgmyv9msgOm8EM=; b=pinfndCTeMdd2sOH8UINoRzL5T4Mcc3FkZwhv5Nr9xYMYea0hS2yef6GbGHjTBZa3lm9xZ 0EOEe/jhZYUrD5BTW4b0a7Cis84oXRO0r/cTgZ9ehv9I91EoFwEGFSAwK17wgktqA69D1R l9pnhVvoV1+nq2PuOUgj73dSHFKjuC16JU2h/jXU5NRV3QppvpRHmx1gnGFwEyVEMLSxA6 XBO9MAX81gbFaRWABcDcT/n0cFiI7TJBCj4mor2gR14d2dv3uulsDh+iB9tjGaPT3cVbus 6TEwgqmFGzNUrOzGdGc2IArJ1QiZPA10IEW56toh+3IHYvkNXnq9zUqZDNVjSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666956701; a=rsa-sha256; cv=none; b=efN5MfqmJhcXeyDHqgk+uszB2njbxXUx1fgUuCe4BNKq4uwcWK84LXpJ2qV6C+Jqs6AHGT V8JIhSZEyC0YtEhPMMC46co11OF7ofQc2cK03rS/3uveGYjxvI7Sp7XRroxB1sXpJRX+pl fkE6ADdkJ1cmggqseXhGGroQNtw742T6WeZqIIKAIZPEGr8E9kcvDWFPVwHJ+td6wV1gO+ tA3MM3ec84T0adDCbSJyyBqn8e8zXDaoP9WNEMw83yTN+unhbQk2xp4LxfYUOXKOWYaqo0 GQrI0xfcIkIzWSMFzd/dmkOP26+8H6acWKxqa+vakopcrD8oRHP8Eh7tZD7FLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=84137f3accde140d4853b17347a057278732f0ac commit 84137f3accde140d4853b17347a057278732f0ac Author: Jan Beich AuthorDate: 2022-10-14 07:46:51 +0000 Commit: Jan Beich CommitDate: 2022-10-28 11:31:31 +0000 graphics/vulkan-validation-layers: unbundle robin-hood-hashing after f465f8506f78 PR: 267038 --- graphics/vulkan-validation-layers/Makefile | 9 +++---- graphics/vulkan-validation-layers/distinfo | 2 -- .../files/patch-CMakeLists.txt | 30 ++-------------------- 3 files changed, 6 insertions(+), 35 deletions(-) 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 @@ -9,7 +9,8 @@ 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 @@ -17,12 +18,10 @@ 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} 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 @@ -3,5 +3,3 @@ SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.232_GH0.tar.gz) = 4c138c5cd7de 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 @@ -10,29 +10,9 @@ CMake Error at CMakeLists.txt:220 (find_package): "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}) @@ -41,13 +21,7 @@ CMake Error at CMakeLists.txt:255 (find_package): 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)