From nobody Sat Jan 29 00:54:21 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 B85CB1986DEC; Sat, 29 Jan 2022 00:54:23 +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 4Jlwnp5WPdz4d09; Sat, 29 Jan 2022 00:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643417663; 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=OAsifBt2ts0VWMRROZylLvEHWVarqhaPND/xl5VY2Uk=; b=rEgDcKB1IqrfK8KzeG0X5NNDXbqtlGYIUSeXg0fWSaIR/1VusQ5ojzEsW1XJ4LwSvw3yU9 V27U0RFUZpRYNI/wqHDeA457X4heL77FYQUfC/q7g5yDoH06LDpdXdoeCSNvJYH2/gRzpz y24JAQEgVcj4M+4Yv3nI+ACLDOjoxPnMOz2CoOfbcIgbO36Aa5yX2vvJz0f3TxALa8HiJb lqC8muUTTEZOY+f+Hvq3X//4AlY9Viqxhqu24XYZKx21el1KZL14G+od8UFKZs4EIPKFlM EXHkw9mO7CpWstdPVIRW8tC/nxb1kksYGm2BO9+8k185ZILKo1RtNYsI0qC1/w== 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 225A74796; Sat, 29 Jan 2022 00:54:22 +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 20T0sLek015306; Sat, 29 Jan 2022 00:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20T0sL1A015305; Sat, 29 Jan 2022 00:54:21 GMT (envelope-from git) Date: Sat, 29 Jan 2022 00:54:21 GMT Message-Id: <202201290054.20T0sL1A015305@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: c2423225d9f7 - main - graphics/vulkan-validation-layers: update to 1.3.204 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: c2423225d9f7e101919e16f2fecf3929630c7cf4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643417663; 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=OAsifBt2ts0VWMRROZylLvEHWVarqhaPND/xl5VY2Uk=; b=XHsO93BjuNd6k35uMfC+oWCAS53BrDaDk8AprHQTZAipKymanqm6PAbppELHmLHruqb2gL J4QHficWUt9HXKovD2rz9ThCoW6vC5IPbfDmsgY8ri3gevmwkx2uvfrinMr9hYB2jgpitT p6p7Ci26DYKOhSuxdZjmkUHla7ZIwfqkKTND4Mgr7GiSDRsGuvdFBK2b7Y8avCC/kOmTuF KUSN+2Ugha0minSJfLTbh4zP995viRG2+045js5k/PLBv68AOjhlvotp/NwmXpWvUcZ3dA YSkVnXA5fdXCmmd8XPIE1ZWLLQNH1slCvJva8ip4myWM7X7LYWvn6H7YAxfMTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643417663; a=rsa-sha256; cv=none; b=G6RDLB3107l3JCRDq0L3flR/qO4UwKOq/iFJ4VtWQGMtY3BT+KFAVrwyb6rXP/Wq56qm8m dFiitYiw3eWUsfOhNZkZrb5U+f6PxwaZMedDn7omyLn1EfKYc4JTv0ZUPtOxR/XY1wixAl 0VXgUTsq4II2DdUECvJUQGlklhJzAbgqsAiM+bdYY0/erwAcumI3flxkfAamlU03I1NwD0 Iq/wZB5WnKrrj3Wch9CaKk/UySDAfHgaBxSb/5dGRMA5JIbtIEy4tRToCGwIj+0vihzHeF scppYlW2FBuKkaEDi6cBurwCLjc+ps89W1+q9LSs0TX1TMnYYBpGtEeoublwjA== 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=c2423225d9f7e101919e16f2fecf3929630c7cf4 commit c2423225d9f7e101919e16f2fecf3929630c7cf4 Author: Jan Beich AuthorDate: 2022-01-28 23:29:45 +0000 Commit: Jan Beich CommitDate: 2022-01-29 00:53:18 +0000 graphics/vulkan-validation-layers: update to 1.3.204 Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.2.203...v1.3.204 Reported by: Repology --- graphics/vulkan-validation-layers/Makefile | 4 +- graphics/vulkan-validation-layers/distinfo | 10 ++-- .../vulkan-validation-layers/files/patch-revert | 55 +++++++++++++--------- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index be0ffe7fd195..f94aabf7a680 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.2.203 +DISTVERSION= 1.3.204 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -17,7 +17,7 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-123-g814e728:headers/external/spirv-headers \ +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-137-gb42ba6d:headers/external/spirv-headers \ martinus:robin-hood-hashing:3.11.3:robin_hood/external/robin-hood-hashing CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index c2c473f30683..86bec8fb6dc0 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1640106300 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.203_GH0.tar.gz) = 55aa46a001993fe1ab4177d5a03c5e90091dc674d716a560dc0e6c8a1e0158f9 -SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.203_GH0.tar.gz) = 3588824 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = e4880dccda018f63cdc684afd5e51972d8ad2e3f21e9bab346a865370ea2929e -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = 416402 +TIMESTAMP = 1643412585 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.204_GH0.tar.gz) = 5ff70d7d7bdd50154fd0e41c72d9e7e4fc9c001fb2d82ffe0009804f2070d0bf +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.204_GH0.tar.gz) = 3657540 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 44985641ced3c7973adc829714ab650e3ae49a741aad1b287a1c1904841d8a67 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 417861 SHA256 (martinus-robin-hood-hashing-3.11.3_GH0.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4 SIZE (martinus-robin-hood-hashing-3.11.3_GH0.tar.gz) = 170788 diff --git a/graphics/vulkan-validation-layers/files/patch-revert b/graphics/vulkan-validation-layers/files/patch-revert index 17c3058659c5..9f7ee4c9bb64 100644 --- a/graphics/vulkan-validation-layers/files/patch-revert +++ b/graphics/vulkan-validation-layers/files/patch-revert @@ -13,7 +13,7 @@ CMake Error at CMakeLists.txt:254 (find_package): "robin_hood" provides a separate development package or SDK, be sure it has been installed. ---- CMakeLists.txt.orig 2021-12-21 17:05:00 UTC +--- CMakeLists.txt.orig 2022-01-28 00:29:34 UTC +++ CMakeLists.txt @@ -102,21 +102,7 @@ else() message("********************************************************************************") @@ -37,25 +37,29 @@ CMake Error at CMakeLists.txt:254 (find_package): if (TARGET Vulkan::Headers) message(STATUS "Using Vulkan headers from Vulkan::Headers target") get_target_property(VulkanHeaders_INCLUDE_DIRS Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES) -@@ -251,13 +237,12 @@ option(BUILD_LAYERS "Build layers" ON) - option(BUILD_LAYER_SUPPORT_FILES "Generate layer files" OFF) # For generating files when not building layers +@@ -252,17 +238,13 @@ option(BUILD_LAYER_SUPPORT_FILES "Generate layer files option(USE_ROBIN_HOOD_HASHING "Use robin-hood-hashing" ON) if (USE_ROBIN_HOOD_HASHING) -- find_package(robin_hood REQUIRED CONFIG) -+ if(NOT ROBIN_HOOD_HASHING_INSTALL_DIR) -+ set(ROBIN_HOOD_HASHING_INSTALL_DIR $ENV{ROBIN_HOOD_HASHING_INSTALL_DIR} PATH "Path to robin-hood-hashing repository") -+ endif() -+ set(ROBIN_HOOD_HASHING_INCLUDE_DIR "${ROBIN_HOOD_HASHING_INSTALL_DIR}/src/include" PATH "Path to robin-hood-hashing/src/include") + if (NOT TARGET robin_hood::robin_hood) +- find_package(robin_hood REQUIRED CONFIG) ++ if(NOT ROBIN_HOOD_HASHING_INSTALL_DIR) ++ set(ROBIN_HOOD_HASHING_INSTALL_DIR $ENV{ROBIN_HOOD_HASHING_INSTALL_DIR} PATH "Path to robin-hood-hashing repository") ++ endif() ++ set(ROBIN_HOOD_HASHING_INCLUDE_DIR "${ROBIN_HOOD_HASHING_INSTALL_DIR}/src/include" PATH "Path to robin-hood-hashing/src/include") + endif() endif() +-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "") -if(BUILD_LAYERS OR BUILD_TESTS) -- find_package(SPIRV-Headers REQUIRED CONFIG) +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- find_package(SPIRV-Headers REQUIRED CONFIG) +- endif() -endif() - if(BUILD_TESTS) set(GLSLANG_INSTALL_DIR "GLSLANG-NOTFOUND" CACHE PATH "Absolute path to a glslang install directory") if(NOT GLSLANG_INSTALL_DIR AND NOT DEFINED ENV{GLSLANG_INSTALL_DIR} AND NOT TARGET glslang) -@@ -269,7 +254,20 @@ if(BUILD_TESTS) +@@ -274,7 +256,20 @@ if(BUILD_TESTS) set(GLSLANG_INSTALL_DIR $ENV{GLSLANG_INSTALL_DIR}) endif() @@ -76,7 +80,7 @@ CMake Error at CMakeLists.txt:254 (find_package): message(STATUS "Using glslang install located at ${GLSLANG_INSTALL_DIR}") set(GLSLANG_SEARCH_PATH "${GLSLANG_INSTALL_DIR}/lib") set(GLSLANG_DEBUG_SEARCH_PATH "${GLSLANG_INSTALL_DIR}/lib") -@@ -304,6 +302,34 @@ if(BUILD_TESTS) +@@ -309,6 +304,34 @@ if(BUILD_TESTS) endif() endif() @@ -111,7 +115,7 @@ CMake Error at CMakeLists.txt:254 (find_package): # Generate dependent helper files ------------------------------------------------------------------------------------------------ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") -@@ -346,7 +372,7 @@ target_include_directories(VkLayer_utils +@@ -351,7 +374,7 @@ target_include_directories(VkLayer_utils ${VulkanHeaders_INCLUDE_DIR}) if (USE_ROBIN_HOOD_HASHING) @@ -120,7 +124,7 @@ CMake Error at CMakeLists.txt:254 (find_package): target_compile_definitions(VkLayer_utils PUBLIC USE_ROBIN_HOOD_HASHING) endif() -@@ -387,8 +413,37 @@ endif() +@@ -392,8 +415,37 @@ endif() if(BUILD_TESTS) # Attempt to enable googletest if available. @@ -160,18 +164,22 @@ CMake Error at CMakeLists.txt:254 (find_package): endif() if(BUILD_LAYERS OR BUILD_LAYER_SUPPORT_FILES) ---- layers/CMakeLists.txt.orig 2021-12-21 17:05:00 UTC +--- layers/CMakeLists.txt.orig 2022-01-28 00:29:34 UTC +++ layers/CMakeLists.txt -@@ -269,8 +269,6 @@ if(INSTRUMENT_OPTICK) +@@ -270,12 +270,6 @@ if(INSTRUMENT_OPTICK) endif() if(BUILD_LAYERS) -- find_package(SPIRV-Tools REQUIRED CONFIG) -- find_package(SPIRV-Tools-opt REQUIRED CONFIG) +- if (NOT TARGET SPIRV-Tools) +- find_package(SPIRV-Tools REQUIRED CONFIG) +- endif() +- if (NOT TARGET SPIRV-Tools-opt) +- find_package(SPIRV-Tools-opt REQUIRED CONFIG) +- endif() AddVkLayer(khronos_validation "${KHRONOS_LAYER_COMPILE_DEFINITIONS}" ${CHASSIS_LIBRARY_FILES} ${CORE_VALIDATION_LIBRARY_FILES} -@@ -298,14 +296,15 @@ if(BUILD_LAYERS) +@@ -303,19 +297,16 @@ if(BUILD_LAYERS) # Khronos validation additional dependencies target_include_directories(VkLayer_khronos_validation PRIVATE ${GLSLANG_INCLUDE_DIR}) @@ -183,12 +191,17 @@ CMake Error at CMakeLists.txt:254 (find_package): if (USE_ROBIN_HOOD_HASHING) target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR}) endif() -- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers SPIRV-Tools-static SPIRV-Tools-opt) -- +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers) +- else() +- target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) +- endif() + +- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) + target_link_libraries(VkLayer_khronos_validation PRIVATE ${SPIRV_TOOLS_LIBRARIES}) + # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled - # because the json format uses backslash escapes --- scripts/common_ci.py.orig 2021-12-21 17:05:00 UTC +++ scripts/common_ci.py @@ -76,6 +76,16 @@ def BuildVVL(args, build_tests=False):