libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES

* requires virtual/egl which isn't available without opengl in DISTRO_FEATURES
  as shown in world builds without it:
  ERROR: Nothing PROVIDES 'virtual/egl' (but openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb, openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it)

$ bitbake libwpe
NOTE: Resolving any missing task queue dependencies
ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb DEPENDS on or otherwise requires it). Close matches:
  virtual/kernel
  virtual/make
  virtual/perf
ERROR: Required build target 'libwpe' has no buildable providers.
Missing or unbuildable dependency chain was: ['libwpe', 'virtual/egl']

$ bitbake wpebackend-fdo
NOTE: Resolving any missing task queue dependencies
ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it). Close matches:
  virtual/kernel
  virtual/make
  virtual/perf
ERROR: Required build target 'wpebackend-fdo' has no buildable providers.
Missing or unbuildable dependency chain was: ['wpebackend-fdo', 'virtual/egl']

$ bitbake webkitgtk
ERROR: Nothing PROVIDES 'webkitgtk'
webkitgtk was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
index 346ca9b1d87b46fd3f9420d97ac65bf9216cffe3..12499ff281a4c63f928e3fcc9e3ca7ed140f0429 100644 (file)
--- a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
+++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
@@ -9,7 +9,9 @@ DEPENDS = "virtual/egl libxkbcommon"
 # Workaround build issue with RPi userland EGL libraries.
 CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
 
-inherit cmake
+inherit cmake features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"

diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
index 7db5806d9db41ecf75bddefb647b6c22a25bec7f..cd2f7fabdaff4c36e3ff5ef3203917d7ae4a4f54 100644 (file)
--- a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
+++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
@@ -8,7 +8,9 @@ DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
 
 DEPENDS_append_class-target = " wayland-native"
 
-inherit cmake
+inherit cmake features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"