From 85431fe5c16ce1aa0916e57e820ff69c5aa0612a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 19 Feb 2020 20:47:42 +0100 Subject: [PATCH] webkitgtk: unbreak wayland build webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ [RP: Add missing maintainers entries] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 ++ meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 901d607f2e..5f1dae9a34 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -397,6 +397,7 @@ RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libwpe = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster " RECIPE_MAINTAINER_pn-libxau = "Armin Kuster " RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster " @@ -711,6 +712,7 @@ RECIPE_MAINTAINER_pn-which = "Anuj Mittal " RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal " RECIPE_MAINTAINER_pn-wireless-regdb = "Adrian Bunk " RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-wpebackend-fdo = "Alexander Kanavin " RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster " RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal " RECIPE_MAINTAINER_pn-xauth = "Armin Kuster " diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000000..346ca9b1d8 --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8db11..585723772e 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +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[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000000..7db5806d9d --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- 2.40.1