From nobody Fri Jan 20 19:37:25 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 4Nz8sK2xffz2v66G; Fri, 20 Jan 2023 19:37:25 +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 4Nz8sK2SZGz3GyD; Fri, 20 Jan 2023 19:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674243445; 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=0+WZEzjMVxCx68T/0RtKQKAP9wKUO0rwN3rGaOxstHs=; b=PVVnUZ7c8djOpS+fM0xpEr1O1rj1+vXWTCk9KLHIxzDicrPhL3/n/IUbs3Xcioo8vIQzDo YY5pVQk2XqHTUZLb9c72dLBed+aJCzStuwhdoL38dWRCE0Px02WfkSzrWfmRNB7haGkgQO C19Q/q4OIw7oX7f9cpQjWONMA+JwwJxn+/QtQ4b/siSCXqvfCLK8VNr6X7uEUkKzkeMADD ki8h4a5UuxgysoSWa+IouvXySRbb568LRCXBOuuG493XJXAUsA1126QoqhuRmh+m/ckstx wMCUJQ03CzzhnzLd8YGckaQocxtdC8tNvvTmUfztPWy4G7ywZhP1IcMz6MJuYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674243445; 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=0+WZEzjMVxCx68T/0RtKQKAP9wKUO0rwN3rGaOxstHs=; b=u94fyToT6cWHwEX/769gHHS84IlGzX5O3HUhDnO8U5vbmsp3dm57qhc8dPKsbhE8Lm5x/v 0+dZme3qHW1FR4+Fd+BlyF3U4MrXSDyAHs6rV3YGbFDbMQd6qM0RDdeFApqVFAcAqnCljP yMsmElvpFkxXR6tmUEG90Dyy1ObbkZqMs0BZ58FrRutQ+fGR0zCYET0614wStlXYdbxwBv CKH01gTEGmetbyrcRMhwwpjuQLLxIk6pKcDTWaIwCFSldR63XupZ7efeu+oiR+R8KuGUMG eyLF7g8VAv86zQqOJR8JlP+ZEfgEHIWO43htMlPW6V4JAkRE+zn4sMi+cOWZfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674243445; a=rsa-sha256; cv=none; b=jBnQmwopd9VHUzA2nXZX00o7efpM9oIAg6duH2a5x5F5RYQBWl4iJsWjVhYkufhbFToq3J +JysmGKtHLpGkmZQ9LHQ5MGH677MPhyOCBF320VUsbPc6j+QuBcbNT6W/9H+NsqapMJdr+ gyEruEBXUSadEJ1/iFpyzg+77gGvyuDr0yPHwwZR2a/KysUxQoIggj/D6wq/yBdYjTqPjg s0iNs9atAtmlZlbh1UZYb4WUH9smdHb7KHTMmYEKaoY0uI7wXympXJqnuuoLa1c2oXvQIO LzdtUZMg7iR5On3BMhT9OvcOZ3fPB+5AkMQKBQlcykcN2F3WKeajUqjuPdHhXQ== 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 4Nz8sK1YFtzhLZ; Fri, 20 Jan 2023 19:37:25 +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 30KJbPf5028993; Fri, 20 Jan 2023 19:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KJbPIB028992; Fri, 20 Jan 2023 19:37:25 GMT (envelope-from git) Date: Fri, 20 Jan 2023 19:37:25 GMT Message-Id: <202301201937.30KJbPIB028992@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: c1914215f9f8 - main - graphics/vulkan-validation-layers: update to 1.3.239 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: c1914215f9f89e6e2a776a826b227e54c070f2ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1914215f9f89e6e2a776a826b227e54c070f2ea commit c1914215f9f89e6e2a776a826b227e54c070f2ea Author: Jan Beich AuthorDate: 2023-01-20 04:42:25 +0000 Commit: Jan Beich CommitDate: 2023-01-20 19:36:38 +0000 graphics/vulkan-validation-layers: update to 1.3.239 Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.3.238...v1.3.239 Reported by: Repology, portscout --- graphics/vulkan-validation-layers/Makefile | 10 ++----- graphics/vulkan-validation-layers/distinfo | 16 ++++------- .../files/patch-CMakeLists.txt | 33 ---------------------- .../files/patch-layers_CMakeLists.txt | 27 ++++++++++++++++++ graphics/vulkan-validation-layers/pkg-plist | 1 + 5 files changed, 35 insertions(+), 52 deletions(-) diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 3dad0de0256f..ff8bada3a5db 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,14 +1,8 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.238 -PORTREVISION= 1 +DISTVERSION= 1.3.239 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 4050be7c1960.patch:-p1 # https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/5062 -PATCHFILES+= d786eab65863.patch:-p1 # https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/5087 -PATCHFILES+= f4d438f73a52.patch:-p1 # https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/5098 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-ValidationLayers @@ -24,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-207-g1d31a10:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-214-gd13b522:headers/external/spirv-headers CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 0cf9d8344924..58492a06f418 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,11 +1,5 @@ -TIMESTAMP = 1671471267 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.238_GH0.tar.gz) = 03bc5843ef965595077958edef314e00aaf6ec42eb3e13c19007352f3dcb768d -SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.238_GH0.tar.gz) = 4523932 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-207-g1d31a10_GH0.tar.gz) = 696f3dddde6d732155140131eceba2b290e0e7a7eea18c39bc687a08fce733f1 -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-207-g1d31a10_GH0.tar.gz) = 445575 -SHA256 (4050be7c1960.patch) = 41fe993e9f7639836b6f0d691104a2f0a035b0c14bf5fa9a3740f8b34114ccf3 -SIZE (4050be7c1960.patch) = 5020 -SHA256 (d786eab65863.patch) = f3b943f50e0061ec91cc055ead8c354e2e3dcb6de22f22115fc7c46157490048 -SIZE (d786eab65863.patch) = 2116 -SHA256 (f4d438f73a52.patch) = ad27fdfc602e59a1ae300d2a49da0c2736cd4e142ebd93a7786a3f75fd1569d3 -SIZE (f4d438f73a52.patch) = 861 +TIMESTAMP = 1674189745 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.239_GH0.tar.gz) = 7267aff7993ecac4e9795c57d2f4b0bb50e7c7a21eeea41de251ca6c36adc4fa +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.239_GH0.tar.gz) = 4545796 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = f4f0663a7fc0c17beaecb824c58ece4169edec1b3bb6eb1f6857b7b56bad3194 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = 446635 diff --git a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt deleted file mode 100644 index 3891812819f3..000000000000 --- a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -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. - ---- CMakeLists.txt.orig 2022-10-28 03:54:50 UTC -+++ CMakeLists.txt -@@ -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}) -@@ -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) - diff --git a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt new file mode 100644 index 000000000000..c96d097f56a7 --- /dev/null +++ b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt @@ -0,0 +1,27 @@ +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-01-20 04:42:25 UTC ++++ layers/CMakeLists.txt +@@ -111,7 +111,12 @@ add_library(VVL-SPIRV-LIBS INTERFACE) + # Represents all SPIRV libraries we need + add_library(VVL-SPIRV-LIBS INTERFACE) + ++if (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) ++else() + find_package(SPIRV-Headers REQUIRED CONFIG QUIET) ++endif() + target_link_libraries(VVL-SPIRV-LIBS INTERFACE SPIRV-Headers::SPIRV-Headers) + + find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET) diff --git a/graphics/vulkan-validation-layers/pkg-plist b/graphics/vulkan-validation-layers/pkg-plist index 36ad5502053e..4589b5ce619a 100644 --- a/graphics/vulkan-validation-layers/pkg-plist +++ b/graphics/vulkan-validation-layers/pkg-plist @@ -12,6 +12,7 @@ include/vulkan/vk_layer_data.h include/vulkan/vk_layer_dispatch_table.h include/vulkan/vk_layer_extension_utils.cpp include/vulkan/vk_layer_extension_utils.h +include/vulkan/vk_layer_logging.cpp include/vulkan/vk_layer_logging.h include/vulkan/vk_layer_utils.cpp include/vulkan/vk_layer_utils.h