From nobody Mon Jan 1 00:42:51 2024 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 4T3HJW6yc5z55jGr; Mon, 1 Jan 2024 00:42:51 +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 4T3HJW58mjz4VPx; Mon, 1 Jan 2024 00:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704069771; 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=G0hc7J+uRAKuzlwSPAPElh9p8ETIko7YUSO339V2GCc=; b=NrUo2Fh72hg26TkG18CcgHBBlzzUUwZ7xs9dBGymEBUIsiTlqbtsuPbHZhfx1HE28j9VF6 RPQP5CT6Cj5P351EWaKg455qf1hLaQn+hgaf0tQESzD/6cKJ+ZS1bMe9mhW74ehyOcpVw+ 0pIOXJmf3AqpDfLDkypi3mNSQocpDWPDcsz3NTCeRS+CjfyssfGmRSEgXdPg3WVfWyoWyn YG2MpbCLcPsKqgcMciFgHMGB0zPrlcDNDu3ew/CuiumO3CQS7g7w0JBlq04m+BB7N5siKC cgnnv8/2eOpjEhbxSfzHlmqhHoGLgGDmWrNR7FCMd4fiOgjsfJBq6O8XFGaKaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704069771; a=rsa-sha256; cv=none; b=L/vMhYuG/ZffVj3sVPM01KGQ7tV7+F2GZ1OZ1VS2skmXhMO5RtafCsYdAHfBr7oFbD6F6c 29pMsJeVQZlgXJ6Z7j/fkbzUtlL9ZOxbEJCUif/JNXAbmPsRWVLgB5ftAq1PnY+6TURyqK Zdd8rnLsqid5PC6P/7iP2pjgI7/1Hy9XjpI60aoEOj4ACglm0Vwt74Y1Afu06mNppZYTEr /RDNxDXOJZGZ28EBkfFMeSNedaUaBou3nydVd+gCfXopQWb9gvl3IOhae3A3EtZm87PGQ9 t/fuR2paVgpMq2nJHnHt9i/lXkwQvAbUqTa6LYcZbgoxiI4bjKKJTpZ4wGAraA== 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=1704069771; 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=G0hc7J+uRAKuzlwSPAPElh9p8ETIko7YUSO339V2GCc=; b=VeX/o9CWjFwsnWM3Aq8tVXQZ74wan/7A8GB2yflUgISp7TMThVGfIKtFRHlt6kEBP2sSv1 CxFx0rCMiO2PGY8z7mVcTmUblGN2ECB6SVhKsixIfPuBlcf9jIgYZAtRdUgrmOQ2EkGo9d 8wFBM3rgq/GE4V/DlFik9YNurj7q995SMizilpALw3MiLKsJBqC5phCcAE6i8zSC7xIkzs pro+0TpJPJ3L0ky43wr6wdS31gH8wlNQkCbozz8kxk7tufNZotxtBViUXJZKFWfYoAvF5d 1uGPWLEOo0rASZlKUhFZvguRfJjOkIc/v0E+DNkm2Kzy3016DxbAqqEX55W+pA== 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 4T3HJW4GWCzwtx; Mon, 1 Jan 2024 00:42:51 +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 4010gpdx080572; Mon, 1 Jan 2024 00:42:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4010gpTQ080569; Mon, 1 Jan 2024 00:42:51 GMT (envelope-from git) Date: Mon, 1 Jan 2024 00:42:51 GMT Message-Id: <202401010042.4010gpTQ080569@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: 1f567d1a583b - main - graphics/vulkan-validation-layers: unbundle graphics/vulkan-utility-libraries 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: 1f567d1a583b0ab1e51e00d7cbb881a9b560c918 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f567d1a583b0ab1e51e00d7cbb881a9b560c918 commit 1f567d1a583b0ab1e51e00d7cbb881a9b560c918 Author: Jan Beich AuthorDate: 2024-01-01 00:29:19 +0000 Commit: Jan Beich CommitDate: 2024-01-01 00:41:33 +0000 graphics/vulkan-validation-layers: unbundle graphics/vulkan-utility-libraries --- graphics/vulkan-validation-layers/Makefile | 6 +++--- .../files/patch-CMakeLists.txt | 20 ++------------------ 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 041fc99cf01a..da7b7f074b2c 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -11,14 +11,14 @@ LICENSE= APACHE20 BUILD_DEPENDS= robin-hood-hashing>0:devel/robin-hood-hashing \ spirv-tools>0:graphics/spirv-tools \ - vulkan-headers>0:graphics/vulkan-headers + vulkan-headers>0:graphics/vulkan-headers \ + vulkan-utility-libraries>0:graphics/vulkan-utility-libraries USES= alias cmake compiler:c++11-lib pkgconfig python:build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/SPIRV-Headers \ - KhronosGroup:Vulkan-Utility-Libraries:${DISTVERSIONPREFIX}${DISTVERSION}:utils/Vulkan-Utility-Libraries +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/SPIRV-Headers CMAKE_OFF= BUILD_TESTS OPTIONS_DEFINE= WAYLAND XCB XLIB diff --git a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt index 8cbbc0bcb4cb..220111f19a50 100644 --- a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt +++ b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt @@ -1,14 +1,3 @@ -CMake Error at layers/CMakeLists.txt:74 (target_link_libraries): - Target "VkLayer_utils" links to: - - Vulkan::LayerSettings - - 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. - CMake Error at layers/CMakeLists.txt:318 (target_link_libraries): Target "vvl" links to: @@ -20,15 +9,10 @@ CMake Error at layers/CMakeLists.txt:318 (target_link_libraries): * 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.orig 2023-12-20 00:20:05 UTC +++ CMakeLists.txt -@@ -72,8 +72,14 @@ find_package(VulkanUtilityLibraries CONFIG QUIET) - find_package(VulkanHeaders CONFIG QUIET) - +@@ -79,6 +79,9 @@ find_package(SPIRV-Headers 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() find_package(SPIRV-Headers CONFIG QUIET) +if (NOT TARGET SPIRV-Headers::SPIRV-Headers)