From da21b51ec84080b5e544b197e7fb49cb91642a31 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 6 Jul 2017 10:54:33 +0300 Subject: vulkan: Upgrade 1.0.39.1 -> 1.0.51.0 Remove a patch that's no longer needed Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- ...se-getenv-if-secure_getenv-does-not-exist.patch | 34 --------------------- meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb | 35 ---------------------- meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb | 34 +++++++++++++++++++++ 3 files changed, 34 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-graphics/vulkan/vulkan/0001-Use-getenv-if-secure_getenv-does-not-exist.patch delete mode 100644 meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb create mode 100644 meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb 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 @@ -From 20525add1df8e1fb13fef90ac068f982def8b958 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Wed, 8 Mar 2017 13:23:58 +0200 -Subject: [PATCH] Use getenv() if secure_getenv() does not exist - -musl does not implement secure version: default to getenv() in that -case. - -https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1538 - -Upstream-Status: Pending -Signed-off-by: Jussi Kukkonen ---- - loader/loader.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/loader/loader.c b/loader/loader.c -index 24758f4..bff79c1 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -54,6 +54,10 @@ - #endif - #endif - -+#if !defined(__secure_getenv) -+#define __secure_getenv getenv -+#endif -+ - struct loader_struct loader = {0}; - // TLS for instance for alloc/free callbacks - THREAD_LOCAL_DECL struct loader_instance *tls_instance; --- -2.1.4 - diff --git a/meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb b/meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb deleted file mode 100644 index 7f0ba21658..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "3D graphics and compute API common loader" -DESCRIPTION = "Vulkan is a new generation graphics and compute API \ -that provides efficient access to modern GPUs. These packages \ -provide only the common vendor-agnostic library loader, headers and \ -the vulkaninfo utility." -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \ - file://loader/loader.c;endline=25;md5=a87cd5442291c23d1fce4eece4cfde9d" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.39 \ - file://demos-Don-t-build-tri-or-cube.patch \ - file://0001-Use-getenv-if-secure_getenv-does-not-exist.patch \ -" -SRCREV = "9c21ed0fb275589c3af6118aec9ef4f1d1544dc1" -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - - -inherit cmake python3native lib_package distro_features_check -ANY_OF_DISTRO_FEATURES = "x11 wayland" - -EXTRA_OECMAKE = "-DBUILD_WSI_MIR_SUPPORT=OFF \ - -DBUILD_LAYERS=OFF \ - -DBUILD_TESTS=OFF" - -# must choose x11 or wayland or both -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '' ,d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '' ,d)}" -PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON -DDEMOS_WSI_SELECTION=XCB, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DDEMOS_WSI_SELECTION=WAYLAND, libxcb libx11 libxrandr" -PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" - diff --git a/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb b/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb new file mode 100644 index 0000000000..fe7dac082d --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "3D graphics and compute API common loader" +DESCRIPTION = "Vulkan is a new generation graphics and compute API \ +that provides efficient access to modern GPUs. These packages \ +provide only the common vendor-agnostic library loader, headers and \ +the vulkaninfo utility." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \ + file://loader/loader.c;endline=25;md5=a87cd5442291c23d1fce4eece4cfde9d" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.51 \ + file://demos-Don-t-build-tri-or-cube.patch \ +" +SRCREV = "8d021e4d5a9f91436f4462df1dafb222908e296d" +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + + +inherit cmake python3native lib_package distro_features_check +ANY_OF_DISTRO_FEATURES = "x11 wayland" + +EXTRA_OECMAKE = "-DBUILD_WSI_MIR_SUPPORT=OFF \ + -DBUILD_LAYERS=OFF \ + -DBUILD_TESTS=OFF" + +# must choose x11 or wayland or both +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '' ,d)}" +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON -DDEMOS_WSI_SELECTION=XCB, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DDEMOS_WSI_SELECTION=WAYLAND, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + -- cgit 1.2.3-korg