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 = " \ | |||
38 | atk \ | 38 | atk \ |
39 | libwebp \ | 39 | libwebp \ |
40 | gtk+3 \ | 40 | gtk+3 \ |
41 | libsoup \ | ||
42 | libxslt \ | 41 | libxslt \ |
43 | libtasn1 \ | 42 | libtasn1 \ |
44 | libnotify \ | 43 | libnotify \ |
@@ -46,12 +45,14 @@ DEPENDS = " \ | |||
46 | gstreamer1.0-plugins-base \ | 45 | gstreamer1.0-plugins-base \ |
47 | " | 46 | " |
48 | 47 | ||
48 | PACKAGECONFIG_SOUP ?= "soup2" | ||
49 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ | 49 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ |
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ | 50 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ |
51 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ |
52 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ | 52 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ |
53 | enchant \ | 53 | enchant \ |
54 | libsecret \ | 54 | libsecret \ |
55 | ${PACKAGECONFIG_SOUP} \ | ||
55 | " | 56 | " |
56 | 57 | ||
57 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" | 58 | 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" | |||
70 | PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" | 71 | PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" |
71 | PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," | 72 | PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," |
72 | PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" | 73 | PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" |
74 | PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" | ||
75 | PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" | ||
73 | 76 | ||
74 | # webkitgtk is full of /usr/bin/env python, particular for generating docs | 77 | # webkitgtk is full of /usr/bin/env python, particular for generating docs |
75 | do_configure[postfuncs] += "setup_python_link" | 78 | do_configure[postfuncs] += "setup_python_link" |
@@ -124,7 +127,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " | |||
124 | SECURITY_CFLAGS:remove:aarch64 = "-fpie" | 127 | SECURITY_CFLAGS:remove:aarch64 = "-fpie" |
125 | SECURITY_CFLAGS:append:aarch64 = " -fPIE" | 128 | SECURITY_CFLAGS:append:aarch64 = " -fPIE" |
126 | 129 | ||
127 | FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so" | 130 | FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" |
128 | 131 | ||
129 | RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" | 132 | RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" |
130 | 133 | ||