From patchwork Thu Nov 10 20:42:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 15327 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A52F4C43217 for ; Thu, 10 Nov 2022 20:42:50 +0000 (UTC) Received: from smtp-fw-9103.amazon.com (smtp-fw-9103.amazon.com [207.171.188.200]) by mx.groups.io with SMTP id smtpd.web12.1004.1668112966957802391 for ; Thu, 10 Nov 2022 12:42:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=guCFAvz7; spf=pass (domain: amazon.com, ip: 207.171.188.200, mailfrom: prvs=3066031d8=jorcrous@amazon.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1668112967; x=1699648967; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oQCBjgAOf6rOUSr90QIShE1D2vpP6IY3KkMIJGpS1Ik=; b=guCFAvz7FiGqxLQ3CftXRKhOmUTQTLmiu/ps29rfGd8mEQRGIjpUU9RS s0O1O35GcOFLl2T+ds3Du5agqRgIoyVtoh65Ob0ivTLN8mKfs7E86q0na sissfcpdj7y7qKOi3la1s4vueRMJnbUI+43Uk5G7XmG+UHQFr7m9zPB5o U=; X-IronPort-AV: E=Sophos;i="5.96,154,1665446400"; d="scan'208";a="1072750467" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO email-inbound-relay-iad-1a-m6i4x-366646a6.us-east-1.amazon.com) ([10.25.36.214]) by smtp-border-fw-9103.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:42:46 +0000 Received: from EX13MTAUWB002.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-iad-1a-m6i4x-366646a6.us-east-1.amazon.com (Postfix) with ESMTPS id 742E4A0D7C for ; Thu, 10 Nov 2022 20:42:45 +0000 (UTC) Received: from EX19D047UWB002.ant.amazon.com (10.13.138.34) by EX13MTAUWB002.ant.amazon.com (10.43.161.202) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 10 Nov 2022 20:42:36 +0000 Received: from dev-dsk-jorcrous-2c-c78924fd.us-west-2.amazon.com (10.43.160.223) by EX19D047UWB002.ant.amazon.com (10.13.138.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1118.20; Thu, 10 Nov 2022 20:42:36 +0000 From: Jordan Crouse To: CC: Jordan Crouse Subject: [PATCH 1/3] spirv-tools: Correctly set the prefix in exported cmake packages Date: Thu, 10 Nov 2022 20:42:30 +0000 Message-ID: <20221110204232.12768-2-jorcrous@amazon.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221110204232.12768-1-jorcrous@amazon.com> References: <20221110204232.12768-1-jorcrous@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.160.223] X-ClientProxiedBy: EX13D22UWC003.ant.amazon.com (10.43.162.250) To EX19D047UWB002.ant.amazon.com (10.13.138.34) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Nov 2022 20:42:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173108 spirv-tools exports Cmake packages. When they are installed the INTERFACE_LINK_LIBRARIES variable is not correctly updated to use _IMPORT_PREFIX like the other variables. This may have something to do with the path to the sysroot being different than the source path. The existing recipe recognizes that the sysroot path made it through to the install and tries to get rid of it, but this just ends up with dependent tools looking in vain for /usr/lib/librt.so. Replace the INTERFACE_LINK_LIBRARIES value in SPIRV-ToolsTarget.cmake with "${IMPORT_PREFIX}/lib". Signed-off-by: Jordan Crouse --- meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb index ea47796543..fdc9c9225a 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "eb0a36633d2acf4de82588504f951ad0f2cecacb" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" PE = "1" +PR = "r1" + UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -25,9 +27,10 @@ EXTRA_OECMAKE += "\ " do_install:append:class-target() { - # reproducibility: remove build host path + # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent + # tools can find the right library sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ - -e 's:${STAGING_DIR_HOST}::g' + -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/lib":' } # all the libraries are unversioned, so don't pack it on PN-dev From patchwork Thu Nov 10 20:42:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 15325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A41B0C4332F for ; Thu, 10 Nov 2022 20:42:50 +0000 (UTC) Received: from smtp-fw-33001.amazon.com (smtp-fw-33001.amazon.com [207.171.190.10]) by mx.groups.io with SMTP id smtpd.web10.1051.1668112967240390103 for ; Thu, 10 Nov 2022 12:42:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=bPbHhXdD; spf=pass (domain: amazon.com, ip: 207.171.190.10, mailfrom: prvs=3066031d8=jorcrous@amazon.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1668112967; x=1699648967; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YvjZDhYbeZVeK7tYe+xA5DVeymUIJjKdqeyrQI6fz/8=; b=bPbHhXdDiEWbrNIWJg57DYahNbXRWtzRJPs0zkpUD7A0lFAUTA3vdwQR HfmtqKZ0qE7Tlf/KrZiKvRGUIiklxgki3fEyRQbHiDvqVA2ertY8i9jXF z9vs6cYXwKIIeQkvQH9r4vsqDdsxm8jOUMq99Wt5Rqahk7ZuW/UvLkqNC 8=; X-IronPort-AV: E=Sophos;i="5.96,154,1665446400"; d="scan'208";a="240048034" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1a-m6i4x-617e30c2.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-33001.sea14.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:42:47 +0000 Received: from EX13MTAUWB002.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-iad-1a-m6i4x-617e30c2.us-east-1.amazon.com (Postfix) with ESMTPS id C256261DFC for ; Thu, 10 Nov 2022 20:42:45 +0000 (UTC) Received: from EX19D047UWB002.ant.amazon.com (10.13.138.34) by EX13MTAUWB002.ant.amazon.com (10.43.161.202) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 10 Nov 2022 20:42:36 +0000 Received: from dev-dsk-jorcrous-2c-c78924fd.us-west-2.amazon.com (10.43.160.223) by EX19D047UWB002.ant.amazon.com (10.13.138.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1118.20; Thu, 10 Nov 2022 20:42:36 +0000 From: Jordan Crouse To: CC: Jordan Crouse Subject: [PATCH 2/3] vulkan-loader: Allow headless targets to build the loader Date: Thu, 10 Nov 2022 20:42:31 +0000 Message-ID: <20221110204232.12768-3-jorcrous@amazon.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221110204232.12768-1-jorcrous@amazon.com> References: <20221110204232.12768-1-jorcrous@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.160.223] X-ClientProxiedBy: EX13D22UWC003.ant.amazon.com (10.43.162.250) To EX19D047UWB002.ant.amazon.com (10.13.138.34) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Nov 2022 20:42:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173107 vulkan-loader can build and work on headless targets without display engines so there isn't any need for the ANY_OF_DISTRO_FEATURES restriction. Signed-off-by: Jordan Crouse --- meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb index 59c52c1db7..7aab7446f6 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb @@ -17,7 +17,6 @@ S = "${WORKDIR}/git" REQUIRED_DISTRO_FEATURES = "vulkan" inherit cmake features_check pkgconfig -ANY_OF_DISTRO_FEATURES = "x11 wayland" DEPENDS += "vulkan-headers" @@ -29,7 +28,6 @@ EXTRA_OECMAKE = "\ -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \ " -# 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, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" From patchwork Thu Nov 10 20:42:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 15326 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3A97C433FE for ; Thu, 10 Nov 2022 20:42:50 +0000 (UTC) Received: from smtp-fw-9102.amazon.com (smtp-fw-9102.amazon.com [207.171.184.29]) by mx.groups.io with SMTP id smtpd.web10.1049.1668112961459080739 for ; Thu, 10 Nov 2022 12:42:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=B1H1HySw; spf=pass (domain: amazon.com, ip: 207.171.184.29, mailfrom: prvs=3066031d8=jorcrous@amazon.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1668112961; x=1699648961; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ERxPtqVkySb6SvATMq/2tmHyyMid3Nt99xS1Fd68Ugg=; b=B1H1HySwlPC0FjSDfaXb62ugKLf63bJG0fca0l3U2qEIWW86SE94cQQr jMzZKS7l6ZprXnMj1hCFn3E3gtmQxrAM6UcuvYuDSiWI6xcnziBNt5ENF o6n0D0GtqptEhgrF31PY3X3/mdxLg34gfVedpZTEzeFQ7qkr/qOBwlw51 o=; X-IronPort-AV: E=Sophos;i="5.96,154,1665446400"; d="scan'208";a="278922612" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-pdx-2a-m6i4x-21d8d9f4.us-west-2.amazon.com) ([10.25.36.210]) by smtp-border-fw-9102.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:42:40 +0000 Received: from EX13MTAUWB001.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan2.pdx.amazon.com [10.236.137.194]) by email-inbound-relay-pdx-2a-m6i4x-21d8d9f4.us-west-2.amazon.com (Postfix) with ESMTPS id 88E8481B9F for ; Thu, 10 Nov 2022 20:42:40 +0000 (UTC) Received: from EX19D047UWB002.ant.amazon.com (10.13.138.34) by EX13MTAUWB001.ant.amazon.com (10.43.161.207) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 10 Nov 2022 20:42:36 +0000 Received: from dev-dsk-jorcrous-2c-c78924fd.us-west-2.amazon.com (10.43.160.223) by EX19D047UWB002.ant.amazon.com (10.13.138.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1118.20; Thu, 10 Nov 2022 20:42:36 +0000 From: Jordan Crouse To: CC: Jordan Crouse Subject: [PATCH 3/3] vulkan-validation: Add the official Vulkan validation layers Date: Thu, 10 Nov 2022 20:42:32 +0000 Message-ID: <20221110204232.12768-4-jorcrous@amazon.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221110204232.12768-1-jorcrous@amazon.com> References: <20221110204232.12768-1-jorcrous@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.160.223] X-ClientProxiedBy: EX13D22UWC003.ant.amazon.com (10.43.162.250) To EX19D047UWB002.ant.amazon.com (10.13.138.34) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Nov 2022 20:42:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173105 Add a recipe to build the Khronos official Vulkan validation layers that can assist developers in verifying that their applications correctly use the Vulkan APIs. Signed-off-by: Jordan Crouse --- .../vulkan/vulkan-validation_1.3.231.1.bb | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 meta/recipes-graphics/vulkan/vulkan-validation_1.3.231.1.bb diff --git a/meta/recipes-graphics/vulkan/vulkan-validation_1.3.231.1.bb b/meta/recipes-graphics/vulkan/vulkan-validation_1.3.231.1.bb new file mode 100644 index 0000000000..3d592fe24a --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-validation_1.3.231.1.bb @@ -0,0 +1,46 @@ +SUMMARY = "Vulkan Validation layers" +DESCRIPTION = "Khronos official Vulkan validation layers to assist developers \ +in verifying that their applications correctly use 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;branch=sdk-1.3.231;protocol=https" + +SRCREV="f489610de566df6a5c20de1a3e54776e0ad852e1" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" + +inherit cmake features_check pkgconfig + +DEPENDS += "vulkan-headers" +DEPENDS += "spirv-headers spirv-tools" +DEPENDS += "vulkan-loader" +DEPENDS += "glslang" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + -DASSEMBLER_WORKS=FALSE \ + -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ + -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ + -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ + -DUSE_ROBIN_HOOD_HASHING=OFF \ + " + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +FILES:${PN} += "/usr/share/vulkan/ /usr/lib/" + +INSANE_SKIP:${PN} += " ldflags" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)"