This causes https://errors.yoctoproject.org/Errors/Details/409117/ https://errors.yoctoproject.org/Errors/Details/409060/
for most of qemu machines. On Sat, Apr 25, 2020 at 12:00 PM Alexander Kanavin <[email protected]> wrote: > > This will allow better control over native virgl/qemu configurations. > > Adjust gtk+3/cairo native configurations to actually ignore opengl > when building for -native: we do not need it, and it would cause build > failures as only a limited subset of mesa-native is currently built. > > Drop native/nativesdk overrides from virglrenderer/libepoxy recipes > as opengl feature is now correctly set for those variants. > > Signed-off-by: Alexander Kanavin <[email protected]> > --- > meta/conf/bitbake.conf | 4 ++-- > meta/recipes-gnome/gtk+/gtk+3.inc | 2 ++ > meta/recipes-graphics/cairo/cairo_1.16.0.bb | 2 ++ > meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb | 2 -- > meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb | 2 -- > 5 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 4b544a22cd..6f3536eff4 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -829,8 +829,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11" > > # Normally target distro features will not be applied to native builds: > # Native distro features on this list will use the target feature value > -DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation" > -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation" > +DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl" > +DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl" > > DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data > ldconfig" > MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc > b/meta/recipes-gnome/gtk+/gtk+3.inc > index 5d1f59ea1a..6154154004 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3.inc > +++ b/meta/recipes-gnome/gtk+/gtk+3.inc > @@ -46,6 +46,8 @@ do_compile_prepend() { > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland > x11', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', > 'glx', '', d)}" > +PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', > d)}" > +PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', > 'x11', d)}" > > PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk > fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender > libxcomposite libxfixes" > # this is provided by oe-core patch that removes epoxy/gl dependency from a > X11 build > diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > index b772c2ece2..092c77b826 100644 > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > @@ -42,6 +42,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', > 'directfb', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', > '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'opengl', '', d)} \ > trace" > +PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', > 'x11 xcb', '', d)}" > +PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', > 'x11', 'x11 xcb', '', d)}" > > PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no > --disable-xlib,${X11DEPENDS}" > PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" > diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb > b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb > index af9867407e..1aa850d004 100644 > --- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb > +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb > @@ -19,8 +19,6 @@ UPSTREAM_CHECK_URI = > "https://github.com/anholt/libepoxy/releases"; > inherit meson pkgconfig features_check > > REQUIRED_DISTRO_FEATURES = "opengl" > -REQUIRED_DISTRO_FEATURES_class-native = "" > -REQUIRED_DISTRO_FEATURES_class-nativesdk = "" > > PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" > PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no -Dx11=false, virtual/libx11 > virtual/libgl" > diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb > b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb > index 1046b8504f..29b12628d0 100644 > --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb > +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb > @@ -22,5 +22,3 @@ inherit meson pkgconfig features_check > BBCLASSEXTEND = "native nativesdk" > > REQUIRED_DISTRO_FEATURES = "opengl" > -REQUIRED_DISTRO_FEATURES_class-native = "" > -REQUIRED_DISTRO_FEATURES_class-nativesdk = "" > -- > 2.26.1 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137547): https://lists.openembedded.org/g/openembedded-core/message/137547 Mute This Topic: https://lists.openembedded.org/mt/73268609/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
