diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-07-06 10:54:33 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-08 13:34:46 +0100 |
commit | d18c4344875f005f526993e2ae98c4c8d33ac163 (patch) | |
tree | a107a67d1ccd4cbbceebfa722daf5de5111df9b4 | |
parent | 0224083dae22a0bd43f0c17626fe7f98ba9d3842 (diff) | |
download | poky-d18c4344875f005f526993e2ae98c4c8d33ac163.tar.gz |
vulkan: Upgrade 1.0.39.1 -> 1.0.51.0
Remove a patch that's no longer needed
(From OE-Core rev: da21b51ec84080b5e544b197e7fb49cb91642a31)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan/0001-Use-getenv-if-secure_getenv-does-not-exist.patch | 34 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb) | 5 |
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan/0001-Use-getenv-if-secure_getenv-does-not-exist.patch b/meta/recipes-graphics/vulkan/vulkan/0001-Use-getenv-if-secure_getenv-does-not-exist.patch deleted file mode 100644 index 694922cd1c..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan/0001-Use-getenv-if-secure_getenv-does-not-exist.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 20525add1df8e1fb13fef90ac068f982def8b958 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Wed, 8 Mar 2017 13:23:58 +0200 | ||
4 | Subject: [PATCH] Use getenv() if secure_getenv() does not exist | ||
5 | |||
6 | musl does not implement secure version: default to getenv() in that | ||
7 | case. | ||
8 | |||
9 | https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1538 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
13 | --- | ||
14 | loader/loader.c | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/loader/loader.c b/loader/loader.c | ||
18 | index 24758f4..bff79c1 100644 | ||
19 | --- a/loader/loader.c | ||
20 | +++ b/loader/loader.c | ||
21 | @@ -54,6 +54,10 @@ | ||
22 | #endif | ||
23 | #endif | ||
24 | |||
25 | +#if !defined(__secure_getenv) | ||
26 | +#define __secure_getenv getenv | ||
27 | +#endif | ||
28 | + | ||
29 | struct loader_struct loader = {0}; | ||
30 | // TLS for instance for alloc/free callbacks | ||
31 | THREAD_LOCAL_DECL struct loader_instance *tls_instance; | ||
32 | -- | ||
33 | 2.1.4 | ||
34 | |||
diff --git a/meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb b/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb index 7f0ba21658..fe7dac082d 100644 --- a/meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb +++ b/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb | |||
@@ -10,11 +10,10 @@ SECTION = "libs" | |||
10 | LICENSE = "Apache-2.0" | 10 | LICENSE = "Apache-2.0" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \ | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \ |
12 | file://loader/loader.c;endline=25;md5=a87cd5442291c23d1fce4eece4cfde9d" | 12 | file://loader/loader.c;endline=25;md5=a87cd5442291c23d1fce4eece4cfde9d" |
13 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.39 \ | 13 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.51 \ |
14 | file://demos-Don-t-build-tri-or-cube.patch \ | 14 | file://demos-Don-t-build-tri-or-cube.patch \ |
15 | file://0001-Use-getenv-if-secure_getenv-does-not-exist.patch \ | ||
16 | " | 15 | " |
17 | SRCREV = "9c21ed0fb275589c3af6118aec9ef4f1d1544dc1" | 16 | SRCREV = "8d021e4d5a9f91436f4462df1dafb222908e296d" |
18 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
19 | 18 | ||
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |