From nobody Mon Jan 01 00:42:50 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 4T3HJW0DmWz55jTT; 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 4T3HJV4dnDz4VBn; Mon, 1 Jan 2024 00:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704069770; 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=p3Cp0bnph54qQwJX+RwKZXbpotRkz41Vp/huyRWx06U=; b=udzVD+GMin+VTBWgY4QBfF/7wXqNa8ivl1iaEtSDpm8Oidiy64WuKPQtwj9AjLQLo7ySAU 16rcOoPEehb4tMPCDzbHpQi/4HAHjvuhK0wCDJFuUSt8Ap5tDuhZYG3SpFXYBdKA3UWkdb 6Agic6TVRjIuSrlwslsD0R1dK5+8FfTvyCg2JjKfNLt9AoYjGT0j3Di2o9opG2B9xrrfel DzgHCqXe1KZM6Dhr67ZYWOrUHIhAt7wIdAc+5RjFlixPhep7TNwpx81+JpkNws+OtcNHQr Oe46U/bT25y9p0JdM+9qDmivXzJyWdz1M25yROW6rlawK3zDMVgvjMFCqR/86Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704069770; a=rsa-sha256; cv=none; b=LsBKOOTJ8AU9opQcS4rVhekAVzXC48Fgkqwqv2Vsvwy4zisa3+4z+qwzzmdapeUt79YF/6 p0CzxlQQwFdgGTsi8yVOOPkYh+LIjxNu2ZWfpUTH0hlcnyDimqpNzd2L+C832NSlYvjWak i3jle8ObJcKrhA3CU9dQPdZsc4AEEmUtKZq2R2g5J2h+rE0P/wD5r3AhZBs0EweTWJNSyc EuSlZj9fnDE7tivmMDnNc8tmxke7bfJGooDv9mP8f23ioT1Ss+WFlSPJ/X1gm+XAad40P4 IlM1SATBnD/3x5yTAdc4YbsiuWAcuxNAc72EbmjwzgNIjxmIamQ4eCUTkTT7jw== 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=1704069770; 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=p3Cp0bnph54qQwJX+RwKZXbpotRkz41Vp/huyRWx06U=; b=T+r+xzwDx8NkJZUg4+2B6Sig8omoa/+axiS/UJ+coBkvq0dfl0ZP2z/xY1auFkUd6qavf5 nPfRbdyHy3QIM3KeCLPyhlYc2LV6pGdwtWo+s8GSOsISAStBtEG00KgCAhcfzyaT+pQsbP lpRAU8x3bTSS/bhaNQWjXIKuEi0qf/CrofbyzzMyHpNKu2FI4LVyuc1PEDTFI/K/8jsg4s vLWCJiq7UQOL2eZ0KmUgb3PnZP14gV7+lyl7QuoEDT/a9LHWs0Tlp3LUbFkD0QDoaSj4DJ eKn+3td+94MQ3U6QWQnvuWF9QweXhk1U9S9Z33b1L6pg7W9Qo15tdm9P3RfUlw== 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 4T3HJV3jdFzwxN; Mon, 1 Jan 2024 00:42:50 +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 4010gonB080530; Mon, 1 Jan 2024 00:42:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4010gowM080527; Mon, 1 Jan 2024 00:42:50 GMT (envelope-from git) Date: Mon, 1 Jan 2024 00:42:50 GMT Message-Id: <202401010042.4010gowM080527@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: 690f751b047e - main - graphics/vulkan-extension-layer: 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: 690f751b047e3ce324e01390e7311d1ba6a4c1a1 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=690f751b047e3ce324e01390e7311d1ba6a4c1a1 commit 690f751b047e3ce324e01390e7311d1ba6a4c1a1 Author: Jan Beich AuthorDate: 2024-01-01 00:27:31 +0000 Commit: Jan Beich CommitDate: 2024-01-01 00:41:30 +0000 graphics/vulkan-extension-layer: unbundle graphics/vulkan-utility-libraries --- graphics/vulkan-extension-layer/Makefile | 4 ++-- .../files/patch-CMakeLists.txt | 24 ---------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile index 95e3dae93d0f..b8a4751d28f0 100644 --- a/graphics/vulkan-extension-layer/Makefile +++ b/graphics/vulkan-extension-layer/Makefile @@ -9,13 +9,13 @@ WWW= https://github.com/KhronosGroup/Vulkan-ExtensionLayer LICENSE= APACHE20 -BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers +BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers \ + vulkan-utility-libraries>0:graphics/vulkan-utility-libraries USES= cmake compiler:c++11-lib pkgconfig USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ExtensionLayer -GH_TUPLE= KhronosGroup:Vulkan-Utility-Libraries:${DISTVERSIONPREFIX}${DISTVERSION}:utils/Vulkan-Utility-Libraries CMAKE_OFF= BUILD_TESTS OPTIONS_DEFINE= WAYLAND XCB XLIB diff --git a/graphics/vulkan-extension-layer/files/patch-CMakeLists.txt b/graphics/vulkan-extension-layer/files/patch-CMakeLists.txt deleted file mode 100644 index a17b695ab439..000000000000 --- a/graphics/vulkan-extension-layer/files/patch-CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -CMake Error at CMakeLists.txt:69 (find_package): - Could not find a package configuration file provided by - "VulkanUtilityLibraries" with any of the following names: - - VulkanUtilityLibrariesConfig.cmake - vulkanutilitylibraries-config.cmake - - 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. - ---- CMakeLists.txt.orig 2023-11-28 17:03:03 UTC -+++ CMakeLists.txt -@@ -68,6 +68,9 @@ find_package(VulkanUtilityLibraries CONFIG) - - find_package(VulkanHeaders CONFIG) - find_package(VulkanUtilityLibraries CONFIG) -+if (NOT TARGET Vulkan::UtilityHeaders OR NOT TARGET Vulkan::LayerSettings) -+ add_subdirectory(Vulkan-Utility-Libraries EXCLUDE_FROM_ALL SYSTEM) -+endif() - - add_subdirectory(layers) - add_subdirectory(utils)