Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/10] webkitgtk: unbreak wayland build
Date: Sun, 16 Feb 2020 16:50:12 +0100	[thread overview]
Message-ID: <20200216155015.21738-8-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com>

webkit nowadays requires a couple of supplementary libraries for this,
so bring them in (courtesy of meta-browser, which will hopefully
adjust without a lot of trouble).

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb    | 19 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb  |  2 +-
 .../webkit/wpebackend-fdo_1.4.1.bb            | 19 +++++++++++++++++++
 3 files changed, 39 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..b9c71f9dc5
--- /dev/null
+++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
@@ -0,0 +1,19 @@
+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[md5sum] = "1d4d38413ee0d0043f74d0445cab906f"
+SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"
+SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060"
+SRC_URI[sha384sum] = "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0"
+SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
index 4aa8533b42..8d87ad49a3 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..84df0c2535
--- /dev/null
+++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
@@ -0,0 +1,19 @@
+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[md5sum] = "c6362491a4a38ddac42b66f140e1cff2"
+SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"
+SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c"
+SRC_URI[sha384sum] = "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d"
+SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4"
+
-- 
2.25.0



  parent reply	other threads:[~2020-02-16 15:51 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-16 15:50 [PATCH 01/10] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-16 15:50 ` [PATCH 02/10] procps: upstream has switched to gitlab Alexander Kanavin
2020-02-16 16:53   ` Khem Raj
2020-02-16 16:56     ` Alexander Kanavin
2020-02-16 20:06       ` Khem Raj
2020-02-16 20:45         ` Alexander Kanavin
2020-02-17  2:35           ` Khem Raj
2020-02-17  8:12             ` Alexander Kanavin
2020-02-17 18:39               ` Khem Raj
2020-02-16 15:50 ` [PATCH 03/10] qemux86: do not add vga=0 to kernel parameters Alexander Kanavin
2020-02-16 15:50 ` [PATCH 04/10] qemux86: drop resolution setting via uvesafb Alexander Kanavin
2020-02-16 16:01   ` Martin Jansa
2020-02-16 16:10     ` Alexander Kanavin
2020-02-16 16:15       ` Alexander Kanavin
2020-02-16 15:50 ` [PATCH 05/10] weston-init: use the drm backend rather than fbdev one Alexander Kanavin
2020-02-16 17:00   ` Khem Raj
2020-02-16 17:07     ` Alexander Kanavin
2020-02-16 20:09       ` Khem Raj
2020-02-16 21:03         ` Alexander Kanavin
2020-02-17  2:30           ` Khem Raj
2020-02-17  8:22             ` Alexander Kanavin
2020-02-17 13:16               ` Alexander Kanavin
2020-02-17 18:44                 ` Khem Raj
2020-02-17 19:29                   ` Alexander Kanavin
2020-02-18  1:56                     ` Khem Raj
2020-02-19  9:45                       ` Alexander Kanavin
2020-02-19 17:20                         ` Khem Raj
2020-02-19 18:06                           ` Alexander Kanavin
2020-02-19 18:37                             ` Khem Raj
2020-02-16 15:50 ` [PATCH 06/10] webkitgtk: x11 and wayland are not mutually exclusive Alexander Kanavin
2020-02-16 15:50 ` [PATCH 07/10] weston: add a basic runtime test Alexander Kanavin
2020-02-16 15:50 ` Alexander Kanavin [this message]
2020-02-16 16:09   ` [PATCH 08/10] webkitgtk: unbreak wayland build Martin Jansa
2020-02-16 16:14     ` Alexander Kanavin
2020-02-16 18:06       ` Richard Purdie
2020-02-16 20:14   ` Khem Raj
2020-02-16 20:51     ` Alexander Kanavin
2020-02-23 14:33       ` Joshua Watt
2020-02-27 15:49         ` [wpe-webkit] " Carlos Alberto Lopez Perez
2020-02-27 16:04           ` Joshua Watt
2020-02-16 15:50 ` [PATCH 09/10] wayland: convert to meson build Alexander Kanavin
2020-02-17 14:35   ` Richard Purdie
2020-02-17 14:50     ` Alexander Kanavin
2020-02-17 14:52       ` Richard Purdie
2020-02-17 14:53       ` Alexander Kanavin
2020-02-16 15:50 ` [PATCH 10/10] ptest-packagelists: mention ifupdown ptest in a comment 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=20200216155015.21738-8-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