wpewebkit: update to version 2.50.1

Signed-off-by: Daniel Golle <[email protected]>

diff --git a/libs/wpewebkit/Makefile b/libs/wpewebkit/Makefile
index a068d0cd593eceb188c3880fc9baad96486162d1..64137b623c6433371df09a0af8be597f9faf5e78 100644 (file)
--- a/libs/wpewebkit/Makefile
+++ b/libs/wpewebkit/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpewebkit
-PKG_VERSION:=2.48.3
+PKG_VERSION:=2.50.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://wpewebkit.org/releases
-PKG_HASH:=807571f07e87823b8fb79564692c9b1ef81ee62edbf51345a15bd0e7e1f2e07b
+PKG_HASH:=305437a4ba869e4106c1d4a8cb2a7be3f43b75d9d026e9b97c6f6debc04a673b
 
 PKG_MAINTAINER:=Daniel Golle <[email protected]>
 PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause
@@ -63,9 +63,9 @@ define Package/libwpewebkit
   DEPENDS:=+bubblewrap +glib2 +gst1-mod-opengl +harfbuzz +icu-full-data \
           +libepoxy +libgcrypt +libgst1allocators +libgst1app +libgst1audio \
           +libgst1fft +libgst1gl +libgst1pbutils +libgst1tag \
-          +libgst1transcoder +libgst1video +libinput +libjpeg +libpng \
-          +libseccomp +libsoup3 +libsqlite3 +libtasn1 +libudev +libwayland \
-          +libwebp +libwpe +libxml2 +libxslt +zlib \
+          +libgst1transcoder +libgst1video +libinput +libmanette +libjpeg \
+          +libpng +libseccomp +libsoup3 +libsqlite3 +libtasn1 +libudev \
+          +libwayland +libwebp +libwpe +libxml2 +libxslt +zlib \
           @(arm_v7||i386||i686||ARCH_64BIT)
 endef
 

diff --git a/libs/wpewebkit/patches/110-fix-gstreamer-id-tracking.patch b/libs/wpewebkit/patches/110-fix-gstreamer-id-tracking.patch
deleted file mode 100644 (file)
index b979ba5..0000000
--- a/libs/wpewebkit/patches/110-fix-gstreamer-id-tracking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp
-@@ -216,6 +216,7 @@ void MediaSourcePrivateGStreamer::startP
-     player->startSource(tracks);
- }
- 
-+#if !RELEASE_LOG_DISABLED
- TrackID MediaSourcePrivateGStreamer::registerTrackId(TrackID preferredId)
- {
-     ASSERT(isMainThread());
-@@ -255,6 +256,7 @@ bool MediaSourcePrivateGStreamer::unregi
- 
-     return res;
- }
-+#endif
- 
- void MediaSourcePrivateGStreamer::notifyActiveSourceBuffersChanged()
- {
---- a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
-@@ -283,6 +283,7 @@ WTFLogChannel& SourceBufferPrivateGStrea
- }
- #endif
- 
-+#if !RELEASE_LOG_DISABLED
- std::optional<TrackID> SourceBufferPrivateGStreamer::tryRegisterTrackId(TrackID preferredId)
- {
-     ASSERT(isMainThread());
-@@ -304,6 +305,18 @@ bool SourceBufferPrivateGStreamer::tryUn
- 
-     return downcast<MediaSourcePrivateGStreamer>(mediaSource)->unregisterTrackId(trackId);
- }
-+#else
-+std::optional<TrackID> SourceBufferPrivateGStreamer::tryRegisterTrackId(TrackID preferredId)
-+{
-+    return std::nullopt;
-+}
-+
-+bool SourceBufferPrivateGStreamer::tryUnregisterTrackId(TrackID trackId)
-+{
-+    return false;
-+}
-+#endif
-+
- 
- size_t SourceBufferPrivateGStreamer::platformMaximumBufferSize() const
- {

diff --git a/libs/wpewebkit/patches/122-fix-arm-thumb2-detection.patch b/libs/wpewebkit/patches/122-fix-arm-thumb2-detection.patch
deleted file mode 100644 (file)
index d73dc3c..0000000
--- a/libs/wpewebkit/patches/122-fix-arm-thumb2-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Source/cmake/OptionsCommon.cmake
-+++ b/Source/cmake/OptionsCommon.cmake
-@@ -20,17 +20,17 @@ if (WTF_CPU_ARM)
-     int main() {}
-     ")
- 
--    if (COMPILER_IS_CLANG AND NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
--        set(CLANG_EXTRA_ARM_ARGS " -mthumb")
-+    if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
-+        set(EXTRA_ARM_ARGS " -mthumb")
-     endif ()
- 
--    set(CMAKE_REQUIRED_FLAGS "${CLANG_EXTRA_ARM_ARGS}")
-+    set(CMAKE_REQUIRED_FLAGS "${EXTRA_ARM_ARGS}")
-     CHECK_CXX_SOURCE_COMPILES("${ARM_THUMB2_TEST_SOURCE}" ARM_THUMB2_DETECTED)
-     unset(CMAKE_REQUIRED_FLAGS)
- 
-     if (ARM_THUMB2_DETECTED AND NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
--        string(APPEND CMAKE_C_FLAGS " ${CLANG_EXTRA_ARM_ARGS}")
--        string(APPEND CMAKE_CXX_FLAGS " ${CLANG_EXTRA_ARM_ARGS}")
-+        string(APPEND CMAKE_C_FLAGS " ${EXTRA_ARM_ARGS}")
-+        string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_ARM_ARGS}")
-     endif ()
- endif ()
- 

diff --git a/libs/wpewebkit/patches/130-libpas-detect-backtrace-like-StackTrace.patch b/libs/wpewebkit/patches/130-libpas-detect-backtrace-like-StackTrace.patch
new file mode 100644 (file)
index 0000000..118d5dd
--- /dev/null
+++ b/libs/wpewebkit/patches/130-libpas-detect-backtrace-like-StackTrace.patch
@@ -0,0 +1,21 @@
+--- a/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c
++++ b/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c
+@@ -48,7 +48,7 @@
+ #endif
+ 
+ /* PlayStation does not currently support the backtrace API. Android API versions < 33 don't, either. Windows does not either. */
+-#if !PAS_PLATFORM(PLAYSTATION) && (!PAS_OS(ANDROID) || __ANDROID_API__ >= 33) && !PAS_OS(WINDOWS)
++#if !PAS_PLATFORM(PLAYSTATION) && (!PAS_OS(ANDROID) || __ANDROID_API__ >= 33) && !PAS_OS(WINDOWS) && defined(HAVE_EXECINFO_H) && HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #else
+ size_t backtrace(void** buffer, size_t size)
+--- a/Source/cmake/OptionsCommon.cmake
++++ b/Source/cmake/OptionsCommon.cmake
+@@ -309,6 +309,7 @@ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_SYS_PARAM
+ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_SYS_TIME_H sys/time.h)
+ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_SYS_TIMEB_H sys/timeb.h)
+ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_LINUX_MEMFD_H linux/memfd.h)
++WEBKIT_CHECK_HAVE_INCLUDE(HAVE_EXECINFO_H execinfo.h)
+ 
+ # Check for functions
+ # _GNU_SOURCE=1 is required to expose statx