Update WPE WebKit to 2.24.x
cover Update WPE WebKit to 2.24.x
Hello everybody,
This is combined patch set which makes it possible to use WPE WebKit 2.24.x with Buildroot, including updates to the dependencies and the Cog browser to make sure compatible releases[1][2] are used.
I am also sneaking in the patch series an update to libepoxy which I had submitted a while ago[3] and which has not been merged yet. While it is not strictly needed, this brings in a fix for drivers which have support for OpenGL ES 3.x
Best reagrds,
?Adrian
---
[1] https://wpewebkit.org/release/schedule/#compatible-components
[2] https://github.com/Igalia/cog/releases/tag/v0.3.0
[3] https://patchwork.ozlabs.org/patch/981531/
Adrian Perez de Castro (5):
package/libwpe: bump to version 1.2.0 package/wpebackend-fdo: bump to version 1.2.0 package/libepoxy: update to version 1.5.3, convert to Meson package/wpewebkit: bump to version 2.24.1 package/cog: bump version to 0.3.0
package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- package/libepoxy/libepoxy.hash | 4 ++-- package/libepoxy/libepoxy.mk | 13 +++++++------ package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- package/wpewebkit/Config.in | 17 +---------------- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 10 ++-------- 11 files changed, 28 insertions(+), 48 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/5 package/libwpe: bump to version 1.2.0
WPE WebKit 2.24.x requires libwpe 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
--- package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
package/libwpe/libwpe.hash +4 -4
@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.0.0.tar.xz.sums -md5 b5ea32bd644811d5c6433cf1439763f7 libwpe-1.0.0.tar.xz -sha1 6e51591c00a9a6128e19920807e6874794c723fd libwpe-1.0.0.tar.xz -sha256 aff11612123f9ab85a8b9a4bcdfb3a7503eba0a0d2d96f2cdecd30e911091719 libwpe-1.0.0.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.2.0.tar.xz.sums +md5 060876c6a32ef1ae519cb9542d0ede06 libwpe-1.2.0.tar.xz +sha1 5dd34eba8cc7625d2b1c679c509492941092d137 libwpe-1.2.0.tar.xz +sha256 f28035e7a8991fbb1a0e762f1b3d0e3cb57513a3164c75c7dc3eb0c11d9149fc libwpe-1.2.0.tar.xz # Hashes for license files: sha256 6efc9991641b47b1f4e727db7f090d0ade00117dcbbc74be622f2baceddb1f22 COPYING
package/libwpe/libwpe.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.0.0 +LIBWPE_VERSION = 1.2.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES
Signature · 1 line
2.21.0
PATCH 1/5 package/libwpe: bump to version 1.2.0
Le mar. 14 mai 2019 ? 14:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 6 lines
WPE WebKit 2.24.x requires libwpe 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
Signed-off-by Adrian Perez de Castro <[email protected]>
---
Quoted 36 lines
package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)package/libwpe/libwpe.hash +0
-4@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.0.0.tar.xz.sums -md5 b5ea32bd644811d5c6433cf1439763f7 libwpe-1.0.0.tar.xz -sha1 6e51591c00a9a6128e19920807e6874794c723fd libwpe-1.0.0.tar.xz -sha256 aff11612123f9ab85a8b9a4bcdfb3a7503eba0a0d2d96f2cdecd30e911091719libwpe-1.0.0.tar.xz
package/libwpe/libwpe.hash +4
-0+# From https://wpewebkit.org/releases/libwpe-1.2.0.tar.xz.sums +md5 060876c6a32ef1ae519cb9542d0ede06 libwpe-1.2.0.tar.xz +sha1 5dd34eba8cc7625d2b1c679c509492941092d137 libwpe-1.2.0.tar.xz +sha256 f28035e7a8991fbb1a0e762f1b3d0e3cb57513a3164c75c7dc3eb0c11d9149fclibwpe-1.2.0.tar.xz
# Hashes for license files:
sha2566efc9991641b47b1f4e727db7f090d0ade00117dcbbc74be622f2baceddb1f22
COPYINGpackage/libwpe/libwpe.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.0.0 +LIBWPE_VERSION = 1.2.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz
Quoted 5 lines
LIBWPE_INSTALL_STAGING= YES
--
2.21.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190515/c269be94/attachment.html>
Thomas Petazzoni
AppliedPATCH 1/5 package/libwpe: bump to version 1.2.0
In reply to Adrian Perez de CastroQuoted 9 lines · On Tue, 14 May 2019 14:41:07 +0300 Adrian Perez de Castro <[email protected]>…
WPE WebKit 2.24.x requires libwpe 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/5 package/wpebackend-fdo: bump to version 1.2.0
In reply to Adrian Perez de CastroWPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
--- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
package/wpebackend-fdo/wpebackend-fdo.hash +4 -4
@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums -md5 2ee81a4212c18110a06a0c51c12e0d2e wpebackend-fdo-1.0.1.tar.xz -sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz -sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8 wpebackend-fdo-1.0.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums +md5 74e1b2fc2bc19933b17ff4f8435f67cd wpebackend-fdo-1.2.0.tar.xz +sha1 60559697512fd483c1d918b708a3d1d130b74a0a wpebackend-fdo-1.2.0.tar.xz +sha256 b1bb261273772af8f7d96d94989fc2ed0445ec06c7eb21f47a1b94e52422ddd5 wpebackend-fdo-1.2.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING
package/wpebackend-fdo/wpebackend-fdo.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.0.1 +WPEBACKEND_FDO_VERSION = 1.2.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES
Signature · 1 line
2.21.0
PATCH 2/5 package/wpebackend-fdo: bump to version 1.2.0
Le mar. 14 mai 2019 ? 14:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 46 lines
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)package/wpebackend-fdo/wpebackend-fdo.hash +0
-2@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums -md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums-md5>
2ee81a4212c18110a06a0c51c12e0d2ewpebackend-fdo-1.0.1.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +0
-2-sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz -sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8wpebackend-fdo-1.0.1.tar.xz
package/wpebackend-fdo/wpebackend-fdo.hash +2
-0+# From https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums +md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums+md5>
74e1b2fc2bc19933b17ff4f8435f67cdwpebackend-fdo-1.2.0.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +2
-0+sha1 60559697512fd483c1d918b708a3d1d130b74a0a wpebackend-fdo-1.2.0.tar.xz +sha256 b1bb261273772af8f7d96d94989fc2ed0445ec06c7eb21f47a1b94e52422ddd5wpebackend-fdo-1.2.0.tar.xz
# Hashes for license files:
sha256c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825
COPYINGpackage/wpebackend-fdo/wpebackend-fdo.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.0.1 +WPEBACKEND_FDO_VERSION = 1.2.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz
Quoted 2 lines
WPEBACKEND_FDO_INSTALL_STAGING= YES
Here, I need to add this hook:
# CMake found the wayland-scanner in $(STAGING_DIR), we need the one in $(HOST_DIR)
define WPEBACKEND_FDO_FIX_WAYLAND_SCANNER
$(SED) "s:/usr/bin/wayland-scanner:$(HOST_DIR)/bin/wayland-scanner:;" \
$(@D)/CMakeFiles/WPEBackend-fdo.dir/build.makeendef
WPEBACKEND_FDO_POST_CONFIGURE_HOOKS += WPEBACKEND_FDO_FIX_WAYLAND_SCANNER
Fran?ois
Quoted 4 lines
--
2.21.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190515/8617ed89/attachment.html>
PATCH 2/5 package/wpebackend-fdo: bump to version 1.2.0
Hello Fran?ois,
Quoted 54 lines · Fran?ois Perrad
Le mar. 14 mai 2019 ? 14:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 46 lines
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)package/wpebackend-fdo/wpebackend-fdo.hash +0
-2@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums -md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums-md5>
2ee81a4212c18110a06a0c51c12e0d2ewpebackend-fdo-1.0.1.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +0
-2-sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz -sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8wpebackend-fdo-1.0.1.tar.xz
package/wpebackend-fdo/wpebackend-fdo.hash +2
-0+# From https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums +md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums+md5>
74e1b2fc2bc19933b17ff4f8435f67cdwpebackend-fdo-1.2.0.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +2
-0+sha1 60559697512fd483c1d918b708a3d1d130b74a0a wpebackend-fdo-1.2.0.tar.xz +sha256 b1bb261273772af8f7d96d94989fc2ed0445ec06c7eb21f47a1b94e52422ddd5wpebackend-fdo-1.2.0.tar.xz
# Hashes for license files:
sha256c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825
COPYINGpackage/wpebackend-fdo/wpebackend-fdo.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.0.1 +WPEBACKEND_FDO_VERSION = 1.2.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xzQuoted 2 lines
WPEBACKEND_FDO_INSTALL_STAGING= YESHere, I need to add this hook:
Quoted 8 lines
# CMake found the wayland-scanner in $(STAGING_DIR), we need the one in $(HOST_DIR)
defineWPEBACKEND_FDO_FIX_WAYLAND_SCANNER$(SED) "s:/usr/bin/wayland-scanner:$(HOST_DIR)/bin/wayland-scanner:;" \ $(@D)/CMakeFiles/WPEBackend-fdo.dir/build.makeendef
WPEBACKEND_FDO_POST_CONFIGURE_HOOKS+=WPEBACKEND_FDO_FIX_WAYLAND_SCANNER
Ouch, this looks ugly, but thanks a lot to point out this issue. We can do better, so I just made a pull request to the upstream project with a patch that improves the CMake code to make it smarter so it searches in the $PATH first, and also to allow passing the path to wayland-scanner manually in the CMake command (which always takes precedence, of course), see:
https://github.com/Igalia/WPEBackend-fdo/pull/39
For v2 of the patch set I plan to include the above patch :-)
Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190515/06331d11/attachment.asc>
PATCH 2/5 package/wpebackend-fdo: bump to version 1.2.0
Hello!
Quick update below...
Quoted 72 lines · Adrian Perez de Castro
Hello Fran?ois,
Quoted 54 lines · Fran?ois Perrad
Le mar. 14 mai 2019 ? 14:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 46 lines
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)package/wpebackend-fdo/wpebackend-fdo.hash +0
-2@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums -md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums-md5>
2ee81a4212c18110a06a0c51c12e0d2ewpebackend-fdo-1.0.1.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +0
-2-sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz -sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8wpebackend-fdo-1.0.1.tar.xz
package/wpebackend-fdo/wpebackend-fdo.hash +2
-0+# From https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums +md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums+md5>
74e1b2fc2bc19933b17ff4f8435f67cdwpebackend-fdo-1.2.0.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +2
-0+sha1 60559697512fd483c1d918b708a3d1d130b74a0a wpebackend-fdo-1.2.0.tar.xz +sha256 b1bb261273772af8f7d96d94989fc2ed0445ec06c7eb21f47a1b94e52422ddd5wpebackend-fdo-1.2.0.tar.xz
# Hashes for license files:
sha256c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825
COPYINGpackage/wpebackend-fdo/wpebackend-fdo.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.0.1 +WPEBACKEND_FDO_VERSION = 1.2.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xzQuoted 2 lines
WPEBACKEND_FDO_INSTALL_STAGING= YESHere, I need to add this hook:
Quoted 8 lines
# CMake found the wayland-scanner in $(STAGING_DIR), we need the one in $(HOST_DIR)
defineWPEBACKEND_FDO_FIX_WAYLAND_SCANNER$(SED) "s:/usr/bin/wayland-scanner:$(HOST_DIR)/bin/wayland-scanner:;" \ $(@D)/CMakeFiles/WPEBackend-fdo.dir/build.makeendef
WPEBACKEND_FDO_POST_CONFIGURE_HOOKS+=WPEBACKEND_FDO_FIX_WAYLAND_SCANNEROuch, this looks ugly, but thanks a lot to point out this issue. We can do better, so I just made a pull request to the upstream project with a patch that improves the CMake code to make it smarter so it searches in the $PATH first, and also to allow passing the path to wayland-scanner manually in the CMake command (which always takes precedence, of course), see:
Quoted 3 lines
https://github.com/Igalia/WPEBackend-fdo/pull/39
For v2 of the patch set I plan to include the above patch :-)
The patch has been merged upstream already, but it is not yet in a release. I have double checked that with the patch applied then ?wayland-scanner? is correctly picked from the host tools directory [1], so I'll go ahead with its inclusion in v2 of this patch set.
Cheers,
?Adri?n
---
[1] https://github.com/Igalia/WPEBackend-fdo/pull/39#issuecomment-493029077
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190516/54dd411f/attachment.asc>
PATCH 2/5 package/wpebackend-fdo: bump to version 1.2.0
In reply to Adrian Perez de CastroQuoted 9 lines · On Tue, 14 May 2019 14:41:08 +0300 Adrian Perez de Castro <[email protected]>…
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
I've marked this patch, as well as PATCH 4/5 and 5/5 as Changes Requested.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/5 package/libepoxy: update to version 1.5.3, convert to Meson
In reply to Adrian Perez de CastroThis release fixes building with uClibc and symbol lookups for drivers which have GLES 3.x support.
Tarballs do not include a generated "configure" script any more, so use Meson to configure the build instead.
--- package/libepoxy/libepoxy.hash | 4 ++-- package/libepoxy/libepoxy.mk | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)
package/libepoxy/libepoxy.hash +2 -2
@@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.2.sha256sum -sha256 a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8 libepoxy-1.5.2.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.3.sha256sum +sha256 002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d libepoxy-1.5.3.tar.xz # Hashes for license files: sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING
package/libepoxy/libepoxy.mk +7 -6
@@ -5,26 +5,27 @@ ################################################################################ LIBEPOXY_VERSION_MAJOR = 1.5 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).2 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).3 LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE_FILES = COPYING +LIBEPOXY_CONF_OPTS += -Ddocs=false -Dtests=false ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -LIBEPOXY_CONF_OPTS += --enable-egl +LIBEPOXY_CONF_OPTS += -Degl=yes LIBEPOXY_DEPENDENCIES += libegl else -LIBEPOXY_CONF_OPTS += --disable-egl +LIBEPOXY_CONF_OPTS += -Degl=no endif ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_XLIB_LIBX11),yy) -LIBEPOXY_CONF_OPTS += --enable-glx +LIBEPOXY_CONF_OPTS += -Dglx=yes -Dx11=true LIBEPOXY_DEPENDENCIES += libgl xlib_libX11 else -LIBEPOXY_CONF_OPTS += --disable-glx +LIBEPOXY_CONF_OPTS += -Dglx=no -Dx11=false endif -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.21.0
Thomas Petazzoni
AppliedPATCH 3/5 package/libepoxy: update to version 1.5.3, convert to Meson
Quoted 11 lines · On Tue, 14 May 2019 14:41:09 +0300 Adrian Perez de Castro <[email protected]>…
This release fixes building with uClibc and symbol lookups for drivers which have GLES 3.x support.
Tarballs do not include a generated "configure" script any more, so use Meson to configure the build instead.
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/libepoxy/libepoxy.hash | 4 ++-- package/libepoxy/libepoxy.mk | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
In reply to Adrian Perez de CastroThis is a new major release which brings in many improvements and new features. For a complete list, please refer to the release notes:
https://wpewebkit.org/release/wpewebkit-2.24.0.html
https://wpewebkit.org/release/wpewebkit-2.24.1.html
Updating to version 2.24.1 also includes fixes for CVE-2019-6201, CVE-2019-6251, CVE-2019-7285, CVE-2019-7292, CVE-2019-8503, CVE-2019-8506, CVE-2019-8515, CVE-2019-8518, CVE-2019-8523, CVE-2019-8524, CVE-2019-8535, CVE-2019-8536, CVE-2019-8544, CVE-2019-8551, CVE-2019-8558, CVE-2019-8559, CVE-2019-8563, and CVE-2019-11070. The detailed security advisory can be found at:
https://wpewebkit.org/security/WSA-2019-0002.html
The BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT configuration symbol is not needed anymore, because the logic to decide whether the JavaScriptCore JIT spport can be enabled has been improved upstream.
One of the new features in 2.24.x is the support for JPEG2000 images, which is implemented using the OpenJPEG library. Therefore a dependency on BR2_PACKAGE_OPENJPEG is added.
--- package/wpewebkit/Config.in | 17 +---------------- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 10 ++-------- 3 files changed, 7 insertions(+), 28 deletions(-)
package/wpewebkit/Config.in +1 -16
@@ -12,22 +12,6 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endian mode. - default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6 - # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258 - # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT
@@ -63,6 +47,7 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBP
package/wpewebkit/wpewebkit.hash +4 -4
@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums -md5 7b768bfae1295ebbc9a9038bf8fb6e6c wpewebkit-2.22.5.tar.xz -sha1 c85f927e0f17f1e7045a5d33c683d310c7af24de wpewebkit-2.22.5.tar.xz -sha256 d5e7b23e4f9e9f1b9d369faa4d527cdb59aef56b3e6a50a16dad243df5f699f3 wpewebkit-2.22.5.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.24.1.tar.xz.sums +md5 0f7b792874853416d8005b020bd90685 wpewebkit-2.24.1.tar.xz +sha1 d009c82afbc2c373a7f34ffda392e5c3b52dac7d wpewebkit-2.24.1.tar.xz +sha256 95f2fb68429fbd901ea415d09fdd88d6d9ac5ec2d170bec9977093b12e5093a6 wpewebkit-2.24.1.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
package/wpewebkit/wpewebkit.mk +2 -8
@@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.22.5 +WPEWEBKIT_VERSION = 2.24.1 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES
@@ -14,19 +14,13 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ - libpng libxslt wayland-protocols webp wpebackend-fdo + libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF -ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON -else -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -endif - ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y) WPEWEBKIT_CONF_OPTS += \ -DENABLE_VIDEO=ON \
Signature · 1 line
2.21.0
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Le mar. 14 mai 2019 ? 14:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 110 lines
This is a new major release which brings in many improvements and new features. For a complete list, please refer to the release notes:
https://wpewebkit.org/release/wpewebkit-2.24.0.html
https://wpewebkit.org/release/wpewebkit-2.24.1.htmlUpdating to version 2.24.1 also includes fixes for CVE-2019-6201, CVE-2019-6251, CVE-2019-7285, CVE-2019-7292, CVE-2019-8503, CVE-2019-8506, CVE-2019-8515, CVE-2019-8518, CVE-2019-8523, CVE-2019-8524, CVE-2019-8535, CVE-2019-8536, CVE-2019-8544, CVE-2019-8551, CVE-2019-8558, CVE-2019-8559, CVE-2019-8563, and CVE-2019-11070. The detailed security advisory can be found at:
https://wpewebkit.org/security/WSA-2019-0002.html
The
BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JITconfiguration symbol is not needed anymore, because the logic to decide whether the JavaScriptCore JIT spport can be enabled has been improved upstream.One of the new features in 2.24.x is the support for JPEG2000 images, which is implemented using the OpenJPEG library. Therefore a dependency on
BR2_PACKAGE_OPENJPEGis added.Signed-off-by Adrian Perez de Castro <[email protected]>--- package/wpewebkit/Config.in | 17 +---------------- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 10 ++-------- 3 files changed, 7 insertions(+), 28 deletions(-)package/wpewebkit/Config.in +0
-5@@ -12,22 +12,6 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endianmode.
package/wpewebkit/Config.in +0
-6- default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, andR6
- # is unsupported, see
https://bugs.webkit.org/show_bug.cgi?id=191258package/wpewebkit/Config.in +0
-4- # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamiclibrary, gcc >= 4.8, host gcc >= 4.8"
depends onBR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTSdepends on !BR2_BINFMT_FLATpackage/wpewebkit/Config.in +1
-0@@ -63,6 +47,7 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBPpackage/wpewebkit/wpewebkit.hash +0
-2@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums -md5 <https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums-md5>
7b768bfae1295ebbc9a9038bf8fb6e6cwpewebkit-2.22.5.tar.xzpackage/wpewebkit/wpewebkit.hash +0
-2-sha1 c85f927e0f17f1e7045a5d33c683d310c7af24de wpewebkit-2.22.5.tar.xz -sha256 d5e7b23e4f9e9f1b9d369faa4d527cdb59aef56b3e6a50a16dad243df5f699f3wpewebkit-2.22.5.tar.xz
package/wpewebkit/wpewebkit.hash +2
-0+# From https://wpewebkit.org/releases/wpewebkit-2.24.1.tar.xz.sums +md5 <https://wpewebkit.org/releases/wpewebkit-2.24.1.tar.xz.sums+md5>
0f7b792874853416d8005b020bd90685wpewebkit-2.24.1.tar.xzpackage/wpewebkit/wpewebkit.hash +2
-0+sha1 d009c82afbc2c373a7f34ffda392e5c3b52dac7d wpewebkit-2.24.1.tar.xz +sha256 95f2fb68429fbd901ea415d09fdd88d6d9ac5ec2d170bec9977093b12e5093a6wpewebkit-2.24.1.tar.xz
# Hashes for license files:
sha2560b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4
Source/WebCore/LICENSE-APPLEpackage/wpewebkit/ renamed from package/wpewebkit/wpewebkit.mk +0
-0wpewebkit.mk
index73ad534acd..480ddb0b0c100644package/wpewebkit/wpewebkit.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.22.5 +WPEWEBKIT_VERSION = 2.24.1 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
WPEWEBKIT_INSTALL_STAGING= YESpackage/wpewebkit/wpewebkit.mk +0
-0@@ -14,19 +14,13 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup
package/wpewebkit/wpewebkit.mk WPEWEBKIT_LICENSE_FILES = \ · line 25
Quoted 10 lines
package/wpewebkit/wpewebkit.mk +1
-1libtasn1 \ - libpng libxslt wayland-protocols webp wpebackend-fdo + libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF
openjpeg is an optional dependency
ifeq ($(BR2_PACKAGE_OPENJPEG),y)WPEWEBKIT_CONF_OPTS += -DUSE_OPENJPEG=ONWPEWEBKIT_DEPENDENCIES += openjpeg
elseWPEWEBKIT_CONF_OPTS += -DUSE_OPENJPEG=OFF
endif
Fran?ois
Quoted 9 lines
package/wpewebkit/wpewebkit.mk +0
-6-ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON -else -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -endif - ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)WPEWEBKIT_CONF_OPTS += \ -DENABLE_VIDEO=ON \
Quoted 4 lines
--
2.21.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190515/31e7863e/attachment.html>
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Hello,
Quoted 125 lines · Fran?ois Perrad
Le mar. 14 mai 2019 ? 14:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 110 lines
This is a new major release which brings in many improvements and new features. For a complete list, please refer to the release notes:
https://wpewebkit.org/release/wpewebkit-2.24.0.html
https://wpewebkit.org/release/wpewebkit-2.24.1.htmlUpdating to version 2.24.1 also includes fixes for CVE-2019-6201, CVE-2019-6251, CVE-2019-7285, CVE-2019-7292, CVE-2019-8503, CVE-2019-8506, CVE-2019-8515, CVE-2019-8518, CVE-2019-8523, CVE-2019-8524, CVE-2019-8535, CVE-2019-8536, CVE-2019-8544, CVE-2019-8551, CVE-2019-8558, CVE-2019-8559, CVE-2019-8563, and CVE-2019-11070. The detailed security advisory can be found at:
https://wpewebkit.org/security/WSA-2019-0002.html
The
BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JITconfiguration symbol is not needed anymore, because the logic to decide whether the JavaScriptCore JIT spport can be enabled has been improved upstream.One of the new features in 2.24.x is the support for JPEG2000 images, which is implemented using the OpenJPEG library. Therefore a dependency on
BR2_PACKAGE_OPENJPEGis added.Signed-off-by Adrian Perez de Castro <[email protected]>--- package/wpewebkit/Config.in | 17 +---------------- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 10 ++-------- 3 files changed, 7 insertions(+), 28 deletions(-)package/wpewebkit/Config.in +0
-5@@ -12,22 +12,6 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endianmode.
package/wpewebkit/Config.in +0
-6- default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, andR6
- # is unsupported, see
https://bugs.webkit.org/show_bug.cgi?id=191258package/wpewebkit/Config.in +0
-4- # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamiclibrary, gcc >= 4.8, host gcc >= 4.8"
depends onBR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTSdepends on !BR2_BINFMT_FLATpackage/wpewebkit/Config.in +1
-0@@ -63,6 +47,7 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBPpackage/wpewebkit/wpewebkit.hash +0
-2@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums -md5 <https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums-md5>
7b768bfae1295ebbc9a9038bf8fb6e6cwpewebkit-2.22.5.tar.xzpackage/wpewebkit/wpewebkit.hash +0
-2-sha1 c85f927e0f17f1e7045a5d33c683d310c7af24de wpewebkit-2.22.5.tar.xz -sha256 d5e7b23e4f9e9f1b9d369faa4d527cdb59aef56b3e6a50a16dad243df5f699f3wpewebkit-2.22.5.tar.xz
package/wpewebkit/wpewebkit.hash +2
-0+# From https://wpewebkit.org/releases/wpewebkit-2.24.1.tar.xz.sums +md5 <https://wpewebkit.org/releases/wpewebkit-2.24.1.tar.xz.sums+md5>
0f7b792874853416d8005b020bd90685wpewebkit-2.24.1.tar.xzpackage/wpewebkit/wpewebkit.hash +2
-0+sha1 d009c82afbc2c373a7f34ffda392e5c3b52dac7d wpewebkit-2.24.1.tar.xz +sha256 95f2fb68429fbd901ea415d09fdd88d6d9ac5ec2d170bec9977093b12e5093a6wpewebkit-2.24.1.tar.xz
# Hashes for license files:
sha2560b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4
Source/WebCore/LICENSE-APPLEpackage/wpewebkit/ renamed from package/wpewebkit/wpewebkit.mk +0
-0wpewebkit.mk
index73ad534acd..480ddb0b0c100644package/wpewebkit/wpewebkit.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.22.5 +WPEWEBKIT_VERSION = 2.24.1 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
WPEWEBKIT_INSTALL_STAGING= YESpackage/wpewebkit/wpewebkit.mk +0
-0@@ -14,19 +14,13 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsouppackage/wpewebkit/wpewebkit.mk WPEWEBKIT_LICENSE_FILES = \ · line 25
Quoted 10 lines
package/wpewebkit/wpewebkit.mk +1
-1libtasn1 \ - libpng libxslt wayland-protocols webp wpebackend-fdo + libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFFopenjpeg is an optional dependency
Quoted 6 lines
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
WPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=ONWPEWEBKIT_DEPENDENCIES+= openjpeg
elseWPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=OFF
endif
While it is indeed possible to build without OpenJPEG, with my WebKit developer hat I have to strongly recommend to make it required: many websites will silently fail to show images without this enabled, and that's the reason why I have selected the dependency unconditionally.
For the record: I did a quick check and in my work system (x86_64) the ?libopenjp2.so? library is only 365 KiB, which is peanuts compared to the size of ?libWPEWebKit.so?. Moreover, the openjpeg package can be built in every platform where wpewebkit is supported, therefore I think it is worth it to leave the dependency unconditionally enabled.
Thoughts?
?Adri?n
Quoted 11 lines
Quoted 11 lines
package/wpewebkit/wpewebkit.mk +0
-6-ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON -else -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -endif - ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)WPEWEBKIT_CONF_OPTS += \ -DENABLE_VIDEO=ON \--
2.21.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190515/55108723/attachment.asc>
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Hello,
Adding Peter in Cc. I know he'll like it :-)
Adding Yann in Cc. I know he won't like it :-)
Quoted 14 lines · On Wed, 15 May 2019 14:52:39 +0300 Adrian Perez de Castro <[email protected]>…
Quoted 8 lines
openjpeg is an optional dependency
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
WPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=ONWPEWEBKIT_DEPENDENCIES+= openjpeg
elseWPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=OFF
endifWhile it is indeed possible to build without OpenJPEG, with my WebKit developer hat I have to strongly recommend to make it required: many websites will silently fail to show images without this enabled, and that's the reason why I have selected the dependency unconditionally.
Quoted 5 lines
For the record: I did a quick check and in my work system (
x86_64) the ?libopenjp2.so? library is only 365 KiB, which is peanuts compared to the size of ?libWPEWebKit.so?. Moreover, the openjpeg package can be built in every platform where wpewebkit is supported, therefore I think it is worth it to leave the dependency unconditionally enabled.
Perhaps this is one situation where we could make good use of the "imply" kconfig keyword ?
BR2_PACKAGE_WEBKIT would do an "imply BR2_PACKAGE_OPENJPEG". This way by default OpenJPEG is automatically enabled by WPE Webkit, but we still allow the user to disable OpenJPEG if he really wants it.
That allows to comply with the Buildroot principle of "make everything optional really optional" while offering a good out-of-the-box experience.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Hi Thomas,
Quoted 5 lines · Thomas Petazzoni
Hello,
Adding Peter in Cc. I know he'll like it :-)
Adding Yann in Cc. I know he won't like it :-)
:-D
Personally, I like the suggestion, but I will wait for feedback on this before sending v2 of the patch set.
Quoted 26 lines
Quoted 14 lines · On Wed, 15 May 2019 14:52:39 +0300 Adrian Perez de Castro <[email protected]>…
Quoted 8 lines
openjpeg is an optional dependency
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
WPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=ONWPEWEBKIT_DEPENDENCIES+= openjpeg
elseWPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=OFF
endifWhile it is indeed possible to build without OpenJPEG, with my WebKit developer hat I have to strongly recommend to make it required: many websites will silently fail to show images without this enabled, and that's the reason why I have selected the dependency unconditionally.
Quoted 5 lines
For the record: I did a quick check and in my work system (
x86_64) the ?libopenjp2.so? library is only 365 KiB, which is peanuts compared to the size of ?libWPEWebKit.so?. Moreover, the openjpeg package can be built in every platform where wpewebkit is supported, therefore I think it is worth it to leave the dependency unconditionally enabled.Perhaps this is one situation where we could make good use of the "imply" kconfig keyword ?
Quoted 7 lines
BR2_PACKAGE_WEBKITwould do an "implyBR2_PACKAGE_OPENJPEG". This way by default OpenJPEG is automatically enabled by WPE Webkit, but we still allow the user to disable OpenJPEG if he really wants it.That allows to comply with the Buildroot principle of "make everything optional really optional" while offering a good out-of-the-box experience.
It seems like the situation in which ?imply? fits perfectly.
Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190515/bbe720d0/attachment.asc>
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Adrian, Thomas, All,
On 2019-05-15 21:11 +0300, Adrian Perez de Castro spake thusly:
Quoted 3 lines · Thomas Petazzoni
Quoted 2 lines
Adding Peter in Cc. I know he'll like it :-)
Adding Yann in Cc. I know he won't like it :-)
I see the wink, but still, meh... ;-)
Quoted 2 lines
Personally, I like the suggestion, but I will wait for feedback on this before sending v2 of the patch set.
Well, as you said previously, what good is a browser without support for one of the most prominent image format on the web?
If you were arguing for BMP or TGA, we'd use a conditional dependency.
But please note that openjpeg is a JPEG 2000 codec, not a JPEG one. JPEG 2000 is much less used on the web:
https://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support
Only Konqueror, Midori, Omniweb, and Safari are said to support it.
Also, Thomas, please note that NetSurf does not support it eitther. ;-]
So, in this case, I would argue for a conditional dependency, as Adrian initially suggested below:
Quoted 9 lines
Quoted 9 lines
Quoted 7 lines · On Wed, 15 May 2019 14:52:39 +0300 Adrian Perez de Castro <[email protected]>…
Quoted 7 lines
openjpeg is an optional dependency
ifeq ($(BR2_PACKAGE_OPENJPEG),y)WPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=ONWPEWEBKIT_DEPENDENCIES+= openjpeg
elseWPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=OFF
endif
... here ^^^.
Sorry, but I still dislike "imply". :-p
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Hello!
Quoted 15 lines · Yann E. MORIN
Adrian, Thomas, All,
On 2019-05-15 21:11 +0300, Adrian Perez de Castro spake thusly:
Quoted 3 lines · Thomas Petazzoni
Quoted 2 lines
Adding Peter in Cc. I know he'll like it :-)
Adding Yann in Cc. I know he won't like it :-)I see the wink, but still, meh... ;-)
Quoted 2 lines
Personally, I like the suggestion, but I will wait for feedback on this before sending v2 of the patch set.
Well, as you said previously, what good is a browser without support for one of the most prominent image format on the web?
Quoted 8 lines
If you were arguing for BMP or TGA, we'd use a conditional dependency.
But please note that openjpeg is a JPEG 2000 codec, not a JPEG one. JPEG 2000 is much less used on the web:
https://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support
Only Konqueror, Midori, Omniweb, and Safari are said to support it.
?and now WebKitGTK, and WPE WebKit :)
With my WebKit maintainer hat on, let me tell you a short story.
We have been forced to add support for JPEG2000 [1] because our user-agent is similar to that of Safari (because? our WebKit ports *are* using the same Web engine as Safari?there is no point denying it!) and a few sites started over a year ago to send JPEG2000 images replies, then a few more, and then some. At some point Akamai's Image Manager [2] started serving JPEG2000 images
transparently: the HTML references an URL ending in ?.png? (for example), and Akamai will return a JPEG2000 in the response (with an appropriate Content-Type HTTP header, of course). At this point, if we don't support JPEG2000, a good chunk of popular websites will just look broken because the images returned by popular CDNs or the websites themselves cannot be decoded.
This above is what I meant with ?many websites will silently fail to show images without [OpenJPEG support] enabled?.
I hope this helps understand why I am so insistent in having the OpenJPEG support enabled unconditionally: preventing that the Web is broken when browsing with a WebKit-based browser.
The rationale why we have in the CMake build files in WebKit an ?USE_OPENJPEG? build-time option is to disable it when configuring for distributions which either a.) do not ship an OpenJPEG package, or b.) ship an old version that does not include some new API that WebKit needs (example: Ubuntu LTS). Buildroot does not fall into any of the categories above, and therefore I would argue that either we use ?select? to depend unconditionally on OpenJPEG, or ?imply? to choose it by default while still allowing to deselect it by hand.
Quoted 1 line
Also, Thomas, please note that NetSurf does not support it eitther. ;-]
Then again, NetSurf does not have an user-agent close enough to a WebKit one as to be served JPEG2000 images }:-)
Quoted 13 lines
So, in this case, I would argue for a conditional dependency, as Adrian initially suggested below:
Quoted 9 lines
Quoted 9 lines
Quoted 7 lines · On Wed, 15 May 2019 14:52:39 +0300 Adrian Perez de Castro <[email protected]>…
Quoted 7 lines
openjpeg is an optional dependency
ifeq ($(BR2_PACKAGE_OPENJPEG),y)WPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=ONWPEWEBKIT_DEPENDENCIES+= openjpeg
elseWPEWEBKIT_CONF_OPTS+= -DUSE_OPENJPEG=OFF
endif
Quoted 3 lines
... here ^^^.
Sorry, but I still dislike "imply". :-p
I hope that my little store above might help you change your mind, if only a little bit :-)
Best regards,
?Adri?n
---
[1] https://bugs.webkit.org/show_bug.cgi?id=186272
[2] https://www.akamai.com/us/en/products/performance/image-manager.jsp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190516/f16b44f8/attachment.asc>
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Adrian, All,
On 2019-05-16 00:15 +0300, Adrian Perez de Castro spake thusly:
Quoted 9 lines · Yann E. MORIN
Quoted 7 lines
On 2019-05-15 21:11 +0300, Adrian Perez de Castro spake thusly:
Well, as you said previously, what good is a browser without support for one of the most prominent image format on the web?
But please note that openjpeg is a JPEG 2000 codec, not a JPEG one. JPEG 2000 is much less used on the web:
https://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support
Only Konqueror, Midori, Omniweb, and Safari are said to support it.
Quoted 3 lines
?and now WebKitGTK, and WPE WebKit :)
With my WebKit maintainer hat on, let me tell you a short story.
/me sits by the fire and listens carefully to stories from the trenches... :-)
Quoted 12 lines
We have been forced to add support for JPEG2000 [1] because our user-agent is similar to that of Safari (because? our WebKit ports *are* using the same Web engine as Safari?there is no point denying it!) and a few sites started over a year ago to send JPEG2000 images replies, then a few more, and then some. At some point Akamai's Image Manager [2] started serving JPEG2000 images
transparently: the HTML references an URL ending in ?.png? (for example), and Akamai will return a JPEG2000 in the response (with an appropriate Content-Type HTTP header, of course). At this point, if we don't support JPEG2000, a good chunk of popular websites will just look broken because the images returned by popular CDNs or the websites themselves cannot be decoded.
Quoted 2 lines
This above is what I meant with ?many websites will silently fail to show images without [OpenJPEG support] enabled?.
So, from what you are saying, I understand that support for jpeg 2000 *is* de facto mandatory.
Quoted 3 lines
I hope this helps understand why I am so insistent in having the OpenJPEG support enabled unconditionally: preventing that the Web is broken when browsing with a WebKit-based browser.
Yes, I understand that. Thanks for the explanations.
Quoted 8 lines
The rationale why we have in the CMake build files in WebKit an ?USE_OPENJPEG? build-time option is to disable it when configuring for distributions which either a.) do not ship an OpenJPEG package, or b.) ship an old version that does not include some new API that WebKit needs (example: Ubuntu LTS). Buildroot does not fall into any of the categories above, and therefore I would argue that either we use ?select? to depend unconditionally on OpenJPEG, or ?imply? to choose it by default while still allowing to deselect it by hand.
I would not even give the option to disable it. Given the size of openjpeg as compared to that of *webkit, there is not even the slightest reason to make it configurable (IMHO).
Quoted 3 lines
Quoted 1 line
Also, Thomas, please note that NetSurf does not support it eitther. ;-]
Then again, NetSurf does not have an user-agent close enough to a WebKit one as to be served JPEG2000 images }:-)
That was a partially-private joke with Thomas, as he is keen on removing netsurf after having lost countless hair trying to fix it. ;-)
Quoted 2 lines
I hope that my little store above might help you change your mind, if only a little bit :-)
Yes, I changed my mind, from a conditional to mandatory dependency. ;-) Sorry, still no imply for me! ;-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 4/5 package/wpewebkit: bump to version 2.24.1
Hello,
Quoted 12 lines · Yann E. MORIN
Adrian, All,
On 2019-05-16 00:15 +0300, Adrian Perez de Castro spake thusly:
Quoted 9 lines · Yann E. MORIN
Quoted 7 lines
On 2019-05-15 21:11 +0300, Adrian Perez de Castro spake thusly:
Well, as you said previously, what good is a browser without support for one of the most prominent image format on the web?
But please note that openjpeg is a JPEG 2000 codec, not a JPEG one. JPEG 2000 is much less used on the web:
https://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support
Only Konqueror, Midori, Omniweb, and Safari are said to support it.
Quoted 6 lines
Quoted 3 lines
?and now WebKitGTK, and WPE WebKit :)
With my WebKit maintainer hat on, let me tell you a short story.
/me sits by the fire and listens carefully to stories from the trenches... :-)
:-D
Quoted 12 lines
Quoted 12 lines
We have been forced to add support for JPEG2000 [1] because our user-agent is similar to that of Safari (because? our WebKit ports *are* using the same Web engine as Safari?there is no point denying it!) and a few sites started over a year ago to send JPEG2000 images replies, then a few more, and then some. At some point Akamai's Image Manager [2] started serving JPEG2000 images
transparently: the HTML references an URL ending in ?.png? (for example), and Akamai will return a JPEG2000 in the response (with an appropriate Content-Type HTTP header, of course). At this point, if we don't support JPEG2000, a good chunk of popular websites will just look broken because the images returned by popular CDNs or the websites themselves cannot be decoded.
Quoted 5 lines
Quoted 2 lines
This above is what I meant with ?many websites will silently fail to show images without [OpenJPEG support] enabled?.
So, from what you are saying, I understand that support for jpeg 2000 *is* de facto mandatory.
That's 101% correct.
Quoted 5 lines
Quoted 3 lines
I hope this helps understand why I am so insistent in having the OpenJPEG support enabled unconditionally: preventing that the Web is broken when browsing with a WebKit-based browser.
Yes, I understand that. Thanks for the explanations.
No problem. If there's any other questions regarding WebKit, feel free to send them my way.
Quoted 9 lines
Quoted 8 lines
The rationale why we have in the CMake build files in WebKit an ?USE_OPENJPEG? build-time option is to disable it when configuring for distributions which either a.) do not ship an OpenJPEG package, or b.) ship an old version that does not include some new API that WebKit needs (example: Ubuntu LTS). Buildroot does not fall into any of the categories above, and therefore I would argue that either we use ?select? to depend unconditionally on OpenJPEG, or ?imply? to choose it by default while still allowing to deselect it by hand.
Quoted 3 lines
I would not even give the option to disable it. Given the size of openjpeg as compared to that of *webkit, there is not even the slightest reason to make it configurable (IMHO).
I also like this option, so I will do that for v2 of the patch set.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Also, Thomas, please note that NetSurf does not support it eitther. ;-]
Then again, NetSurf does not have an user-agent close enough to a WebKit one as to be served JPEG2000 images }:-)
That was a partially-private joke with Thomas, as he is keen on removing netsurf after having lost countless hair trying to fix it. ;-)
Hehe, I figured :-]
Quoted 5 lines
Quoted 2 lines
I hope that my little store above might help you change your mind, if only a little bit :-)
Yes, I changed my mind, from a conditional to mandatory dependency. ;-) Sorry, still no imply for me! ;-)
Well, imply or not imply... at least we have now an agreement on how to go ahead with this. Thanks for your feedback!
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190517/6bd3828a/attachment.asc>
PATCH 5/5 package/cog: bump version to 0.3.0
In reply to Adrian Perez de CastroVersion 0.2.0 does not work with WPE WebKit 2.22.x, this is the first version which can be used with 2.24.x
--- package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/cog/cog.hash +1 -1
@@ -1,5 +1,5 @@ # Locally generated -sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz +sha256 755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedaf cog-v0.3.0.tar.gz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING
package/cog/cog.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = v0.2.0 +COG_VERSION = v0.3.0 COG_SITE = $(call github,Igalia,cog,$(COG_VERSION)) COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo COG_LICENSE = MIT
Signature · 1 line
2.21.0
PATCH 5/5 package/cog: bump version to 0.3.0
Hi,
One quick note below...
Quoted 25 lines · Adrian Perez de Castro
Version 0.2.0 does not work with WPE WebKit 2.22.x, this is the first version which can be used with 2.24.x
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/cog/cog.hash +1
-1@@ -1,5 +1,5 @@ # Locally generated -sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz +sha256 755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedaf cog-v0.3.0.tar.gz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYINGpackage/cog/cog.mk +0
-0
package/cog/cog.mk line 10
Quoted 8 lines
package/cog/cog.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = v0.2.0 +COG_VERSION = v0.3.0 COG_SITE = $(call github,Igalia,cog,$(COG_VERSION)) COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo COG_LICENSE = MIT
FWIW, I think this should have also:
COG_INSTALL_STAGING = YES
to make it possible to debug Cog properly. I can either resubmit a second version of the patchset, or send this one change in a separate independent patch as a follow-up.
Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190514/29f704d3/attachment.asc>
PATCH 5/5 package/cog: bump version to 0.3.0
Quoted 41 lines · Adrian Perez de Castro
Hi,
One quick note below...
Quoted 25 lines · Adrian Perez de Castro
Version 0.2.0 does not work with WPE WebKit 2.22.x, this is the first version which can be used with 2.24.x
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/cog/cog.hash +1
-1@@ -1,5 +1,5 @@ # Locally generated -sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz +sha256 755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedaf cog-v0.3.0.tar.gz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYINGpackage/cog/cog.mk +0
-0package/cog/cog.mk line 10
Quoted 8 lines
package/cog/cog.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = v0.2.0 +COG_VERSION = v0.3.0 COG_SITE = $(call github,Igalia,cog,$(COG_VERSION)) COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo COG_LICENSE = MITFWIW, I think this should have also:
Quoted 5 lines
COG_INSTALL_STAGING= YESto make it possible to debug Cog properly. I can either resubmit a second version of the patchset, or send this one change in a separate independent patch as a follow-up.
It's definitely independent. And I don't think we would see "to make it
possible to debug Cog properly" as a good reason... Because with that reasoning, *all* packages should be installed to staging. (Which, indeed, they should...)
Regards,
Arnout
PATCH 5/5 package/cog: bump version to 0.3.0
Hello,
Quoted 44 lines · Arnout Vandecappelle
Quoted 43 lines · Adrian Perez de Castro
Hi,
One quick note below...
Quoted 25 lines · Adrian Perez de Castro
Version 0.2.0 does not work with WPE WebKit 2.22.x, this is the first version which can be used with 2.24.x
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/cog/cog.hash +1
-1@@ -1,5 +1,5 @@ # Locally generated -sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz +sha256 755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedaf cog-v0.3.0.tar.gz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYINGpackage/cog/cog.mk +0
-0package/cog/cog.mk line 10
Quoted 8 lines
package/cog/cog.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = v0.2.0 +COG_VERSION = v0.3.0 COG_SITE = $(call github,Igalia,cog,$(COG_VERSION)) COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo COG_LICENSE = MITFWIW, I think this should have also:
COG_INSTALL_STAGING= YES
Quoted 7 lines
Quoted 3 lines
to make it possible to debug Cog properly. I can either resubmit a second version of the patchset, or send this one change in a separate independent patch as a follow-up.
It's definitely independent. And I don't think we would see "to make it
possible to debug Cog properly" as a good reason... Because with that reasoning, *all* packages should be installed to staging. (Which, indeed, they should...)
I have submitted a separate patch for this, and with a better reasoning for having it installed to the staging tree: the package includes libraries and headers which e.g. should end up being part of the SDK.
Patch here: https://patchwork.ozlabs.org/patch/1100157/
Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190515/33870330/attachment.asc>
v2 cover Update WPE WebKit to 2.24.x
In reply to Adrian Perez de CastroHello,
This patch set includes updated versions of the patches pending to merge for the WPE WebKit 2.24.x update.
Cheers,
?Adri?n
Adrian Perez de Castro (3):
package/wpebackend-fdo: bump to version 1.2.0
package/wpewebkit: bump to version 2.24.2
package/cog: bump version to 0.3.0
package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- ...-how-CMake-looks-for-wayland-scanner.patch | 137 ++++++++++++++++++ package/wpebackend-fdo/wpebackend-fdo.hash | 8 +- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- ...uild-failure-after-r243644-in-GTK-Li.patch | 36 +++++ package/wpewebkit/Config.in | 17 +-- package/wpewebkit/wpewebkit.hash | 8 +- package/wpewebkit/wpewebkit.mk | 10 +- 9 files changed, 187 insertions(+), 35 deletions(-) create mode 100644 package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch create mode 100644 package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch
Signature · 1 line
2.21.0
PATCH v2 1/3 package/wpebackend-fdo: bump to version 1.2.0
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
The added patch makes the build system pick the version of wayland-scanner from $(HOST_DIR), instead of the target version.
---
Changes v1 -> v2:
- Included upstream patch which solves picking the correct (host) version of wayland-scanner.
--- ...-how-CMake-looks-for-wayland-scanner.patch | 137 ++++++++++++++++++ package/wpebackend-fdo/wpebackend-fdo.hash | 8 +- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 3 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch
package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch new file +137 -0
@@ -0,0 +1,137 @@ +From a03431fb562176d25919e76e0baf52a0ba3752c4 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <[email protected]> +Date: Wed, 15 May 2019 20:54:10 +0300 +Subject: [PATCH] Improve how CMake looks for wayland-scanner + +This improves FindWaylandScanner.cmake to allow it to find the +wayland-scanner tool in any of the following ways (in order of +preference): + + 1. By passing -DWAYLAND_SCANNER=path/to/wayland-scanner to CMake. + 2. Looking for wayland-scanner in the current $PATH + 3. Figuring out the location from pkg-config (as before). + +This will make the package friendlier to cross-compilation, and +then build systems can either prepend their locations for host +tools to $PATH (covered by 2. above), or they can specify the +tool path in the command line (covered by 1. above) if they need +to be more specific. + +The motivation for this patch is to avoid kludges like the following: + + https://patchwork.ozlabs.org/comment/2172010/ + +Signed-off-by: Adrian Perez de Castro <[email protected]> +[Upstream status: https://github.com/Igalia/WPEBackend-fdo/pull/39] + +--- + cmake/FindWaylandScanner.cmake | 93 ++++++++++++++++++++++++++++++---- + 1 file changed, 84 insertions(+), 9 deletions(-) + +diff --git a/cmake/FindWaylandScanner.cmake b/cmake/FindWaylandScanner.cmake +index 09a92b2..7130c10 100644 +--- a/cmake/FindWaylandScanner.cmake ++++ b/cmake/FindWaylandScanner.cmake +@@ -28,15 +28,90 @@ + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-find_package(PkgConfig) +-pkg_check_modules(WAYLAND_SCANNER wayland-scanner) +- +-pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) +-if (WAYLAND_SCANNER_VERSION VERSION_LESS "1.15") +- set(WAYLAND_SCANNER_CODE_ARG "code") +-else () +- set(WAYLAND_SCANNER_CODE_ARG "private-code") ++set(WAYLAND_SCANNER "" CACHE FILEPATH "Path to the wayland-scanner tool") ++ ++function(wayland_scanner_get_version _result _exepath) ++ set(_version "") ++ set(_status -1) ++ if (EXISTS "${_exepath}") ++ execute_process( ++ COMMAND "${_exepath}" "--version" ++ RESULT_VARIABLE _status ++ ERROR_VARIABLE _version ++ ERROR_STRIP_TRAILING_WHITESPACE ++ OUTPUT_QUIET ++ ) ++ if (_status EQUAL 0) ++ string(REPLACE "wayland-scanner" "" _version "${_version}") ++ string(STRIP "${_version}" _version) ++ endif () ++ endif () ++ if (_version) ++ set(${_result} "${_version}" PARENT_SCOPE) ++ else () ++ unset(${_result} PARENT_SCOPE) ++ endif () ++endfunction() ++ ++# ++# Method 1: If -DWAYLAND_SCANNER=... was passed on the command line, ++# check whether we can extract the version number from it. ++# Otherwise: unset the variable, to try other methods below. ++# ++if (WAYLAND_SCANNER) ++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION "${WAYLAND_SCANNER}") ++ if (NOT WAYLAND_SCANNER_VERSION) ++ set(WAYLAND_SCANNER "") ++ endif () ++endif () ++ ++# ++# Method 2: Try to find an executable program in the current $PATH. ++# ++if (NOT WAYLAND_SCANNER) ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) ++ if (WAYLAND_SCANNER_EXECUTABLE) ++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION "${WAYLAND_SCANNER_EXECUTABLE}") ++ if (WAYLAND_SCANNER_VERSION) ++ set(WAYLAND_SCANNER "${WAYLAND_SCANNER_EXECUTABLE}") ++ endif () ++ endif () ++ unset(WAYLAND_SCANNER_EXECUTABLE) ++endif () ++ ++# ++# Method 3: Try to find the executable using pkg-config, in case the ++# tool was installed in a non-standard location. ++# ++if (NOT DEFINED WAYLAND_SCANNER OR NOT WAYLAND_SCANNER) ++ find_package(PkgConfig) ++ pkg_check_modules(WAYLAND_SCANNER_PC wayland-scanner) ++ if (WAYLAND_SCANNER_PC_FOUND) ++ pkg_get_variable(WAYLAND_SCANNER_PC_EXECUTABLE wayland-scanner wayland_scanner) ++ if (WAYLAND_SCANNER_PC_EXECUTABLE) ++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION "${WAYLAND_SCANNER_PC_EXECUTABLE}") ++ if (WAYLAND_SCANNER_VERSION) ++ set(WAYLAND_SCANNER "${WAYLAND_SCANNER_PC_EXECUTABLE}") ++ endif () ++ endif () ++ endif () ++ unset(WAYLAND_SCANNER_PC) ++ unset(WAYLAND_SCANNER_PC_EXECUTABLE) ++endif () ++ ++if (WAYLAND_SCANNER_VERSION) ++ if (WAYLAND_SCANNER_VERSION VERSION_LESS "1.15") ++ set(WAYLAND_SCANNER_CODE_ARG "code") ++ else () ++ set(WAYLAND_SCANNER_CODE_ARG "private-code") ++ endif () + endif () + + include(FindPackageHandleStandardArgs) +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_SCANNER DEFAULT_MSG WAYLAND_SCANNER) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS( ++ WAYLAND_SCANNER ++ DEFAULT_MSG ++ WAYLAND_SCANNER ++ WAYLAND_SCANNER_VERSION ++ WAYLAND_SCANNER_CODE_ARG ++) +-- +2.21.0 +
package/wpebackend-fdo/wpebackend-fdo.hash +4 -4
@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums -md5 2ee81a4212c18110a06a0c51c12e0d2e wpebackend-fdo-1.0.1.tar.xz -sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz -sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8 wpebackend-fdo-1.0.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums +md5 74e1b2fc2bc19933b17ff4f8435f67cd wpebackend-fdo-1.2.0.tar.xz +sha1 60559697512fd483c1d918b708a3d1d130b74a0a wpebackend-fdo-1.2.0.tar.xz +sha256 b1bb261273772af8f7d96d94989fc2ed0445ec06c7eb21f47a1b94e52422ddd5 wpebackend-fdo-1.2.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING
package/wpebackend-fdo/wpebackend-fdo.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.0.1 +WPEBACKEND_FDO_VERSION = 1.2.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES
Signature · 1 line
2.21.0
PATCH v2 1/3 package/wpebackend-fdo: bump to version 1.2.0
Le mar. 21 mai 2019 ? 00:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 9 lines
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
The added patch makes the build system pick the version of wayland-scanner from $(HOST_DIR), instead of the target version.
Signed-off-by Adrian Perez de Castro <[email protected]>
---
Quoted 200 lines
Changes v1 -> v2:
- Included upstream patch which solves picking the correct (host) version of wayland-scanner.--- ...-how-CMake-looks-for-wayland-scanner.patch | 137 ++++++++++++++++++ package/wpebackend-fdo/wpebackend-fdo.hash | 8 +- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 3 files changed, 142 insertions(+), 5 deletions(-) create mode 100644
package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patchdiff --git
a/package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patchb/package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patchnew file mode 100644
index 0000000000..d83902c662
---/dev/null
+++b/package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patchpackage/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch new file +31
-0@@ -0,0 +1,137 @@ +From a03431fb562176d25919e76e0baf52a0ba3752c4 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <[email protected]> +Date: Wed, 15 May 2019 20:54:10 +0300 +Subject: [PATCH] Improve how CMake looks for wayland-scanner + +This improves FindWaylandScanner.cmake to allow it to find the +wayland-scanner tool in any of the following ways (in order of +preference): + + 1. By passing -DWAYLAND_SCANNER=path/to/wayland-scanner to CMake. + 2. Looking for wayland-scanner in the current $PATH + 3. Figuring out the location from pkg-config (as before). + +This will make the package friendlier to cross-compilation, and +then build systems can either prepend their locations for host +tools to $PATH (covered by 2. above), or they can specify the +tool path in the command line (covered by 1. above) if they need +to be more specific. + +The motivation for this patch is to avoid kludges like the following: + + https://patchwork.ozlabs.org/comment/2172010/ + +Signed-off-by: Adrian Perez de Castro <[email protected]> +[Upstream status: https://github.com/Igalia/WPEBackend-fdo/pull/39] + +--- + cmake/FindWaylandScanner.cmake | 93 ++++++++++++++++++++++++++++++---- + 1 file changed, 84 insertions(+), 9 deletions(-) + +diff --git a/cmake/FindWaylandScanner.cmakeb/cmake/FindWaylandScanner.cmake
package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch new file +47
-0+index 09a92b2..7130c10 100644 +--- a/cmake/FindWaylandScanner.cmake ++++ b/cmake/FindWaylandScanner.cmake +@@ -28,15 +28,90 @@ + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-find_package(PkgConfig) +-pkg_check_modules(WAYLAND_SCANNER wayland-scanner) +- +-pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) +-if (WAYLAND_SCANNER_VERSION VERSION_LESS "1.15") +- set(WAYLAND_SCANNER_CODE_ARG "code") +-else () +- set(WAYLAND_SCANNER_CODE_ARG "private-code") ++set(WAYLAND_SCANNER "" CACHE FILEPATH "Path to the wayland-scanner tool") ++ ++function(wayland_scanner_get_version _result _exepath) ++ set(_version "") ++ set(_status -1) ++ if (EXISTS "${_exepath}") ++ execute_process( ++ COMMAND "${_exepath}" "--version" ++ RESULT_VARIABLE _status ++ ERROR_VARIABLE _version ++ ERROR_STRIP_TRAILING_WHITESPACE ++ OUTPUT_QUIET ++ ) ++ if (_status EQUAL 0) ++ string(REPLACE "wayland-scanner" "" _version "${_version}") ++ string(STRIP "${_version}" _version) ++ endif () ++ endif () ++ if (_version) ++ set(${_result} "${_version}" PARENT_SCOPE) ++ else () ++ unset(${_result} PARENT_SCOPE) ++ endif () ++endfunction() ++ ++# ++# Method 1: If -DWAYLAND_SCANNER=... was passed on the command line, ++# check whether we can extract the version number from it. ++# Otherwise: unset the variable, to try other methods below. ++# ++if (WAYLAND_SCANNER) ++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION"${WAYLAND_SCANNER}")
++ if (NOTWAYLAND_SCANNER_VERSION)
++set(WAYLAND_SCANNER "")
++ endif ()
++endif ()
++
++#
++# Method 2: Try to find an executable program in the current $PATH.
++#
++if (NOTWAYLAND_SCANNER)
++find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
++ if (WAYLAND_SCANNER_EXECUTABLE)
++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION
"${WAYLAND_SCANNER_EXECUTABLE}")
++ if (WAYLAND_SCANNER_VERSION)
++set(WAYLAND_SCANNER "${WAYLAND_SCANNER_EXECUTABLE}")
++ endif ()
++ endif ()
++unset(WAYLAND_SCANNER_EXECUTABLE)
++endif ()
++
++#
++# Method 3: Try to find the executable using pkg-config, in case the
++# tool was installed in a non-standard location.
++#
++if (NOT DEFINEDWAYLAND_SCANNEROR NOTWAYLAND_SCANNER)++ find_package(PkgConfig) ++ pkg_check_modules(WAYLAND_SCANNER_PC wayland-scanner) ++ if (WAYLAND_SCANNER_PC_FOUND)++ pkg_get_variable(WAYLAND_SCANNER_PC_EXECUTABLE wayland-scanner
wayland_scanner)
++ if (WAYLAND_SCANNER_PC_EXECUTABLE)
++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION
"${WAYLAND_SCANNER_PC_EXECUTABLE}")
++ if (WAYLAND_SCANNER_VERSION)
++set(WAYLAND_SCANNER "${WAYLAND_SCANNER_PC_EXECUTABLE}")
++ endif ()
++ endif ()++ endif () ++ unset(WAYLAND_SCANNER_PC) ++ unset(WAYLAND_SCANNER_PC_EXECUTABLE)++endif ()
++
++if (WAYLAND_SCANNER_VERSION)
++ if (WAYLAND_SCANNER_VERSIONVERSION_LESS"1.15")
++set(WAYLAND_SCANNER_CODE_ARG "code")
++ else ()
++set(WAYLAND_SCANNER_CODE_ARG "private-code")
++ endif ()
+ endif ()
+
+ include(FindPackageHandleStandardArgs) +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_SCANNERDEFAULT_MSGWAYLAND_SCANNER)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(++ WAYLAND_SCANNER ++ DEFAULT_MSG ++ WAYLAND_SCANNER ++ WAYLAND_SCANNER_VERSION ++ WAYLAND_SCANNER_CODE_ARG++)
+--
+2.21.0(quoted diff) +1
-0+package/wpebackend-fdo/wpebackend-fdo.hash +0
-2@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums -md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums-md5>
2ee81a4212c18110a06a0c51c12e0d2ewpebackend-fdo-1.0.1.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +0
-2-sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz -sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8wpebackend-fdo-1.0.1.tar.xz
package/wpebackend-fdo/wpebackend-fdo.hash +2
-0+# From https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums +md5 <https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums+md5>
74e1b2fc2bc19933b17ff4f8435f67cdwpebackend-fdo-1.2.0.tar.xzpackage/wpebackend-fdo/wpebackend-fdo.hash +2
-0+sha1 60559697512fd483c1d918b708a3d1d130b74a0a wpebackend-fdo-1.2.0.tar.xz +sha256 b1bb261273772af8f7d96d94989fc2ed0445ec06c7eb21f47a1b94e52422ddd5wpebackend-fdo-1.2.0.tar.xz
# Hashes for license files:
sha256c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825
COPYINGpackage/wpebackend-fdo/wpebackend-fdo.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.0.1 +WPEBACKEND_FDO_VERSION = 1.2.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz
Quoted 5 lines
WPEBACKEND_FDO_INSTALL_STAGING= YES
--
2.21.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190521/0c3ed350/attachment.html>
PATCH v2 1/3 package/wpebackend-fdo: bump to version 1.2.0
In reply to Adrian Perez de CastroQuoted 4 lines · On Tue, 21 May 2019 00:40:35 +0300 Adrian Perez de Castro <[email protected]>…
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
Quoted 8 lines
The added patch makes the build system pick the version of wayland-scanner from $(HOST_DIR), instead of the target version.
Signed-off-by Adrian Perez de Castro <[email protected]>---
Changes v1 -> v2:
- Included upstream patch which solves picking the correct (host) version of wayland-scanner.
Series applied to next. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/3 package/wpebackend-fdo: bump to version 1.2.0
Quoted 10 lines · Thomas Petazzoni
Quoted 7 lines · On Tue, 21 May 2019 00:40:35 +0300 Adrian Perez de Castro <[email protected]>…
WPE WebKit 2.24.x requires WPEBackend-fdo 1.2.x, as indicated at:
https://wpewebkit.org/release/schedule/#compatible-components
The added patch makes the build system pick the version of wayland-scanner from $(HOST_DIR), instead of the target version.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Adrian Perez de Castro <[email protected]>---
Changes v1 -> v2:
- Included upstream patch which solves picking the correct (host) version of wayland-scanner.Series applied to next. Thanks!
Awesome \o/
Soon I'll be able to kill the BR2_EXTERNAL that some people have been using now and then... or better, use it as a place to keep our defconfigs and experiments.
Cheers,
?Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190527/61f970c1/attachment.asc>
PATCH v2 2/3 package/wpewebkit: bump to version 2.24.2
In reply to Adrian Perez de CastroThis is a new major release which brings in many improvements and new features. For a complete list, please refer to the release notes:
https://wpewebkit.org/release/wpewebkit-2.24.0.html
https://wpewebkit.org/release/wpewebkit-2.24.1.html
https://wpewebkit.org/release/wpewebkit-2.24.2.html
Updating to version 2.24.2 also includes fixes for CVE-2019-6201, CVE-2019-6251, CVE-2019-7285, CVE-2019-7292, CVE-2019-8503, CVE-2019-8506, CVE-2019-8515, CVE-2019-8518, CVE-2019-8523, CVE-2019-8524, CVE-2019-8535, CVE-2019-8536, CVE-2019-8544, CVE-2019-8551, CVE-2019-8558, CVE-2019-8559, CVE-2019-8563, CVE-2019-11070, CVE-2019-6237, CVE-2019-8571, CVE-2019-8583, CVE-2019-8584, CVE-2019-8586, CVE-2019-8587, CVE-2019-8594, CVE-2019-8595, CVE-2019-8596, CVE-2019-8597, CVE-2019-8601, CVE-2019-8607, CVE-2019-8608, CVE-2019-8609, CVE-2019-8610, CVE-2019-8615, CVE-2019-8611, CVE-2019-8619, CVE-2019-8622, and CVE-2019-8623.
The detailed security advisories can be found at:
https://wpewebkit.org/security/WSA-2019-0002.html
https://wpewebkit.org/security/WSA-2019-0003.html
The BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT configuration symbol is not needed anymore, because the logic to decide whether the JavaScriptCore JIT spport can be enabled has been improved upstream.
One of the new features in 2.24.x is the support for JPEG2000 images, which is implemented using the OpenJPEG library. Therefore now BR2_PACKAGE_OPENJPEG is selected.
This adds one small patch which did not make it to the 2.24.2 release which solves a build issue when the building the GStreamer GL elements is disabled.
---
Changes v1 -> v2:
- Use WPE WebKit 2.24.2 instead of 2.24.1
- Include upstream patch to fix a build issue
--- ...uild-failure-after-r243644-in-GTK-Li.patch | 36 +++++++++++++++++++ package/wpewebkit/Config.in | 17 +-------- package/wpewebkit/wpewebkit.hash | 8 ++--- package/wpewebkit/wpewebkit.mk | 10 ++---- 4 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch
package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch new file +36 -0
@@ -0,0 +1,36 @@ +From a672bbd75f257dd65844ad53dd21fb37345999b5 Mon Sep 17 00:00:00 2001 +From: "aperez at igalia.com" + <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Mon, 20 May 2019 21:20:02 +0000 +Subject: [PATCH] Build failure after r243644 in GTK + Linux 64-bit stable builds https://bugs.webkit.org/show_bug.cgi?id=196440 + +Patch by Pablo Saavedra <[email protected]> on 2019-04-01 +Reviewed by Philippe Normand. + +* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: +(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags): + +Signed-off-by: Adrian Perez de Castro <[email protected]> + +diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +index 608aee2e1b3..c614050972a 100644 +--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp ++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags() + break; + } + ++#if USE(GSTREAMER_GL) + // When the imxvpudecoder is used, the texture sampling of the + // directviv-uploaded texture returns an RGB value, so there's no need to + // convert it. + if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU) + m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG; ++#endif + } + #endif + +-- +2.21.0 +
package/wpewebkit/Config.in +1 -16
@@ -12,22 +12,6 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endian mode. - default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6 - # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258 - # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT
@@ -63,6 +47,7 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBP
package/wpewebkit/wpewebkit.hash +4 -4
@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums -md5 7b768bfae1295ebbc9a9038bf8fb6e6c wpewebkit-2.22.5.tar.xz -sha1 c85f927e0f17f1e7045a5d33c683d310c7af24de wpewebkit-2.22.5.tar.xz -sha256 d5e7b23e4f9e9f1b9d369faa4d527cdb59aef56b3e6a50a16dad243df5f699f3 wpewebkit-2.22.5.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.24.2.tar.xz.sums +md5 3604a2167827c8354f6dcbab98305d7b wpewebkit-2.24.2.tar.xz +sha1 1248d7723d0e6aec52cafc27a92c5c335c1abdd4 wpewebkit-2.24.2.tar.xz +sha256 cf251a467b3bcae50f97e22f4baccca49fcbbd54162dc5b71c0b1ebf655fd95f wpewebkit-2.24.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
package/wpewebkit/wpewebkit.mk +2 -8
@@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.22.5 +WPEWEBKIT_VERSION = 2.24.2 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES
@@ -14,19 +14,13 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ - libpng libxslt wayland-protocols webp wpebackend-fdo + libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF -ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON -else -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -endif - ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y) WPEWEBKIT_CONF_OPTS += \ -DENABLE_VIDEO=ON \
Signature · 1 line
2.21.0
PATCH v2 2/3 package/wpewebkit: bump to version 2.24.2
Le mar. 21 mai 2019 ? 00:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 32 lines
This is a new major release which brings in many improvements and new features. For a complete list, please refer to the release notes:
https://wpewebkit.org/release/wpewebkit-2.24.0.html
https://wpewebkit.org/release/wpewebkit-2.24.1.html
https://wpewebkit.org/release/wpewebkit-2.24.2.htmlUpdating to version 2.24.2 also includes fixes for CVE-2019-6201, CVE-2019-6251, CVE-2019-7285, CVE-2019-7292, CVE-2019-8503, CVE-2019-8506, CVE-2019-8515, CVE-2019-8518, CVE-2019-8523, CVE-2019-8524, CVE-2019-8535, CVE-2019-8536, CVE-2019-8544, CVE-2019-8551, CVE-2019-8558, CVE-2019-8559, CVE-2019-8563, CVE-2019-11070, CVE-2019-6237, CVE-2019-8571, CVE-2019-8583, CVE-2019-8584, CVE-2019-8586, CVE-2019-8587, CVE-2019-8594, CVE-2019-8595, CVE-2019-8596, CVE-2019-8597, CVE-2019-8601, CVE-2019-8607, CVE-2019-8608, CVE-2019-8609, CVE-2019-8610, CVE-2019-8615, CVE-2019-8611, CVE-2019-8619, CVE-2019-8622, and CVE-2019-8623.
The detailed security advisories can be found at:
https://wpewebkit.org/security/WSA-2019-0002.html
https://wpewebkit.org/security/WSA-2019-0003.htmlThe
BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JITconfiguration symbol is not needed anymore, because the logic to decide whether the JavaScriptCore JIT spport can be enabled has been improved upstream.One of the new features in 2.24.x is the support for JPEG2000 images, which is implemented using the OpenJPEG library. Therefore now
BR2_PACKAGE_OPENJPEGis selected.
Quoted 6 lines
This adds one small patch which did not make it to the 2.24.2 release which solves a build issue when the building the GStreamer GL elements is disabled.
Signed-off-by Adrian Perez de Castro <[email protected]>
Quoted 163 lines
---
Changes v1 -> v2:
- Use WPE WebKit 2.24.2 instead of 2.24.1
- Include upstream patch to fix a build issue--- ...uild-failure-after-r243644-in-GTK-Li.patch | 36 +++++++++++++++++++ package/wpewebkit/Config.in | 17 +-------- package/wpewebkit/wpewebkit.hash | 8 ++--- package/wpewebkit/wpewebkit.mk | 10 ++---- 4 files changed, 43 insertions(+), 28 deletions(-) create mode 100644
package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patchdiff --git
a/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patchb/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patchnew file mode 100644
index 0000000000..748fc8e46epackage/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch new file +6
-0@@ -0,0 +1,36 @@ +From a672bbd75f257dd65844ad53dd21fb37345999b5 Mon Sep 17 00:00:00 2001 +From: "aperez at igalia.com" + <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Mon, 20 May 2019 21:20:02 +0000 +Subject: [PATCH] Build failure after r243644 in GTK + Linux 64-bit stable buildshttps://bugs.webkit.org/show_bug.cgi?id=196440
package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch new file +10
-0+ +Patch by Pablo Saavedra <[email protected]> on 2019-04-01 +Reviewed by Philippe Normand. + +* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: +(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags): + +Signed-off-by: Adrian Perez de Castro <[email protected]> + +diff --gita/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +index
608aee2e1b3..c614050972a100644
+---
a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
++++
b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +@@ -1000,11 +1000,13 @@ voidMediaPlayerPrivateGStreamerBase::updateTextureMapperFlags()package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch new file +6
-0+ break; + } + ++#if USE(GSTREAMER_GL) + // When the imxvpudecoder is used, the texture sampling of the + // directviv-uploaded texture returns an RGB value, so there's noneed to
package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch new file +10
-0+ // convert it. + if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU) + m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG; ++#endif + } + #endif + +-- +2.21.0 +package/wpewebkit/Config.in +0
-5@@ -12,22 +12,6 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endianmode.
package/wpewebkit/Config.in +0
-6- default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, andR6
- # is unsupported, see
https://bugs.webkit.org/show_bug.cgi?id=191258package/wpewebkit/Config.in +0
-4- # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamiclibrary, gcc >= 4.8, host gcc >= 4.8"
depends onBR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTSdepends on !BR2_BINFMT_FLATpackage/wpewebkit/Config.in +1
-0@@ -63,6 +47,7 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBPpackage/wpewebkit/wpewebkit.hash +0
-2@@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums -md5 <https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums-md5>
7b768bfae1295ebbc9a9038bf8fb6e6cwpewebkit-2.22.5.tar.xzpackage/wpewebkit/wpewebkit.hash +0
-2-sha1 c85f927e0f17f1e7045a5d33c683d310c7af24de wpewebkit-2.22.5.tar.xz -sha256 d5e7b23e4f9e9f1b9d369faa4d527cdb59aef56b3e6a50a16dad243df5f699f3wpewebkit-2.22.5.tar.xz
package/wpewebkit/wpewebkit.hash +2
-0+# From https://wpewebkit.org/releases/wpewebkit-2.24.2.tar.xz.sums +md5 <https://wpewebkit.org/releases/wpewebkit-2.24.2.tar.xz.sums+md5>
3604a2167827c8354f6dcbab98305d7bwpewebkit-2.24.2.tar.xzpackage/wpewebkit/wpewebkit.hash +2
-0+sha1 1248d7723d0e6aec52cafc27a92c5c335c1abdd4 wpewebkit-2.24.2.tar.xz +sha256 cf251a467b3bcae50f97e22f4baccca49fcbbd54162dc5b71c0b1ebf655fd95fwpewebkit-2.24.2.tar.xz
# Hashes for license files:
sha2560b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4
Source/WebCore/LICENSE-APPLEpackage/wpewebkit/ renamed from package/wpewebkit/wpewebkit.mk +0
-0wpewebkit.mk
index73ad534acd..b59a1f793a100644package/wpewebkit/wpewebkit.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.22.5 +WPEWEBKIT_VERSION = 2.24.2 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
WPEWEBKIT_INSTALL_STAGING= YESpackage/wpewebkit/wpewebkit.mk +1
-7@@ -14,19 +14,13 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ - libpng libxslt wayland-protocols webp wpebackend-fdo + libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF -ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON -else -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -endif - ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y) WPEWEBKIT_CONF_OPTS += \-DENABLE_VIDEO=ON \
Quoted 4 lines
--
2.21.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190521/ab340e76/attachment.html>
PATCH v2 3/3 package/cog: bump version to 0.3.0
In reply to Adrian Perez de CastroVersion 0.2.0 does not work with WPE WebKit 2.22.x, this is the first version which can be used with 2.24.x
---
Changes v1 -> v2:
- No changes.
--- package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/cog/cog.hash +1 -1
@@ -1,5 +1,5 @@ # Locally generated -sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz +sha256 755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedaf cog-v0.3.0.tar.gz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING
package/cog/cog.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = v0.2.0 +COG_VERSION = v0.3.0 COG_SITE = $(call github,Igalia,cog,$(COG_VERSION)) COG_INSTALL_STAGING = YES COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo
Signature · 1 line
2.21.0
PATCH v2 3/3 package/cog: bump version to 0.3.0
Le mar. 21 mai 2019 ? 00:24, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 5 lines
Version 0.2.0 does not work with WPE WebKit 2.22.x, this is the first version which can be used with 2.24.x
Signed-off-by Adrian Perez de Castro <[email protected]>
Quoted 36 lines
---
Changes v1 -> v2:
- No changes.--- package/cog/cog.hash | 2 +- package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/cog/cog.hash +0
-1@@ -1,5 +1,5 @@ # Locally generated -sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06cog-v0.2.0.tar.gz
+sha256755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedafcog-v0.3.0.tar.gz# Hashes for license files:
sha256e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252
COPYINGpackage/cog/cog.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = v0.2.0 +COG_VERSION = v0.3.0 COG_SITE = $(call github,Igalia,cog,$(COG_VERSION)) COG_INSTALL_STAGING = YES
Quoted 5 lines
COG_DEPENDENCIES= dbus wpewebkit wpebackend-fdo
--
2.21.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190521/e7d9d2b8/attachment.html>