summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch13
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-demos_git.bb6
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 @@
1From 0cbf9c9831f773e0da66209be9a6ff28d57c2321 Mon Sep 17 00:00:00 2001 1From 663d51cd31fd98411e25f37aaf52b591d9639bf5 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com> 2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Mon, 30 Jul 2018 17:23:29 +0300 3Date: Mon, 30 Jul 2018 17:23:29 +0300
4Subject: [PATCH] Don't build demos with questionably licensed data 4Subject: [PATCH] Don't build demos with questionably licensed data
@@ -33,16 +33,15 @@ Upstream-Status: Inappropriate [configuration]
33 33
34Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 34Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
35Signed-off-by: Maxin B. John <maxin.john@intel.com> 35Signed-off-by: Maxin B. John <maxin.john@intel.com>
36
37--- 36---
38 examples/CMakeLists.txt | 14 -------------- 37 examples/CMakeLists.txt | 14 --------------
39 1 file changed, 14 deletions(-) 38 1 file changed, 14 deletions(-)
40 39
41diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt 40diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
42index e07918c..08b6e23 100644 41index a53c834..71a12e7 100644
43--- a/examples/CMakeLists.txt 42--- a/examples/CMakeLists.txt
44+++ b/examples/CMakeLists.txt 43+++ b/examples/CMakeLists.txt
45@@ -55,18 +55,12 @@ set(EXAMPLES 44@@ -55,9 +55,6 @@ set(EXAMPLES
46 conditionalrender 45 conditionalrender
47 conservativeraster 46 conservativeraster
48 debugmarker 47 debugmarker
@@ -52,9 +51,10 @@ index e07918c..08b6e23 100644
52 descriptorsets 51 descriptorsets
53 displacement 52 displacement
54 distancefieldfonts 53 distancefieldfonts
55 dynamicuniformbuffer 54@@ -65,9 +62,6 @@ set(EXAMPLES
56 gears 55 gears
57 geometryshader 56 geometryshader
57 gltfscene
58- hdr 58- hdr
59- imgui 59- imgui
60- indirectdraw 60- indirectdraw
@@ -93,3 +93,6 @@ index e07918c..08b6e23 100644
93 ) 93 )
94 94
95 buildExamples() 95 buildExamples()
96--
972.17.1
98
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 \
6 file://examples/triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa" 6 file://examples/triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa"
7 7
8SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf" 8SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf"
9SRCREV_gli = "7da5f50931225e9819a26d5cb323c5f42da50bcd" 9SRCREV_ktx = "726d14d02c95bb21ec9e43807751b491d295dd3c"
10 10
11SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \ 11SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \
12 git://github.com/g-truc/glm;destsuffix=git/external/glm;name=glm \ 12 git://github.com/g-truc/glm;destsuffix=git/external/glm;name=glm \
13 git://github.com/g-truc/gli;destsuffix=git/external/gli;name=gli \ 13 git://github.com/KhronosGroup/KTX-Software;destsuffix=git/external/ktx;name=ktx;lfs=0 \
14 file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \ 14 file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \
15 " 15 "
16UPSTREAM_CHECK_COMMITS = "1" 16UPSTREAM_CHECK_COMMITS = "1"
17SRCREV = "6d63dc32c320a49be0a56c365151c8f2f176bc59" 17SRCREV = "10a1ecaf7bbcbc316c83f7c52742baaba0ae2f45"
18UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" 18UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20