From 082ccd85589a230810621425ddbf438a03df437e Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 26 Feb 2020 13:51:36 +0200 Subject: webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG Also adjust them to what OptionsGTK currently checks. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 7bffc15e8f..cc69653fb5 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -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" -- cgit 1.2.3-korg