Re: [Buildroot] [PATCH 3/4] package/wpewebkit: bump to version 2.34.1

[Arnout Vandecappelle <arnout@mind.be>]

On 26/10/2021 00:44, Adrian Perez de Castro wrote:
> Update to a new major release which brings in improvements and a number
> of new features. Release notes:
> 
>    https://wpewebkit.org/release/wpewebkit-2.34.0.html
>    https://wpewebkit.org/release/wpewebkit-2.34.1.html
> 
> Some of the new features require additional dependencies: HTTP/2
> requires libsoup3, which is not yet in packaged in Buildroot, and
> disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2);
> and the color management support needs LCMS2 (which will be enabled
> in a follow-up patch.)
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>   ...e-build-issues-with-ENABLE_VIDEO-OFF.patch | 78 +++++++++++++++++++
>   package/wpewebkit/wpewebkit.hash              |  8 +-
>   package/wpewebkit/wpewebkit.mk                |  4 +-
>   3 files changed, 85 insertions(+), 5 deletions(-)
>   create mode 100644 package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch
> 
> diff --git a/package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch b/package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch
> new file mode 100644
> index 0000000000..51212dd82d
> --- /dev/null
> +++ b/package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch
> @@ -0,0 +1,78 @@
> +From afc83d41293333f694630451f865a7a257a9b917 Mon Sep 17 00:00:00 2001
> +From: Adrian Perez de Castro <aperez@igalia.com>
> +Date: Mon, 25 Oct 2021 23:45:15 +0300
> +Subject: [PATCH] [WPE][GTK] Multiple build issues with ENABLE_VIDEO=OFF
> + https://bugs.webkit.org/show_bug.cgi?id=232264
> +
> +.:
> +
> +Reviewed by NOBODY (OOPS!).
> +
> +* Source/cmake/WebKitFeatures.cmake: Make ENABLE_MEDIA_SESSION depend on ENABLE_VIDEO.
> +
> +Source/WebCore:
> +
> +Reviewed by NOBODY (OOPS!).
> +
> +No new tests needed.
> +
> +* accessibility/AXObjectCache.cpp:
> +(WebCore::isSimpleImage): Guard usage of HTMLMediaElement with ENABLE(VIDEO).
> +* page/EventHandler.cpp:
> +(WebCore::EventHandler::textRecognitionCandidateElement const): Ditto.
> +* platform/graphics/BifurcatedGraphicsContext.cpp: Ditto.
> +* platform/graphics/displaylists/DisplayListRecorder.h: Guard usage of MediaPlayer with
> +ENABLE(VIDEO).
> +* platform/graphics/displaylists/DisplayListRecorderImpl.cpp: Ditto.
> +* platform/graphics/displaylists/DisplayListRecorderImpl.h: Ditto.
> +
> +Source/WebKit:
> +
> +* WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp:
> +(WebKit::createShareableBitmap): Guard usage of RenderVideo with ENABLE(VIDEO).
> +
> +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> +---
> +Upstream status: https://bugs.webkit.org/show_bug.cgi?id=232264

  Since this has landed now, I've changed it into the trac link.

  Regards,
  Arnout

> +
> + Source/WebCore/accessibility/AXObjectCache.cpp                 | 2 ++
> + Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp | 2 ++
> + 2 files changed, 4 insertions(+)
> +
> +diff --git a/Source/WebCore/accessibility/AXObjectCache.cpp b/Source/WebCore/accessibility/AXObjectCache.cpp
> +index f2451102040..930b969dcc2 100644
> +--- a/Source/WebCore/accessibility/AXObjectCache.cpp
> ++++ b/Source/WebCore/accessibility/AXObjectCache.cpp
> +@@ -528,9 +528,11 @@ static bool isSimpleImage(const RenderObject& renderer)
> +         || (is<HTMLImageElement>(node) && downcast<HTMLImageElement>(node)->hasAttributeWithoutSynchronization(usemapAttr)))
> +         return false;
> +
> ++#if ENABLE(VIDEO)
> +     // Exclude video and audio elements.
> +     if (is<HTMLMediaElement>(node))
> +         return false;
> ++#endif // ENABLE(VIDEO)
> +
> +     return true;
> + }
> +diff --git a/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp b/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp
> +index c0ce72c5ffc..d7ead303f3c 100644
> +--- a/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp
> ++++ b/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp
> +@@ -269,11 +269,13 @@ void BifurcatedGraphicsContext::drawPattern(NativeImage& nativeImage, const Floa
> +     m_secondaryContext.drawPattern(nativeImage, imageSize, destRect, tileRect, patternTransform, phase, spacing, options);
> + }
> +
> ++#if ENABLE(VIDEO)
> + void BifurcatedGraphicsContext::paintFrameForMedia(MediaPlayer& player, const FloatRect& destination)
> + {
> +     m_primaryContext.paintFrameForMedia(player, destination);
> +     m_secondaryContext.paintFrameForMedia(player, destination);
> + }
> ++#endif // ENABLE(VIDEO)
> +
> + void BifurcatedGraphicsContext::scale(const FloatSize& scale)
> + {
> +--
> +2.33.1
> +
> diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
> index ff8bd1f30a..acb3ec4a3e 100644
> --- a/package/wpewebkit/wpewebkit.hash
> +++ b/package/wpewebkit/wpewebkit.hash
> @@ -1,7 +1,7 @@
> -# From https://wpewebkit.org/releases/wpewebkit-2.32.4.tar.xz.sums
> -md5  94ca1cc3f7b2de8b96c59d6e59cafcd0  wpewebkit-2.32.4.tar.xz
> -sha1  19b8ebdbfef193ca50f7625703d871db87624f86  wpewebkit-2.32.4.tar.xz
> -sha256  381f1422cbc319db1aa42dda48de39590ed90ac3bec6b81ec83f3f2cae5c3eeb  wpewebkit-2.32.4.tar.xz
> +# From https://wpewebkit.org/releases/wpewebkit-2.34.1.tar.xz.sums
> +md5  915e583b0e7e82efa155cbce917d6319  wpewebkit-2.34.1.tar.xz
> +sha1  452081b6df9d079f26d22bd0dca9e90f87943089  wpewebkit-2.34.1.tar.xz
> +sha256  cb336986341be9c3a9b1ca2c18de0d29d90ae4e77b9967a6f6879597e7a969f7  wpewebkit-2.34.1.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 0242f7a288..606a1531c0 100644
> --- a/package/wpewebkit/wpewebkit.mk
> +++ b/package/wpewebkit/wpewebkit.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -WPEWEBKIT_VERSION = 2.32.4
> +WPEWEBKIT_VERSION = 2.34.1
>   WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
>   WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
>   WPEWEBKIT_INSTALL_STAGING = YES
> @@ -23,6 +23,8 @@ WPEWEBKIT_CONF_OPTS = \
>   	-DENABLE_ACCESSIBILITY=OFF \
>   	-DENABLE_API_TESTS=OFF \
>   	-DENABLE_MINIBROWSER=OFF \
> +	-DUSE_LCMS=OFF \
> +	-DUSE_SOUP2=ON \
>   	-DSILENCE_CROSS_COMPILATION_NOTICES=ON
>   
>   ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y)
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot