Return-Path: Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mail.openembedded.org (Postfix) with ESMTP id 41CD57D8DC for ; Wed, 8 May 2019 10:13:31 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id d12so5948856wrm.8 for ; Wed, 08 May 2019 03:13:32 -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; bh=knzHpoFAM1+ErQcnPvYECD3wdqr8AsYBomTfc03Pffk=; b=e5Gao9r6d1CYgpLEw1zX/QoTt926rl/w38hkz4KNQUmfQEVt58TfTNtJJ0oGBpx20w B0vsotx/YFBfYFi0RCjvkOhPeG/VJjrZBsfIuKaGnj5x3J2swCjwCzcYG5Mq0mKZqoO2 j8ElEJwz1bQltWZkoIKPWyTEiCQ/d8OVksne9C3HLBhN8NISb6W32l5h/y9xj801ym8Q Th91kpUi3D0jtqRjXzUKRLCGBddICrPNcPqIO2k1gign6SQe1pPjkZXCpccVkCvXqDSq lrxSERf5Ar61Y8RylXTdvwOVSOlu/lRG01ieqd/IiU+lUGqfQqqgO/d+iHDDI9NWxwRd XRBA== 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; bh=knzHpoFAM1+ErQcnPvYECD3wdqr8AsYBomTfc03Pffk=; b=tpkfpryl9GUb/vOHnEBHCpOdQIsP624v2ck5A+TFvjEdIfkbYEUP44/wQrNLSPZ8Oh DpKRctQr1RuxqjqWfCI39pnlKc+tn1UZ5oER9D/jhzn2FWEhiD8pEa8AV9lKTvFilH4T oaZMEG0UG1x7xaTWVSxm+qi9K+gVtRWdotV+bL+4NbSsn2uAG9hoi3HQm12i4M45LC9L 4xIrqJUUafq+0Naa63f2oaKhzM9H2X5e5b7PZTqIjceGpJWoMPKZJBw3OizgD2LMm2n3 jk1630j4uuVj2bnuv1/g352aGjTnOX7hZMDxjvHbHJ2An6/Guudmu4subfb/nArGnL36 woow== X-Gm-Message-State: APjAAAVCc0iEeYgpnb/Jpws0vgpt4nSmUb0DN7hsbC9q/YpJLwFjdcIK YKPHKPth4sX0VWjg8jlylg5RqOR6 X-Google-Smtp-Source: APXvYqyLk80sJadib16Hp6Zl23AprKvlQfkOvSw75CHKmQfOYaw+TTwVN5L/LzS0FbiQKSNuZZiiMA== X-Received: by 2002:adf:c788:: with SMTP id l8mr19346805wrg.143.1557310411661; Wed, 08 May 2019 03:13:31 -0700 (PDT) Received: from alexander-box.luxoft.com ([62.96.135.139]) by smtp.gmail.com with ESMTPSA id c20sm19088365wre.28.2019.05.08.03.13.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 03:13:30 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Wed, 8 May 2019 12:13:21 +0200 Message-Id: <20190508101325.51102-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [PATCH 1/5] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 May 2019 10:13:31 -0000 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.3.bb | 2 -- meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb | 2 -- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 14b0764f222..66a0bf2be10 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -836,8 +836,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 bluez5 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 77b6c31536b..2f9e05b1cd4 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 c2628ae0ca0..e875180f6e6 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.3.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb index dd706a96063..66e8b476dcc 100644 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb @@ -14,8 +14,6 @@ UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" inherit meson pkgconfig distro_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, virtual/libx11 virtual/libgl" diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb index 225a0b8b0c9..b1dfb85c49e 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb @@ -18,5 +18,3 @@ inherit autotools pkgconfig distro_features_check BBCLASSEXTEND = "native nativesdk" REQUIRED_DISTRO_FEATURES = "opengl" -REQUIRED_DISTRO_FEATURES_class-native = "" -REQUIRED_DISTRO_FEATURES_class-nativesdk = "" -- 2.17.1