[OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
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 --- 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 bdade79abe..f7700f1191 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -833,8 +833,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 0782c6ce35..6646ef79fe 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.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138556): https://lists.openembedded.org/g/openembedded-core/message/138556 Mute This Topic: https://lists.openembedded.org/mt/74380012/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
On Tue, 12 May 2020 at 17:20, Khem Raj wrote: > DISTRO_FEATURES are meant for target most of the time so this seems not > the right way to go about it. perhaps HOST_DISTRO_FEATURES or some such > would be the way to go, since it should not be enforced on folks who do > not want it and dont use qemu as machine but just as a veneer to cross > build stuff. > If someone isn't using qemu-system-native recipe (the full system emulators), then qemu-system-native isn't built at all, and so they're entirely unaffected, no? All the native opengl stuff is pulled in by only that recipe. Otherwise, it's easy to disable: set DISTRO_FEATURES_FILTER_NATIVE to "". Alex > > > Signed-off-by: Alexander Kanavin > > --- > > 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 bdade79abe..f7700f1191 100644 > > --- a/meta/conf/bitbake.conf > > +++ b/meta/conf/bitbake.conf > > @@ -833,8 +833,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 0782c6ce35..6646ef79fe 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" > >
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
On 5/12/20 8:11 AM, Alexander Kanavin 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. DISTRO_FEATURES are meant for target most of the time so this seems not the right way to go about it. perhaps HOST_DISTRO_FEATURES or some such would be the way to go, since it should not be enforced on folks who do not want it and dont use qemu as machine but just as a veneer to cross build stuff. Signed-off-by: Alexander Kanavin --- 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 bdade79abe..f7700f1191 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -833,8 +833,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 0782c6ce35..6646ef79fe 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 = "" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online
[OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
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 --- 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 bdade79abe..f7700f1191 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -833,8 +833,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 0782c6ce35..6646ef79fe 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 (#138176): https://lists.openembedded.org/g/openembedded-core/message/138176 Mute This Topic: https://lists.openembedded.org/mt/74160489/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
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 --- 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 0782c6ce35..6646ef79fe 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 (#138016): https://lists.openembedded.org/g/openembedded-core/message/138016 Mute This Topic: https://lists.openembedded.org/mt/74049262/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
On Tue, 28 Apr 2020 at 21:28, Alexander Kanavin via lists.openembedded.org wrote: > On Tue, 28 Apr 2020 at 10:52, Alexander Kanavin > wrote: > >> Good point. I will rework the patches to use 'virgl' DISTRO_FEATURE >> instead. Making it machine specific isn't feasible, because the recipes >> affected are all native ones. >> > > Actually, on second thought, a separate DISTRO_FEATURE is not needed. What > I'm going to do is uncouple the native 'opengl' DISTRO_FEATURE from the > target one, so that either can be set independently of the other. > And on third thought, even that is not needed. Just set DISTRO_FEATURES_FILTER_NATIVE to not include 'opengl' (the default assignment in bitbake.conf is weak) and this won't be enabled for native. Note that even if this is enabled, no opengl support from the build host is needed, and only a few additional bits are built. To use them you need to pass non-default options to runqemu (but in that case, the host has to have some kind of GL stack). So I'd say the patchset is fine. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137582): https://lists.openembedded.org/g/openembedded-core/message/137582 Mute This Topic: https://lists.openembedded.org/mt/73268609/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
On Tue, 28 Apr 2020 at 10:52, Alexander Kanavin wrote: > Good point. I will rework the patches to use 'virgl' DISTRO_FEATURE > instead. Making it machine specific isn't feasible, because the recipes > affected are all native ones. > Actually, on second thought, a separate DISTRO_FEATURE is not needed. What I'm going to do is uncouple the native 'opengl' DISTRO_FEATURE from the target one, so that either can be set independently of the other. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137581): https://lists.openembedded.org/g/openembedded-core/message/137581 Mute This Topic: https://lists.openembedded.org/mt/73268609/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
ERROR: The file /usr/lib/libEGL.so is installed by both mesa-native and mali-450-native, aborting This one is on the meta-odroid/recipes-graphics/mali/mali-450_r7p0.bb I'm afraid. mali-450 contains a prebuilt binary for ARM, and so shouldn't even be available in -native (or in qemu target, for that matter, as qemu will likely never emulate that GPU). Alex On Tue, 28 Apr 2020 at 03:03, Khem Raj wrote: > 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 > 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 > > --- > > 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 >
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
On Tue, 28 Apr 2020 at 03:19, Khem Raj wrote: > This change will indicate that a distro that enables openGL for target > needs to have a build machine also with OpenGL support, > this does not sound right to me, If you want to have openGL support on > build host for some testing bits then lets deal with that separately > by > adding a new feature to control it and perhaps it should be machine > specific since I dont see any use of it besides qemu machines. > Good point. I will rework the patches to use 'virgl' DISTRO_FEATURE instead. Making it machine specific isn't feasible, because the recipes affected are all native ones. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137561): https://lists.openembedded.org/g/openembedded-core/message/137561 Mute This Topic: https://lists.openembedded.org/mt/73268609/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
On Sat, Apr 25, 2020 at 12:00 PM Alexander Kanavin 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 > --- > 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" > This change will indicate that a distro that enables openGL for target needs to have a build machine also with OpenGL support, this does not sound right to me, If you want to have openGL support on build host for some testing bits then lets deal with that separately by adding a new feature to control it and perhaps it should be machine specific since I dont see any use of it besides qemu machines. > 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
Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
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 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 > --- > 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.
[OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
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 --- 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 (#137482): https://lists.openembedded.org/g/openembedded-core/message/137482 Mute This Topic: https://lists.openembedded.org/mt/73268609/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
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 --- 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.1.bb | 2 -- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2da7c5849a9..15485ae88b2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -825,8 +825,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 e1f1e0db314..e525a471efa 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -47,6 +47,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 e3de3f6164a..dcca6c1a311 100644 --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb @@ -41,6 +41,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" 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)}" +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 af9867407ed..1aa850d0043 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.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb index 133618844a9..deaac5e965c 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.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.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core