From f94950f2eb0335a9fe058c89304a0c0dc077772f Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 3 Feb 2025 13:08:41 +0100 Subject: [PATCH] vulkan: sync recipes with latest rel_imx_6.6.52_2.2.0 changes Port the latest versions of the recipes from meta-imx https://onedigi.atlassian.net/browse/DEL-9445 Signed-off-by: Gabriel Valcazar --- .../vulkan/gfxreconstruct_1.3.275.0.bb | 5 ++- ...emos-with-questionably-licensed-data.patch | 34 +++++++++++-------- .../vulkan/vulkan-demos_git.bb | 10 +++--- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/vulkan/gfxreconstruct_1.3.275.0.bb b/meta-digi-dey/recipes-graphics/vulkan/gfxreconstruct_1.3.275.0.bb index 85c37f098..d515337f6 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/gfxreconstruct_1.3.275.0.bb +++ b/meta-digi-dey/recipes-graphics/vulkan/gfxreconstruct_1.3.275.0.bb @@ -30,5 +30,8 @@ EXTRA_OECMAKE += "\ export SDKTARGETSYSROOT = "${STAGING_DIR_HOST}" +# The lib is unversioned +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + FILES:${PN} += "${datadir}/vulkan" -INSANE_SKIP:${PN}-dev += "dev-elf" diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch index d5ceefd80..ab61052a1 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch @@ -1,4 +1,4 @@ -From 663d51cd31fd98411e25f37aaf52b591d9639bf5 Mon Sep 17 00:00:00 2001 +From 34a185854c0a8ce0f748785f08c76a4258ec4549 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Mon, 30 Jul 2018 17:23:29 +0300 Subject: [PATCH] Don't build demos with questionably licensed data @@ -34,43 +34,44 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Jussi Kukkonen Signed-off-by: Maxin B. John --- - examples/CMakeLists.txt | 14 -------------- - 1 file changed, 14 deletions(-) + examples/CMakeLists.txt | 13 ------------- + 1 file changed, 13 deletions(-) -Index: git/examples/CMakeLists.txt -=================================================================== ---- git.orig/examples/CMakeLists.txt -+++ git/examples/CMakeLists.txt -@@ -89,9 +89,6 @@ set(EXAMPLES - conditionalrender +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 3e95b6cd..136229fb 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -97,9 +97,6 @@ set(EXAMPLES conservativeraster - debugmarker + debugprintf + debugutils - deferred - deferredmultisampling - deferredshadows descriptorbuffer descriptorindexing descriptorsets -@@ -106,9 +103,6 @@ set(EXAMPLES +@@ -114,10 +111,7 @@ set(EXAMPLES gltfscenerendering gltfskinning graphicspipelinelibrary - hdr + hostimagecopy - imgui - indirectdraw inlineuniformblocks inputattachments instancing -@@ -123,8 +117,6 @@ set(EXAMPLES +@@ -132,8 +126,6 @@ set(EXAMPLES parallaxmapping - particlefire + particlesystem pbrbasic - pbribl - pbrtexture pipelines pipelinestatistics pushconstants -@@ -141,12 +133,8 @@ set(EXAMPLES +@@ -152,12 +144,8 @@ set(EXAMPLES renderheadless screenshot shaderobjects @@ -83,7 +84,7 @@ Index: git/examples/CMakeLists.txt stencilbuffer subpasses terraintessellation -@@ -163,7 +151,6 @@ set(EXAMPLES +@@ -174,7 +162,6 @@ set(EXAMPLES variablerateshading vertexattributes viewportarray @@ -91,3 +92,6 @@ Index: git/examples/CMakeLists.txt ) buildExamples() +-- +2.34.1 + diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb index fcaba476f..139753caa 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-demos_git.bb @@ -1,20 +1,18 @@ DESCRIPTION = "Vulkan C++ examples and demos" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dcf473723faabf17baa9b5f2207599d0 \ - file://examples/triangle/triangle.cpp;endline=12;md5=6ff76c9a8e7b7dd640157f5d77b79339" + file://examples/triangle/triangle.cpp;endline=12;md5=a9bff831b31cd93da5daafd70c36133d" DEPENDS = "assimp vulkan-loader zlib" -SRC_URI = "git://github.com/SaschaWillems/Vulkan.git;protocol=https;branch=master \ - git://github.com/g-truc/glm;destsuffix=git/external/glm;name=glm;protocol=https;branch=master \ +SRC_URI = "gitsm://github.com/SaschaWillems/Vulkan.git;protocol=https;branch=master \ git://github.com/KhronosGroup/KTX-Software;destsuffix=git/external/ktx;name=ktx;lfs=0;protocol=https;branch=master \ file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \ file://0002-Modify-parameter-in-vulkan-demo-computenbody.patch \ " -SRCREV = "054a765eaaa552d5d12d869373dea211eda6fb16" -SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf" +SRCREV = "8b4ee5903364c86bc4d572b53ee8f1ac80501851" SRCREV_ktx = "726d14d02c95bb21ec9e43807751b491d295dd3c" -SRCREV_FORMAT = "default_glm_ktx" +SRCREV_FORMAT = "default_ktx" S = "${WORKDIR}/git"