diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-05 15:01:27 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-07 12:11:03 +0100 |
| commit | a837a33e78b471038ec289eb1c641d2e6da462ed (patch) | |
| tree | 33c634f7d47c7bb410411309cfee14a66d3377a9 /meta/recipes-graphics/vulkan | |
| parent | 99dea774d51f9b7af9dd2359ab59cde1ea60374c (diff) | |
| download | openembedded-core-contrib-a837a33e78b471038ec289eb1c641d2e6da462ed.tar.gz | |
vulkan-demos: upgrade to latest revision
gli is replaced upstream with ktx.
lfs objects are not in a revision that we use, so they can be ignored.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan')
| -rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch index 76240610f5..153e662733 100644 --- a/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch +++ b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch @@ -1,4 +1,4 @@ -From 0cbf9c9831f773e0da66209be9a6ff28d57c2321 Mon Sep 17 00:00:00 2001 +From 663d51cd31fd98411e25f37aaf52b591d9639bf5 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" <maxin.john@intel.com> Date: Mon, 30 Jul 2018 17:23:29 +0300 Subject: [PATCH] Don't build demos with questionably licensed data @@ -33,16 +33,15 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com> - --- examples/CMakeLists.txt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index e07918c..08b6e23 100644 +index a53c834..71a12e7 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt -@@ -55,18 +55,12 @@ set(EXAMPLES +@@ -55,9 +55,6 @@ set(EXAMPLES conditionalrender conservativeraster debugmarker @@ -52,9 +51,10 @@ index e07918c..08b6e23 100644 descriptorsets displacement distancefieldfonts - dynamicuniformbuffer +@@ -65,9 +62,6 @@ set(EXAMPLES gears geometryshader + gltfscene - hdr - imgui - indirectdraw @@ -93,3 +93,6 @@ index e07918c..08b6e23 100644 ) buildExamples() +-- +2.17.1 + diff --git a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb index c94e768b52..9d7cb2b1e8 100644 --- a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb @@ -6,15 +6,15 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dcf473723faabf17baa9b5f2207599d0 \ file://examples/triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa" SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf" -SRCREV_gli = "7da5f50931225e9819a26d5cb323c5f42da50bcd" +SRCREV_ktx = "726d14d02c95bb21ec9e43807751b491d295dd3c" SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \ git://github.com/g-truc/glm;destsuffix=git/external/glm;name=glm \ - git://github.com/g-truc/gli;destsuffix=git/external/gli;name=gli \ + git://github.com/KhronosGroup/KTX-Software;destsuffix=git/external/ktx;name=ktx;lfs=0 \ file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "6d63dc32c320a49be0a56c365151c8f2f176bc59" +SRCREV = "10a1ecaf7bbcbc316c83f7c52742baaba0ae2f45" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" |