From dceae2dc3e74f5e043c5564673f1bd603b391fd5 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 16 Dec 2021 17:06:32 +0100 Subject: [PATCH] hardknott: webkit: remove our recipes We initially added newer versions of the recipes related to WPE Webkit in order to incorporate performance improvements, but the hardknott branch of meta-webkit includes even newer versions, so we can remove our recipes. Reflect this change in our distro config file. Signed-off-by: Gabriel Valcazar --- meta-digi-dey/conf/distro/dey.conf | 6 ------ .../webkit/recipes-browser/cog/cog_0.9.90.bb | 10 ---------- .../webkit/recipes-browser/libwpe/libwpe_1.10.0.bb | 8 -------- .../wpebackend-fdo/wpebackend-fdo_1.9.92.bb | 7 ------- .../recipes-browser/wpewebkit/wpewebkit_2.32.1.bb | 11 ----------- 5 files changed, 42 deletions(-) delete mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb delete mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb delete mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb delete mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index f2929a125..7b94c485f 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -65,12 +65,6 @@ PREFERRED_VERSION_libsoc = "git" # recipe in case there are NXP-specific changes in it PREFERRED_PROVIDER_opencl-headers ?= "imx-gpu-viv" -# Use the latest versions of the WebKit recipes -PREFERRED_VERSION_cog = "0.9.90" -PREFERRED_VERSION_libwpe = "1.10.0" -PREFERRED_VERSION_wpebackend-fdo = "1.9.92" -PREFERRED_VERSION_wpewebkit = "2.32.1" - # Use the FDO backend for WPE WebKit PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-fdo" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb deleted file mode 100644 index 4bef62e4a..000000000 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-browser/cog/cog.inc -require conf/include/devupstream.inc - -SRC_URI = "https://wpewebkit.org/releases/${P}.tar.xz" -SRC_URI[sha256sum] = "933adc74e7b2b7f879a0159b073aa601d58865621891c443d1c2481f9eee6c97" - -SRC_URI_class-devupstream = "git://github.com/Igalia/cog.git;protocol=https;branch=cog-0.10" -SRCREV_class-devupstream = "1e422e5055f72e9914341ce9535aaf375b821946" - -DEPENDS += "wpewebkit (>= 2.30) wpebackend-fdo (>= 1.8)" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb deleted file mode 100644 index 54d2068ae..000000000 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require recipes-browser/libwpe/libwpe.inc -require conf/include/devupstream.inc - -SRC_URI = "https://wpewebkit.org/releases//${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d" - -SRC_URI_class-devupstream = "git://github.com/WebPlatformForEmbedded/libwpe.git;protocol=https;branch=libwpe-1.10" -SRCREV_class-devupstream = "55877263583716303a893945418ec23cffdfcbbf" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb deleted file mode 100644 index b591e4923..000000000 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes-browser/wpebackend-fdo/wpebackend-fdo.inc -inherit meson - -SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5c2f7fab6623e0964bc0d1b4a01719f0" -SRC_URI[sha1sum] = "d07fdfec0df53c57e3ed36a1efffecf30d1b418c" -SRC_URI[sha256sum] = "fc5b388a91d6f2c22803e1a21a6759a314b4539e5169c6e272bfc953a05fbb85" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb deleted file mode 100644 index 466da5744..000000000 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require recipes-browser/wpewebkit/wpewebkit.inc - -SRC_URI = "https://wpewebkit.org/releases/${P}.tar.xz" -SRC_URI[md5sum] = "1dd3f56b8eba16266166d757acb979fc" -SRC_URI[sha1sum] = "c5b3a48d886375a6982dd2dc5c9cc2f92f5a9690" -SRC_URI[sha256sum] = "7b6b39a12ccf3f84da4cc6ac59e02fbe328f7476eaeb9c23de9b9288c2c2f39c" - -DEPENDS += "libwpe" -RCONFLICTS_${PN} = "libwpe (< 1.8) wpebackend-fdo (< 1.8)" - -LIC_FILES_CHKSUM = "file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 "