From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 18/24] vulkan-demos: upgrade to latest revision
Date: Tue, 5 May 2020 15:01:27 +0200 [thread overview]
Message-ID: <20200505130133.24930-18-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200505130133.24930-1-alex.kanavin@gmail.com>
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>
---
...uild-demos-with-questionably-licensed-data.patch | 13 ++++++++-----
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"
--
2.26.1
next prev parent reply other threads:[~2020-05-05 13:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 13:01 [PATCH 01/24] libinput: add ptest Alexander Kanavin
2020-05-05 13:01 ` [PATCH 02/24] libinput: update 1.15.2 -> 1.15.5 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 03/24] avahi: merge avahi-ui into the main recipe Alexander Kanavin
2020-05-05 13:01 ` [PATCH 04/24] avahi: update to 0.8 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 05/24] testsdkext/devtool: initialize the test component's git repo Alexander Kanavin
2020-05-08 17:20 ` [OE-core] " Steve Sakoman
2020-05-08 17:22 ` Steve Sakoman
2020-05-08 19:14 ` Joshua Watt
2020-05-08 20:11 ` Alexander Kanavin
2020-05-05 13:01 ` [PATCH 06/24] git: update to 2.26.2 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 07/24] libcap: update to 2.33 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 08/24] libhandy: add a recipe from meta-oe Alexander Kanavin
2020-05-05 13:01 ` [PATCH 09/24] libdazzle: update to 3.36.0 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 10/24] epiphany: update to 3.36.1 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 11/24] patchelf: switch to git Alexander Kanavin
2020-05-05 13:01 ` [PATCH 12/24] powertop: switch to Arjan's git Alexander Kanavin
2020-05-05 13:01 ` [PATCH 13/24] meson: fix upstream version check Alexander Kanavin
2020-05-05 13:01 ` [PATCH 14/24] rpcsvc-proto: update to 1.4.1 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 15/24] vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 16/24] vulkan-loader: " Alexander Kanavin
2020-05-05 13:01 ` [PATCH 17/24] vulkan-tools: " Alexander Kanavin
2020-05-05 13:01 ` Alexander Kanavin [this message]
2020-05-05 13:01 ` [PATCH 19/24] e2fsprogs: update to 1.45.6 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 20/24] build-compare: update to latest revision Alexander Kanavin
2020-05-05 13:01 ` [PATCH 21/24] ovmf: update to 202002 Alexander Kanavin
2020-05-05 13:01 ` [PATCH 22/24] cdrtools-native: fix upstream version check Alexander Kanavin
2020-05-05 13:01 ` [PATCH 23/24] testresults.json: add duration of the tests as well Alexander Kanavin
2020-05-05 13:01 ` [PATCH 24/24] re2c: correct upstream location Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200505130133.24930-18-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox