From nobody Mon Aug 07 13:26:48 2023 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 4RKHCr3dPcz4pbFK; Mon, 7 Aug 2023 13:26:48 +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 4RKHCr35lcz3gdN; Mon, 7 Aug 2023 13:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691414808; 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=OcniRC3NM7NKEOmz6rKh96TfC8NLX34tkG7QpcibW70=; b=T44YhoZIKbD4twDTQOGeWlBHEKWf9ROvyicoKYUXQ9ZgpVRncMKLIU+YYtVizcxmV4d8pE 8O36TsC7XoL9ASYesKtC1npJB7O7YyJg0LIMpmzqgs6/y6Cm0vQ8vZyUG7EVF2/Ej/p9++ RGW+92RAU0eDXlMOXjgcK0XfbqxEu2ON40uP8UiYjpv+EhkrEDZsbCRk1Lw+1HVMzvAhEr OyS5r0SHal2JFDlUMkJbVXsVpifEzH/7oDZqDeDTkuwJGpESTRecXYq5JkoHcBLB4h8B6S BU6ArxiFoCd0fSBE/WQ+Z65KBG5H4GhM9ZCcZaUMmu7g9owzLEOM9PaNC1ralA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691414808; 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=OcniRC3NM7NKEOmz6rKh96TfC8NLX34tkG7QpcibW70=; b=xefLqGxraAMqL22hpsJcyHrMnJrj9lwSV3xS235DG/SnKYcgkfdQiYC8oK7ktyfNr8l4Cw bl9iFsgxqwH3Phnot1TZ14nadEUWHwWusoWtqyZLnMMlsdfL7Ik01yGtFjCEg+EgwYtJqS aw3ix16gDUpWyC4Qt9aXAcXFSsBWBUby5C4gZgT6m0ivDkPXiGEVUsYe99ikYP68DuQUrg Q7Kz6s0T2WB+p6qYIa4pnyuK1Kc0iBvM0iwCnlpS8iLlfiGHze4LmCjhGyf202vOXUBNOi DJKeST9v3pSDmjrS7gf3NozqHc+lRW0aXfvjNFXOu1mtbBM8M5P8VBDj7TFyhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691414808; a=rsa-sha256; cv=none; b=TBThG8traO7ly13eUtnbljr1XDnB6ag0LhtYlzxFtixMeSK994A2l/D72/fRjTSYHb3Kvt VOlKy7sBwmc4tJC7NOmK5XqOg6AaxGecvSUZHbHFfGN558R8AJ8XGe13Zz7Vf30TfXxq6H aVOTCR9NuEk0/yPmBZ/cg3EvU/4wBNbnZy67y8zEdKiM3oK5IH1vCJ8na7Yhjm7OQwC01U miVvcWvnwYQZbJxFm/CrBMbFC1v0y6LIi04wD1BoRjm7EKq3EgsnzKVe9v44iYp0cpLAA0 o9bHE9oJGoywj3gxabG/bhE5E14CF2YpngCke9V4SX9yf06l9BZ77d/1G9roFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKHCr27yHzsx2; Mon, 7 Aug 2023 13:26:48 +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 377DQmwf026609; Mon, 7 Aug 2023 13:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377DQmEY026608; Mon, 7 Aug 2023 13:26:48 GMT (envelope-from git) Date: Mon, 7 Aug 2023 13:26:48 GMT Message-Id: <202308071326.377DQmEY026608@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: 7246984db03c - main - graphics/vulkan-validation-layers: update to 1.3.261 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: 7246984db03c8ef3f4916d8624fadb5b43532eff Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7246984db03c8ef3f4916d8624fadb5b43532eff commit 7246984db03c8ef3f4916d8624fadb5b43532eff Author: Jan Beich AuthorDate: 2023-08-06 12:00:24 +0000 Commit: Jan Beich CommitDate: 2023-08-07 13:26:18 +0000 graphics/vulkan-validation-layers: update to 1.3.261 Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.3.260...v1.3.261 Reported by: Repology, portscout --- graphics/vulkan-validation-layers/Makefile | 7 +--- graphics/vulkan-validation-layers/distinfo | 8 ++-- .../vulkan-validation-layers/files/patch-revert | 47 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 11 deletions(-) diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 1b53682c7893..e9b890a8476c 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.260 +DISTVERSION= 1.3.261 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -23,11 +23,6 @@ CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" -.if ${DISTVERSION:E} < 261 -GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.260:vkheaders/Vulkan-Headers -CFLAGS+= -I${WRKSRC_vkheaders}/include -.endif - OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 782320086ffc..c79d41271084 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1690939084 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.260_GH0.tar.gz) = f7dcafcfad08c5817b502416474138fba9ec7a9cdaf0289782ba2ee448d3e585 -SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.260_GH0.tar.gz) = 4872653 +TIMESTAMP = 1691323224 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.261_GH0.tar.gz) = ab769d9d7550e1636c9309387a7e53be5ba89f0b19f810bb40caa1b6eaefe8ee +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.261_GH0.tar.gz) = 4858473 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-284-g3469b16_GH0.tar.gz) = 202a623685e0cf376d92ee34649c66ba4bc34cc403e226947ed5e626ff3654a6 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-284-g3469b16_GH0.tar.gz) = 455615 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.260_GH0.tar.gz) = f6e44769c42685fd5d380aea280a2406a431fe584d7ae3256ce83958cd0899f4 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.260_GH0.tar.gz) = 2044625 diff --git a/graphics/vulkan-validation-layers/files/patch-revert b/graphics/vulkan-validation-layers/files/patch-revert new file mode 100644 index 000000000000..ccca9c0e9972 --- /dev/null +++ b/graphics/vulkan-validation-layers/files/patch-revert @@ -0,0 +1,47 @@ +Revert https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/c6228c5eee5c +as unused until https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/6088 + +--- CMakeLists.txt.orig 2023-08-06 12:00:24 UTC ++++ CMakeLists.txt +@@ -68,8 +68,6 @@ endif() + endif() + endif() + +-find_package(VulkanUtilityLibraries REQUIRED CONFIG QUIET) +- + if (ANNOTATED_SPEC_LINK) + message("ANNOTATED_SPEC_LINK is ${ANNOTATED_SPEC_LINK}") + add_compile_definitions(ANNOTATED_SPEC_LINK=${ANNOTATED_SPEC_LINK}) +--- layers/CMakeLists.txt.orig 2023-08-06 12:00:24 UTC ++++ layers/CMakeLists.txt +@@ -392,7 +392,7 @@ endif() + endif() + # Order matters here. VkLayer_utils should be the last link library to ensure mimalloc overrides are picked up correctly. + # Otherwise, libraries after VkLayer_utils will not benefit from this performance improvement. +-target_link_libraries(vvl PRIVATE VVL-SPIRV-LIBS Vulkan::LayerSettings VkLayer_utils) ++target_link_libraries(vvl PRIVATE VVL-SPIRV-LIBS VkLayer_utils) + + # Using mimalloc on non-Windows OSes currently results in unit test instability with some + # OS version / driver combinations. On 32-bit systems, using mimalloc cause an increase in +--- scripts/CMakeLists.txt.orig 2023-08-06 12:00:24 UTC ++++ scripts/CMakeLists.txt +@@ -127,9 +127,6 @@ endif() + if (VULKAN_HEADERS_INSTALL_DIR) + list(APPEND CMAKE_PREFIX_PATH ${VULKAN_HEADERS_INSTALL_DIR}) + endif() +-if (VULKAN_UTILITY_LIBRARIES_INSTALL_DIR) +- list(APPEND CMAKE_PREFIX_PATH ${VULKAN_UTILITY_LIBRARIES_INSTALL_DIR}) +-endif() + if (MIMALLOC_INSTALL_DIR) + list(APPEND CMAKE_PREFIX_PATH ${MIMALLOC_INSTALL_DIR}) + endif() +--- tests/CMakeLists.txt.orig 2023-08-06 12:00:24 UTC ++++ tests/CMakeLists.txt +@@ -193,7 +193,6 @@ target_link_libraries(vk_layer_validation_tests PRIVAT + + target_link_libraries(vk_layer_validation_tests PRIVATE + VkLayer_utils +- Vulkan::LayerSettings + glslang::glslang + glslang::OGLCompiler + glslang::OSDependent