From nobody Sat Oct 07 14:47:49 2023 X-Original-To: dev-commits-ports-all@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 4S2p796SJVz4wbTP; Sat, 7 Oct 2023 14:47:49 +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 4S2p7960Gfz4h1M; Sat, 7 Oct 2023 14:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696690069; 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=yKh34lORFJG+u+YL7eAahaKsrWB1Lr+aBI6cMBkTCK0=; b=yyM5Da76vDjuhICToO2cBuGEIMdunPznPXxEZDQ8xYktBzPkym6jQWNcbWTwC5w0CCPnoV 70sjM6MHmqZOH0/W3fBbFWzDKTkQkIo7J4H+aoycyvykWETIK2wxAPDetOISJwBORhT+XG Gh2VoLMcVE6S8v9z5/QEz1F5YS+8h8lcMcimqN3uNtoHYfWIQsBucwP5/bDsQlvVZZTWdh 69fUAkUVHtZxFoB3mbszlgk9awtfibLATOHCtsjxG/kbU6wG660Mz0AEaFGvYw7lbSwzWD GC4vO0RhEdGNkHta/qm+WbRR81ulX0jih24Y9hM49E0t5Dcz5x3sQtkp8dgT8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696690069; a=rsa-sha256; cv=none; b=qaQe8vhfYk4y/V5+Ba03MGk+WDUBrQkF7vLIUpqi3niWUtjFaz22tnZhU5jVKQ0HpVPqJB oImB3cfrvGe0GS7pYJRyF5mVJdLXxMKO69pnpDgzJyoKrU+RM9MUk+1A8IcOMduCo0mcIR 1Pa2rHDnF9+VgzWV3IUSe8/mBwLtX183l3PZOm0EHoeGqQWMTuMJ1cA7OhEsyoyEkOFbhg YiaSWUHfGZml271mCUmhcGRKjaYGtE0QaUKHg3hganeSvqiYTrwzNWIXYy4+c2e16CHMG+ a5UmS1ClL6BqdlMWQYbflIXrWmF5YS4DQ+3eaaLCThiQJA7Hie2N1mF5sNiKiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696690069; 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=yKh34lORFJG+u+YL7eAahaKsrWB1Lr+aBI6cMBkTCK0=; b=JAtiVDczQ9n+O9SA3kbDXfbAzvy+Q4O1ZRtRM9iuzrV2grSJxSuxArRI5OcZVcovWiemZM MoKZ11ZtXTSsDL8/z9JNBktbldkQ0ckwX7q5DWm+XSHVGqDy9hE0I2w2YcBgNHYuyqgs/o 5/vS7WGBjbQCv3LasqBRfxnYy6nStN5r3PQQHK+GEVTeKEk+GCd+l6rCOxuBcNtjLydNmk YWOid/kAdAHK6mCzF9jjEt6Rti8/3+kRjusEhqmOdR5xbkCv1mZWHH7g4SI4td3CfI1PJk C23omzVsgjLTcYIkzAk0knBmbgNZhE35H0ezjJ7M9aHUHr+f3NL4OSNmBbJqTw== 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 4S2p794yJwzb6P; Sat, 7 Oct 2023 14:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 397Eln7x020863; Sat, 7 Oct 2023 14:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 397Elnmr020860; Sat, 7 Oct 2023 14:47:49 GMT (envelope-from git) Date: Sat, 7 Oct 2023 14:47:49 GMT Message-Id: <202310071447.397Elnmr020860@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: 2ad5941baa2d - main - graphics/vulkan-validation-layers: update to 1.3.267 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 2ad5941baa2d11dd6d8b7fb08c53ac09ea3dc3f3 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ad5941baa2d11dd6d8b7fb08c53ac09ea3dc3f3 commit 2ad5941baa2d11dd6d8b7fb08c53ac09ea3dc3f3 Author: Jan Beich AuthorDate: 2023-10-07 00:41:35 +0000 Commit: Jan Beich CommitDate: 2023-10-07 14:44:03 +0000 graphics/vulkan-validation-layers: update to 1.3.267 Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.3.266...v1.3.267 Reported by: Repology, portscout --- graphics/vulkan-validation-layers/Makefile | 4 +- graphics/vulkan-validation-layers/distinfo | 10 ++--- .../files/patch-CMakeLists.txt | 47 ++++++++++++++-------- .../files/patch-layers_CMakeLists.txt | 26 ------------ 4 files changed, 37 insertions(+), 50 deletions(-) diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index f273e81adcc7..583f57b59ef4 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.266 +DISTVERSION= 1.3.267 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -18,7 +18,7 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/layers/SPIRV-Headers \ +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/SPIRV-Headers \ KhronosGroup:Vulkan-Utility-Libraries:${DISTVERSIONPREFIX}${DISTVERSION}:utils/Vulkan-Utility-Libraries CMAKE_OFF= BUILD_TESTS diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 9385d6a472d9..f37f510be601 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1696021312 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.266_GH0.tar.gz) = 6a8478ec4f9088a90effc63f48f2ce1c39e1d675daa8f5d4252b4b3e94dff540 -SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.266_GH0.tar.gz) = 4958856 +TIMESTAMP = 1696639295 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.267_GH0.tar.gz) = c954d9ca43683ddd51499a1b743af4d243b4432983906f87889be8ade2b3cc23 +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.267_GH0.tar.gz) = 5001351 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 4677f51365937acb78df4067359d32742c5c649f2beb8f8afb7e1002329cea46 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 463700 -SHA256 (KhronosGroup-Vulkan-Utility-Libraries-v1.3.266_GH0.tar.gz) = f4c3906b3fc64de328484cca6580dd12f384a60f1f62111eda5ac4de7a6cba4a -SIZE (KhronosGroup-Vulkan-Utility-Libraries-v1.3.266_GH0.tar.gz) = 164361 +SHA256 (KhronosGroup-Vulkan-Utility-Libraries-v1.3.267_GH0.tar.gz) = 06ab448cfbccc4b99d7c8eb74543cb36a6e36cc0eca9c511de9a3e27b1a03578 +SIZE (KhronosGroup-Vulkan-Utility-Libraries-v1.3.267_GH0.tar.gz) = 165290 diff --git a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt index e9376ef246d4..8cbbc0bcb4cb 100644 --- a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt +++ b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt @@ -1,26 +1,39 @@ -CMake Error at CMakeLists.txt:71 (find_package): - Could not find a package configuration file provided by - "VulkanUtilityLibraries" with any of the following names: +CMake Error at layers/CMakeLists.txt:74 (target_link_libraries): + Target "VkLayer_utils" links to: - VulkanUtilityLibrariesConfig.cmake - vulkanutilitylibraries-config.cmake + Vulkan::LayerSettings - Add the installation prefix of "VulkanUtilityLibraries" to - CMAKE_PREFIX_PATH or set "VulkanUtilityLibraries_DIR" to a directory - containing one of the above files. If "VulkanUtilityLibraries" provides a - separate development package or SDK, be sure it has been installed. + but the target was not found. Possible reasons include: ---- CMakeLists.txt.orig 2023-09-06 01:26:34 UTC + * There is a typo in the target name. + * A find_package call is missing for an IMPORTED target. + * An ALIAS target is missing. + +CMake Error at layers/CMakeLists.txt:318 (target_link_libraries): + Target "vvl" links to: + + SPIRV-Headers::SPIRV-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-10-07 00:41:35 UTC +++ CMakeLists.txt -@@ -68,7 +68,10 @@ endif() - endif() - endif() +@@ -72,8 +72,14 @@ find_package(VulkanUtilityLibraries CONFIG QUIET) + find_package(VulkanHeaders CONFIG QUIET) --find_package(VulkanUtilityLibraries REQUIRED CONFIG QUIET) -+find_package(VulkanUtilityLibraries CONFIG QUIET) + find_package(VulkanUtilityLibraries CONFIG QUIET) +if (NOT TARGET Vulkan::UtilityHeaders OR NOT TARGET Vulkan::LayerSettings) + add_subdirectory(Vulkan-Utility-Libraries EXCLUDE_FROM_ALL SYSTEM) +endif() - if (ANNOTATED_SPEC_LINK) - message("ANNOTATED_SPEC_LINK is ${ANNOTATED_SPEC_LINK}") + find_package(SPIRV-Headers CONFIG QUIET) ++if (NOT TARGET SPIRV-Headers::SPIRV-Headers) ++ add_subdirectory(SPIRV-Headers EXCLUDE_FROM_ALL SYSTEM) ++endif() + + find_package(SPIRV-Tools-opt CONFIG QUIET) + diff --git a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt deleted file mode 100644 index 56dc12c99336..000000000000 --- a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -CMake Error at layers/CMakeLists.txt:114 (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. - ---- layers/CMakeLists.txt.orig 2023-08-29 03:23:36 UTC -+++ layers/CMakeLists.txt -@@ -152,7 +152,10 @@ add_library(VVL-SPIRV-LIBS INTERFACE) - # Represents all SPIRV libraries we need - add_library(VVL-SPIRV-LIBS INTERFACE) - --find_package(SPIRV-Headers REQUIRED CONFIG QUIET) -+find_package(SPIRV-Headers CONFIG QUIET) -+if (NOT TARGET SPIRV-Headers::SPIRV-Headers) -+ add_subdirectory(SPIRV-Headers EXCLUDE_FROM_ALL SYSTEM) -+endif() - target_link_libraries(VVL-SPIRV-LIBS INTERFACE SPIRV-Headers::SPIRV-Headers) - - find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET)