From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 03/13] webkitgtk: unbreak wayland build
Date: Wed, 19 Feb 2020 20:47:42 +0100 [thread overview]
Message-ID: <20200219194752.7967-3-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com>
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/
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
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 +++++++++++++++
3 files changed, 31 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/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.25.0
next prev parent reply other threads:[~2020-02-19 19:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-19 19:47 ` [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive Alexander Kanavin
2020-02-23 13:02 ` Adrian Bunk
2020-02-23 13:05 ` Alexander Kanavin
2020-02-23 14:38 ` Adrian Bunk
2020-02-19 19:47 ` Alexander Kanavin [this message]
2020-02-19 23:52 ` [PATCH 03/13] webkitgtk: unbreak wayland build Richard Purdie
2020-02-19 19:47 ` [PATCH 04/13] wayland: convert to meson build Alexander Kanavin
2020-02-20 16:21 ` Joshua Watt
2020-02-20 16:38 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines Alexander Kanavin
2020-03-12 20:54 ` Khem Raj
2020-02-19 19:47 ` [PATCH 06/13] qemumips: use std vga instead of cirrus vga Alexander Kanavin
2020-02-19 19:47 ` [PATCH 07/13] createrepo-c: upgrade 0.15.5 -> 0.15.7 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 08/13] epiphany: upgrade 3.34.3.1 -> 3.34.4 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 09/13] libsecret: upgrade 0.20.0 -> 0.20.1 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 10/13] meson: upgrade 0.53.0 -> 0.53.1 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 Alexander Kanavin
2020-02-20 10:26 ` Richard Purdie
2020-02-19 19:47 ` [PATCH 12/13] vala: upgrade 0.46.5 -> 0.46.6 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 13/13] virglrenderer: upgrade 0.8.1 -> 0.8.2 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200219194752.7967-3-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox