From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web11.4961.1588855625156960971 for ; Thu, 07 May 2020 05:47:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jIiuImru; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id v8so7430132wma.0 for ; Thu, 07 May 2020 05:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IAaTcZkb0FdMrfLPVGCeARIgmdwFm2tx4Yt35FJWoQ0=; b=jIiuImruozOxE0R1VmiApPApOfaye9O7dDXoIbMTSiwcPvYdA/kyh4MTVClwzDOE5K EN33ET7op2mIC3Dma8FrOknpabprdFpiaP8dSzfzI5JWKOhHhn49sBuRXSWSUWboeY3X qAO7QdveTeGPBsN4kJlyBD5iJQVJNlFAa3/30HWpCo+rSYu9JGUwmveP4vlspdyYoME5 H2F5J/C2F/59Ioof1c4h7PjpXjfbrnx2P+XaUXxAHDWTLOAiek7f58WY+6CebYB8v0kF WPjOJlTfAKAzOesODAMoyaH86argJe1Z+7HvOzV2XU7owYPzkbH80NWGN9nW+BKCf9l3 QZVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IAaTcZkb0FdMrfLPVGCeARIgmdwFm2tx4Yt35FJWoQ0=; b=n2dxtbhF8oSK4gogGoh16bD4uziIQ833yADUzoIcux1CdI2vVPZohGALOU2p2zTf4c aKm7j5AvSOdBHAllrssebwa0vppHvc4O9ihbanb+hEk5R89qdlb+anGa94mXDkniqeAz 54Wu3ggcBAclxlhRGMi0e/0p+KVNvCRmqQjlfYqrWyZv09lFMjSYk64n0y84ts3ouI/9 n+wgL4iV3225engMzD7sJpDKmROUvs7roBFQBBiUW8/KvYmGHNVwD9rH3d4kBnEHT8tx GPxOp8lFzJ0liLYT2QzGo25PhIv6pTTgIQ+OPjNKGoXA5XAniUYuUoWJDbgPMTZa38L3 yH8A== X-Gm-Message-State: AGi0PuaAgiLDMvT7IzHTWxKFRMwIHWBBaaIS2IjTYfAWVwkXPJpdW7wR DgVgAbYfiIhVPeTP7XnYgLt9gRB/ X-Google-Smtp-Source: APiQypIDqod0bFFRc3Sjz24Mc/4QvgLVoAcqBAzXPTVBvBJVhdyGo04D9IRlXQkFG0r53BlmpLH2Wg== X-Received: by 2002:a1c:6344:: with SMTP id x65mr10300721wmb.56.1588855623241; Thu, 07 May 2020 05:47:03 -0700 (PDT) Return-Path: Received: from linux-f9zs.box ([5.28.69.65]) by smtp.gmail.com with ESMTPSA id g10sm7507650wrx.4.2020.05.07.05.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2020 05:47:02 -0700 (PDT) From: "Alexander Kanavin" To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target Date: Thu, 7 May 2020 14:46:31 +0200 Message-Id: <20200507124633.19377-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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