<div><div dir="auto"><br></div></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Sep 6, 2019 at 4:18 AM Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This will allow better control over native virgl/qemu configurations.<br>
<br>
Adjust gtk+3/cairo native configurations to actually ignore opengl<br>
when building for -native: we do not need it, and it would cause build<br>
failures as only a limited subset of mesa-native is currently built.<br>
<br>
Drop native/nativesdk overrides from virglrenderer/libepoxy recipes<br>
as opengl feature is now correctly set for those variants.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
---<br>
meta/conf/bitbake.conf | 4 ++--<br>
meta/recipes-gnome/gtk+/gtk+3.inc | 2 ++<br>
meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a> | 2 ++<br>
meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.3.bb" rel="noreferrer" target="_blank">libepoxy_1.5.3.bb</a> | 2 --<br>
meta/recipes-graphics/virglrenderer/<a href="http://virglrenderer_0.8.0.bb" rel="noreferrer" target="_blank">virglrenderer_0.8.0.bb</a> | 2 --<br>
5 files changed, 6 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf<br>
index a0a7f4911e0..d36f4c6ccef 100644<br>
--- a/meta/conf/bitbake.conf<br>
+++ b/meta/conf/bitbake.conf<br>
@@ -824,8 +824,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"<br>
<br>
# Normally target distro features will not be applied to native builds:<br>
# Native distro features on this list will use the target feature value<br>
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"<br>
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"<br>
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"<br>
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"<br>
<br>
DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"<br>
MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"<br>
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc<br>
index 77b6c31536b..2f9e05b1cd4 100644<br>
--- a/meta/recipes-gnome/gtk+/gtk+3.inc<br>
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc<br>
@@ -47,6 +47,8 @@ do_compile_prepend() {<br>
<br>
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \<br>
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}"<br>
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"<br>
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"<br>
</blockquote><div dir="auto"><br></div><div dir="auto">Should we extend distro features to non target recipes as well I wonder since I might have a development system which has full x11 and capable of running GTK with X11 but target maybe not will</div><div dir="auto">So is distro feature in someway related in these</div><div dir="auto">Different classes of recipes ?</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"<br>
# this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build<br>
diff --git a/meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a> b/meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a><br>
index f32e9ba1bcd..84c7b0adde9 100644<br>
--- a/meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a><br>
+++ b/meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a><br>
@@ -41,6 +41,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"<br>
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \<br>
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \<br>
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"<br>
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"<br>
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"<br>
<br>
PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"<br>
PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"<br>
diff --git a/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.3.bb" rel="noreferrer" target="_blank">libepoxy_1.5.3.bb</a> b/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.3.bb" rel="noreferrer" target="_blank">libepoxy_1.5.3.bb</a><br>
index c8d1650c637..5d7639a929e 100644<br>
--- a/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.3.bb" rel="noreferrer" target="_blank">libepoxy_1.5.3.bb</a><br>
+++ b/meta/recipes-graphics/libepoxy/<a href="http://libepoxy_1.5.3.bb" rel="noreferrer" target="_blank">libepoxy_1.5.3.bb</a><br>
@@ -14,8 +14,6 @@ UPSTREAM_CHECK_URI = "<a href="https://github.com/anholt/libepoxy/releases" rel="noreferrer" target="_blank">https://github.com/anholt/libepoxy/releases</a>"<br>
inherit meson pkgconfig distro_features_check<br>
<br>
REQUIRED_DISTRO_FEATURES = "opengl"<br>
-REQUIRED_DISTRO_FEATURES_class-native = ""<br>
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""<br>
<br>
PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"<br>
PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"<br>
diff --git a/meta/recipes-graphics/virglrenderer/<a href="http://virglrenderer_0.8.0.bb" rel="noreferrer" target="_blank">virglrenderer_0.8.0.bb</a> b/meta/recipes-graphics/virglrenderer/<a href="http://virglrenderer_0.8.0.bb" rel="noreferrer" target="_blank">virglrenderer_0.8.0.bb</a><br>
index d2b11c103a3..65365eb900a 100644<br>
--- a/meta/recipes-graphics/virglrenderer/<a href="http://virglrenderer_0.8.0.bb" rel="noreferrer" target="_blank">virglrenderer_0.8.0.bb</a><br>
+++ b/meta/recipes-graphics/virglrenderer/<a href="http://virglrenderer_0.8.0.bb" rel="noreferrer" target="_blank">virglrenderer_0.8.0.bb</a><br>
@@ -17,5 +17,3 @@ inherit autotools pkgconfig distro_features_check<br>
BBCLASSEXTEND = "native nativesdk"<br>
<br>
REQUIRED_DISTRO_FEATURES = "opengl"<br>
-REQUIRED_DISTRO_FEATURES_class-native = ""<br>
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""<br>
-- <br>
2.17.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>