[PATCH] vulkan distro flag update

[PATCH] vulkan distro flag update

[Mark Hatle]

I'm not sure if this is right or not, but it resolves the failures I was
getting after updating oe this morning.

I was attempting to run the yocto project compliant script, which runs
bitbake -S none world.  The results of this were an error that vulkan
needed 'mesa-vulkan-drivers'.  Looking at mesa, it was clear that these
are only built in the 'vulkan' distro flag is set.  (and mesa is only
built in the opengl flag is set.)

So I've added these checks to the vulkan recipe, and resolved the check.


Mark Hatle (1):
  vulkan: Only build when 'vulkan' distro flag is set

 meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 2 ++
 meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
1.8.3.1

[PATCH] vulkan: Only build when 'vulkan' distro flag is set

[Mark Hatle]

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.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 2 ++
 meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
index 828ef50..0b89435 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"
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"
 
+REQUIRED_DISTRO_FEATURES = 'vulkan'
+
 inherit cmake distro_features_check
 DEPENDS = "vulkan assimp"
 
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 555d741..1893269 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+)+)"
 
 S = "${WORKDIR}/git"
 
+REQUIRED_DISTRO_FEATURES = "vulkan"
 
 inherit cmake python3native lib_package distro_features_check
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
@@ -32,4 +33,5 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '' ,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"
 
-RRECOMMENDS_${PN} = "mesa-vulkan-drivers"
+# mesa requires opengl
+RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-vulkan-drivers', '', d)}"
-- 
1.8.3.1

Re: [PATCH] vulkan distro flag update

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

On 23 August 2017 at 18:50, Mark Hatle <mark.hatle@windriver.com> wrote:
>
> I'm not sure if this is right or not, but it resolves the failures I was
> getting after updating oe this morning.
>
> I was attempting to run the yocto project compliant script, which runs
> bitbake -S none world.  The results of this were an error that vulkan
> needed 'mesa-vulkan-drivers'.  Looking at mesa, it was clear that these
> are only built in the 'vulkan' distro flag is set.  (and mesa is only
> built in the opengl flag is set.)
>
> So I've added these checks to the vulkan recipe, and resolved the check.


Looks good to me, thanks.

It's possible that mesa could be talked into building just vulkan drivers
(and so could work without opengl feature) but the mesa recipe certainly
doesn't support it right now. I'll have a look at that but for now the
RRECOMMENDS tweak seems reasonable too.

Jussi


>
>
> Mark Hatle (1):
>   vulkan: Only build when 'vulkan' distro flag is set
>
>  meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 2 ++
>  meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb  | 4 +++-
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> --
> 1.8.3.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

[-- Attachment #2: Type: text/html, Size: 1905 bytes --]

Re: [PATCH] vulkan distro flag update

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

On 24 August 2017 at 10:09, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> On 23 August 2017 at 18:50, Mark Hatle <mark.hatle@windriver.com> wrote:
> >
> > I'm not sure if this is right or not, but it resolves the failures I was
> > getting after updating oe this morning.
> >
> > I was attempting to run the yocto project compliant script, which runs
> > bitbake -S none world.  The results of this were an error that vulkan
> > needed 'mesa-vulkan-drivers'.  Looking at mesa, it was clear that these
> > are only built in the 'vulkan' distro flag is set.  (and mesa is only
> > built in the opengl flag is set.)
> >
> > So I've added these checks to the vulkan recipe, and resolved the check.
>
>
> Looks good to me, thanks.
>
> It's possible that mesa could be talked into building just vulkan drivers
> (and so could work without opengl feature) but the mesa recipe certainly
> doesn't support it right now. I'll have a look at that but for now the
> RRECOMMENDS tweak seems reasonable too.
>

For the record mesa can be built without any opengl bits (!) with just a
little build system fixing: I'll send a patch once I've made sure I'm not
breaking any reasonable feature distro combo...

Jussi

[-- Attachment #2: Type: text/html, Size: 1752 bytes --]