Date: Mon, 1 Jan 2024 00:42:50 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 690f751b047e - main - graphics/vulkan-extension-layer: unbundle graphics/vulkan-utility-libraries Message-ID: <202401010042.4010gowM080527@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=690f751b047e3ce324e01390e7311d1ba6a4c1a1 commit 690f751b047e3ce324e01390e7311d1ba6a4c1a1 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-01-01 00:27:31 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401010042.4010gowM080527>