summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2020-02-26 13:51:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-28 23:11:29 +0000
commit20ad8fd118cc9032e7472f0ebbbbe36b637525a3 (patch)
tree138e3a73347c083ff540835be90a261472dfd299
parente7729877399c18b1d73d224e611cc258832902ec (diff)
downloadpoky-20ad8fd118cc9032e7472f0ebbbbe36b637525a3.tar.gz
webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG
Also adjust them to what OptionsGTK currently checks. (From OE-Core rev: 082ccd85589a230810621425ddbf438a03df437e) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.26.4.bb6
1 files changed, 3 insertions, 3 deletions
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"
30 30
31CVE_PRODUCT = "webkitgtk webkitgtk\+" 31CVE_PRODUCT = "webkitgtk webkitgtk\+"
32 32
33DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ 33DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \
34 gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ 34 gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
35 pango icu bison-native gawk intltool-native libwebp \ 35 pango icu bison-native gawk intltool-native libwebp \
36 atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ 36 atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \
37 ruby-native libnotify gstreamer1.0-plugins-bad \ 37 ruby-native libnotify gstreamer1.0-plugins-bad \
38 gettext-native glib-2.0 glib-2.0-native libtasn1 \ 38 gettext-native glib-2.0 glib-2.0-native libtasn1 \
39 " 39 "
@@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
45 " 45 "
46 46
47PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" 47PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
48PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" 48PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt"
49PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" 49PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
50PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" 50PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
51PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" 51PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"