summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-08-23 10:50:16 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-24 13:48:10 +0100
commit11eba8cd8a39bf7f71f296b62ff07da08b9747ae (patch)
tree1e0ef63baf8e91429a2a7e60db78095573245b6c
parent46e7a2d00649c440ad9007379b601acd9f2a9f74 (diff)
downloadpoky-11eba8cd8a39bf7f71f296b62ff07da08b9747ae.tar.gz
vulkan: Only build when 'vulkan' distro flag is set
Only build with the vulkan distro flag is set. (References to this flag were found in the mesa recipe.) In addition, only set the RRECOMEMND to mesa, if 'opengl' flag is set. Mesa required opengl distro flag to build. (From OE-Core rev: 152b59e07aed76de158d553178a2710330bc4cc1) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-demos_git.bb2
-rw-r--r--meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb4
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
index 828ef501a7..0b8943508b 100644
--- a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
@@ -15,6 +15,8 @@ SRCREV = "18df00c7b4677b0889486e16977857aa987947e2"
15UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" 15UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18REQUIRED_DISTRO_FEATURES = 'vulkan'
19
18inherit cmake distro_features_check 20inherit cmake distro_features_check
19DEPENDS = "vulkan assimp" 21DEPENDS = "vulkan assimp"
20 22
diff --git a/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb b/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb
index 555d741273..1893269fcb 100644
--- a/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb
@@ -18,6 +18,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20
21REQUIRED_DISTRO_FEATURES = "vulkan"
21 22
22inherit cmake python3native lib_package distro_features_check 23inherit cmake python3native lib_package distro_features_check
23ANY_OF_DISTRO_FEATURES = "x11 wayland" 24ANY_OF_DISTRO_FEATURES = "x11 wayland"
@@ -32,4 +33,5 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '' ,d)}
32PACKAGECONFIG[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" 33PACKAGECONFIG[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"
33PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" 34PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
34 35
35RRECOMMENDS_${PN} = "mesa-vulkan-drivers" 36# mesa requires opengl
37RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-vulkan-drivers', '', d)}"