vulkan-demos: update to latest revision

(From OE-Core rev: 2666f3978bd217303bb4306a14d9d88ab59dc697)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-12-06 19:09:42 +01:00
committed by Richard Purdie
parent 9ad29096a8
commit b6754e6ec6
2 changed files with 14 additions and 17 deletions

View File

@@ -1,4 +1,4 @@
From 0a27144d43b70121f57f6036514d069ca9d2b971 Mon Sep 17 00:00:00 2001
From 0cbf9c9831f773e0da66209be9a6ff28d57c2321 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,17 @@ 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 8eee3a4..698d3b3 100644
index e07918c..08b6e23 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -47,18 +47,12 @@ set(EXAMPLES
computeshader
@@ -55,18 +55,12 @@ set(EXAMPLES
conditionalrender
conservativeraster
debugmarker
- deferred
@@ -57,10 +58,10 @@ index 8eee3a4..698d3b3 100644
- hdr
- imgui
- indirectdraw
inlineuniformblocks
inputattachments
instancing
mesh
@@ -70,8 +64,6 @@ set(EXAMPLES
@@ -83,23 +77,16 @@ set(EXAMPLES
parallaxmapping
particlefire
pbrbasic
@@ -69,9 +70,8 @@ index 8eee3a4..698d3b3 100644
pipelines
pipelinestatistics
pushconstants
@@ -79,15 +71,10 @@ set(EXAMPLES
pushdescriptors
radialblur
raytracing
renderheadless
- scenerendering
screenshot
@@ -85,7 +85,7 @@ index 8eee3a4..698d3b3 100644
stencilbuffer
subpasses
terraintessellation
@@ -101,7 +88,6 @@ set(EXAMPLES
@@ -113,7 +100,6 @@ set(EXAMPLES
texturesparseresidency
triangle
viewportarray
@@ -93,6 +93,3 @@ index 8eee3a4..698d3b3 100644
)
buildExamples()
--
2.4.0

View File

@@ -5,23 +5,23 @@ DEPENDS = "zlib"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dcf473723faabf17baa9b5f2207599d0 \
file://examples/triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa"
SRCREV_glm = "01f9ab5b6d21e5062ac0f6e0f205c7fa2ca9d769"
SRCREV_gli = "8e43030b3e12bb58a4663d85adc5c752f89099c0"
SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf"
SRCREV_gli = "7da5f50931225e9819a26d5cb323c5f42da50bcd"
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 \
file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \
"
"
UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "ae0b59c6e2e8630a2ae26f4a0b7a72cbe7547948"
SRCREV = "6d63dc32c320a49be0a56c365151c8f2f176bc59"
UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
S = "${WORKDIR}/git"
REQUIRED_DISTRO_FEATURES = 'vulkan'
inherit cmake features_check
DEPENDS = "vulkan-loader assimp"
DEPENDS = "vulkan-loader assimp wayland-protocols wayland-native"
do_install_append () {
# Remove assets that have uncertain licenses