diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk_2.34.2.bb')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb index 413e0cdf92..a9b151e3c3 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb @@ -38,7 +38,6 @@ DEPENDS = " \ atk \ libwebp \ gtk+3 \ - libsoup \ libxslt \ libtasn1 \ libnotify \ @@ -46,12 +45,14 @@ DEPENDS = " \ gstreamer1.0-plugins-base \ " +PACKAGECONFIG_SOUP ?= "soup2" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ enchant \ libsecret \ + ${PACKAGECONFIG_SOUP} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" @@ -70,6 +71,8 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link" @@ -124,7 +127,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " SECURITY_CFLAGS:remove:aarch64 = "-fpie" SECURITY_CFLAGS:append:aarch64 = " -fPIE" -FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so" +FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" |