summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2021-12-10 09:37:41 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-12 11:27:23 +0000
commit86da64c970316adf31c6382cf2b025fbdfea75cd (patch)
tree72eb3c93ac725d38871768aa15280036f8503e69 /meta/recipes-sato
parent2779257266674657e24243f876b82b775286dea6 (diff)
downloadpoky-86da64c970316adf31c6382cf2b025fbdfea75cd.tar.gz
webkitgtk: Add packageconfig for libsoup2
Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3. Including libsoup2 and libsoup3 in the same process can cause strange runtime failures, and the latest release of each major version will cause the process to exit if both are detected on startup. The default is changed from libsoup3 back to libsoup2. Most GNOME packages are still using libsoup2, and a large number of these pull in webkitgtk either directly or indirectly. If webkitgtk uses libsoup3, this causes all of these packages to fail at startup. It appears that most GNOME packages will have to switch to libsoup3 when they transition to GTK4. (From OE-Core rev: deedca6bee5c90e35a7814b04bc5de03de9f9b1d) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.34.2.bb7
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
48PACKAGECONFIG_SOUP ?= "soup2"
49PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ 49PACKAGECONFIG ??= "${@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
57PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" 58PACKAGECONFIG[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"
70PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" 71PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
71PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," 72PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
72PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" 73PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
74PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3"
75PACKAGECONFIG[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
75do_configure[postfuncs] += "setup_python_link" 78do_configure[postfuncs] += "setup_python_link"
@@ -124,7 +127,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
124SECURITY_CFLAGS:remove:aarch64 = "-fpie" 127SECURITY_CFLAGS:remove:aarch64 = "-fpie"
125SECURITY_CFLAGS:append:aarch64 = " -fPIE" 128SECURITY_CFLAGS:append:aarch64 = " -fPIE"
126 129
127FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so" 130FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"
128 131
129RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" 132RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
130 133