wpewebkit: update to 2.48.3

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

diff --git a/libs/wpewebkit/Makefile b/libs/wpewebkit/Makefile
index 54f80df451036c50c7556159ee190a6dd1cabd50..a068d0cd593eceb188c3880fc9baad96486162d1 100644 (file)
--- a/libs/wpewebkit/Makefile
+++ b/libs/wpewebkit/Makefile
@@ -1,18 +1,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpewebkit
-PKG_VERSION:=2.46.7
+PKG_VERSION:=2.48.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://wpewebkit.org/releases
-PKG_HASH:=cf3e47638595d86de96abdb94db69a836c8aa509fc063be714f52c5a24bb5cd5
+PKG_HASH:=807571f07e87823b8fb79564692c9b1ef81ee62edbf51345a15bd0e7e1f2e07b
 
 PKG_MAINTAINER:=Daniel Golle <[email protected]>
 PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause
 PKG_LICENSE_FILES:=Source/WebCore/LICENSE-Apple Source/Webcore/LICENSE-LGPL-2.1
 
 PKG_BUILD_DEPENDS:=unifdef/host ruby/host
+PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_wpewebkit-minibrowser
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -136,15 +137,16 @@ define Package/libwpewebkit/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/wpe-webkit-2.0/injected-bundle/*.so \
                $(1)/usr/lib/wpe-webkit-2.0/injected-bundle
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/wpe-webkit-2.0/*.so \
-                      $(1)/usr/lib/wpe-webkit-2.0
        $(INSTALL_DIR) $(1)/usr/libexec/wpe-webkit-2.0
-#      $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/wpe-webkit-2.0/WPEGPUProcess \
-#              $(1)/usr/libexec/wpe-webkit-2.0
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/wpe-webkit-2.0/WPEGPUProcess \
+               $(1)/usr/libexec/wpe-webkit-2.0
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/wpe-webkit-2.0/WPENetworkProcess \
                $(1)/usr/libexec/wpe-webkit-2.0
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/wpe-webkit-2.0/WPEWebProcess \
                $(1)/usr/libexec/wpe-webkit-2.0
+       $(INSTALL_DIR) $(1)/usr/share/wpe-webkit-2.0
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/wpe-webkit-2.0/inspector.gresource \
+               $(1)/usr/share/wpe-webkit-2.0
 endef
 
 define Package/wpewebkit-driver/install

diff --git a/libs/wpewebkit/patches/110-fix-gstreamer-id-tracking.patch b/libs/wpewebkit/patches/110-fix-gstreamer-id-tracking.patch
index 42e05d76981253c577bb060b68adb3e2d6eabbac..b979ba5099d82fa3cbee3c87ebb918e060111ad1 100644 (file)
--- a/libs/wpewebkit/patches/110-fix-gstreamer-id-tracking.patch
+++ b/libs/wpewebkit/patches/110-fix-gstreamer-id-tracking.patch
@@ -1,14 +1,14 @@
 --- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp
 +++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp
-@@ -184,6 +184,7 @@ void MediaSourcePrivateGStreamer::startP
-     m_playerPrivate.startSource(tracks);
+@@ -216,6 +216,7 @@ void MediaSourcePrivateGStreamer::startP
+     player->startSource(tracks);
  }
  
 +#if !RELEASE_LOG_DISABLED
  TrackID MediaSourcePrivateGStreamer::registerTrackId(TrackID preferredId)
  {
      ASSERT(isMainThread());
-@@ -218,6 +219,7 @@ bool MediaSourcePrivateGStreamer::unregi
+@@ -255,6 +256,7 @@ bool MediaSourcePrivateGStreamer::unregi
  
      return res;
  }
@@ -18,7 +18,7 @@
  {
 --- a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
 +++ b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
-@@ -270,6 +270,7 @@ WTFLogChannel& SourceBufferPrivateGStrea
+@@ -283,6 +283,7 @@ WTFLogChannel& SourceBufferPrivateGStrea
  }
  #endif
  
@@ -26,7 +26,7 @@
  std::optional<TrackID> SourceBufferPrivateGStreamer::tryRegisterTrackId(TrackID preferredId)
  {
      ASSERT(isMainThread());
-@@ -291,6 +292,18 @@ bool SourceBufferPrivateGStreamer::tryUn
+@@ -304,6 +305,18 @@ bool SourceBufferPrivateGStreamer::tryUn
  
      return downcast<MediaSourcePrivateGStreamer>(mediaSource)->unregisterTrackId(trackId);
  }