[Buildroot] [PATCH/next v2 2/3] package/wpewebkit: bump to version 2.24.2

["François Perrad" <francois.perrad@gadz.org>]

Le mar. 21 mai 2019 ? 00:24, Adrian Perez de Castro <aperez@igalia.com> a
?crit :

> 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.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.
>
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
>

Acked-by: Francois Perrad <francois.perrad@gadz.org>


> ---
> 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
>
> diff --git
> a/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch
> b/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch
> new file mode 100644
> index 0000000000..748fc8e46e
> --- /dev/null
> +++ b/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch
> @@ -0,0 +1,36 @@
> +From a672bbd75f257dd65844ad53dd21fb37345999b5 Mon Sep 17 00:00:00 2001
> +From: "aperez at igalia.com"
> + <aperez@igalia.com@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 <psaavedra@igalia.com> on 2019-04-01
> +Reviewed by Philippe Normand.
> +
> +* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
> +(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
> +
> +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> +
> +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
> +
> diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in
> index 04ebe5452b..ff5775c735 100644
> --- a/package/wpewebkit/Config.in
> +++ b/package/wpewebkit/Config.in
> @@ -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
> diff --git a/package/wpewebkit/wpewebkit.hash
> b/package/wpewebkit/wpewebkit.hash
> index cbf253d29c..ddab159d4f 100644
> --- a/package/wpewebkit/wpewebkit.hash
> +++ b/package/wpewebkit/wpewebkit.hash
> @@ -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>
> 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 <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
> diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/
> wpewebkit.mk
> index 73ad534acd..b59a1f793a 100644
> --- a/package/wpewebkit/wpewebkit.mk
> +++ b/package/wpewebkit/wpewebkit.mk
> @@ -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 \
> --
> 2.21.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190521/ab340e76/attachment.html>