From f0c59b93d8c2090a8eb5f31b3fbedeb5abc80d08 Mon Sep 17 00:00:00 2001 From: Vincent Davis Jr Date: Tue, 13 Jun 2023 11:55:59 -0500 Subject: [PATCH] vulkan-validationlayers: remove recipe Recipe was moved into meta-freescale and renamed. Patch is presumed to be no longer required so remove as well. Signed-off-by: Vincent Davis Jr --- .../imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb | 2 +- ...hange-the-installation-path-of-JSON-.patch | 36 ---------------- .../vulkan-validationlayers_1.2.182.0.bb | 43 ------------------- ...vulkan-validationlayers_1.2.182.0.bbappend | 3 -- 4 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 recipes-graphics/vulkan-validationlayers/vulkan-validationlayers/0001-CMakeLists.txt-Change-the-installation-path-of-JSON-.patch delete mode 100644 recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bb delete mode 100644 recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bbappend diff --git a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb index 9e692f8..74795e2 100644 --- a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb +++ b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb @@ -130,7 +130,7 @@ RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8mm-nxp-bsp = "" # vulkan-loader is dynamically loaded, so need to add an explicit # dependency RDEPENDS_VULKAN_LOADER = "" -RDEPENDS_VULKAN_LOADER:mx8-nxp-bsp = "vulkan-validationlayers vulkan-loader" +RDEPENDS_VULKAN_LOADER:mx8-nxp-bsp = "vulkan-validation-layers vulkan-loader" RDEPENDS_VULKAN_LOADER:mx8mm-nxp-bsp = "" RDEPENDS:${PN} += " \ ${RDEPENDS_EMPTY_MAIN_PACKAGE} \ diff --git a/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers/0001-CMakeLists.txt-Change-the-installation-path-of-JSON-.patch b/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers/0001-CMakeLists.txt-Change-the-installation-path-of-JSON-.patch deleted file mode 100644 index 84595e4..0000000 --- a/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers/0001-CMakeLists.txt-Change-the-installation-path-of-JSON-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1f2837e05ed090ec553a3fc4fccee5618cf26d12 Mon Sep 17 00:00:00 2001 -From: Neena Busireddy -Date: Thu, 8 Aug 2019 11:27:01 -0500 -Subject: [PATCH] CMakeLists.txt: Change the installation path of JSON files - -Also modify the library path in JSON files to /usr/lib/libVK*.so - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Neena Busireddy ---- - layers/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: git/layers/CMakeLists.txt -=================================================================== ---- git.orig/layers/CMakeLists.txt -+++ git/layers/CMakeLists.txt -@@ -337,7 +337,7 @@ if(BUILD_LAYERS) - -DVK_VERSION=1.2.${vk_header_version}) - # If this json file is not a metalayer, get the needed properties from that target - if(TARGET ${TARGET_NAME}) -- set(INSTALL_DEFINES ${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY="$") -+ set(INSTALL_DEFINES ${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/$") - endif() - add_custom_target(${TARGET_NAME}-staging-json ALL - COMMAND ${CMAKE_COMMAND} ${INSTALL_DEFINES} -P "${CMAKE_CURRENT_BINARY_DIR}/generator.cmake") -@@ -351,7 +351,7 @@ if(BUILD_LAYERS) - DESTINATION ${CMAKE_INSTALL_LIBDIR}) - elseif(UNIX) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${TARGET_NAME}.json -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vulkan/explicit_layer.d) -+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/explicit_layer.d) - endif() - endforeach() - endif() diff --git a/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bb b/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bb deleted file mode 100644 index 2cbd3a1..0000000 --- a/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Vulkan ValidationLayers" -DESCRIPTION = "This project provides Vulkan validation layers that \ -can be enabled to assist development by enabling developers to verify \ -their applications correct use of the Vulkan API." -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;branch=sdk-1.2.182" - -SRCREV = "91fcffa8eca1a9573c8d736a54a028035ed4e06c" - -S = "${WORKDIR}/git" - -REQUIRED_DISTRO_FEATURES = "vulkan" - -inherit cmake features_check -ANY_OF_DISTRO_FEATURES = "x11 wayland" - -DEPENDS = "vulkan-headers glslang spirv-tools spirv-headers" - -EXTRA_OECMAKE = " \ - -DGLSLANG_INSTALL_DIR=${STAGING_DIR_HOST}/usr \ - -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_DIR_HOST}/usr \ - -DSPIRV_TOOLS_INSTALL_DIR=${STAGING_DIR_HOST}/usr \ - -DUSE_ROBIN_HOOD_HASHING=OFF \ -" - -# must choose x11 or wayland or both -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" - -PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON -DDEMOS_WSI_SELECTION=XCB, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DDEMOS_WSI_SELECTION=WAYLAND, libxcb libx11 libxrandr" -PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" - -# The output library is unversioned -SOLIBS = ".so" -FILES_SOLIBSDEV = "" - -RRECOMMENDS:${PN} = "mesa-vulkan-drivers" - -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bbappend b/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bbappend deleted file mode 100644 index 2ff4e3b..0000000 --- a/recipes-graphics/vulkan-validationlayers/vulkan-validationlayers_1.2.182.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-CMakeLists.txt-Change-the-installation-path-of-JSON-.patch"