webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG
PATCH v3 1/2 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG
Also adjust them to what OptionsGTK currently checks.
Signed-off-by Adrian Bunk <[email protected]>
--- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +3 -3
@@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ "
@@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
Signature · 1 line
2.17.1
PATCH v3 2/2 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements
x11 can be replaced with wayland.
opengl is mandatory only with wayland.
Without x11, use gles2 for opengl.
Signed-off-by Adrian Bunk <[email protected]>
--- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +4 -2
@@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+"
@@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ enchant \ libsecret \ "
Signature · 1 line
2.17.1