Date: Mon, 27 Sep 2021 08:40:09 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 895bc805a975 - main - www/webkit2-gtk3: update to 2.34.0 Message-ID: <202109270840.18R8e9bN044971@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=895bc805a975e4d6848427d88063cc8651e36fe4 commit 895bc805a975e4d6848427d88063cc8651e36fe4 Author: Evgeniy Khramtsov <evgeniy@khramtsov.org> AuthorDate: 2021-09-22 22:57:30 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2021-09-27 08:38:52 +0000 www/webkit2-gtk3: update to 2.34.0 PR: 255528 Changes: https://webkitgtk.org/2021/03/18/webkitgtk2.30.6-released.html https://webkitgtk.org/2021/03/26/webkitgtk2.32.0-released.html https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.html https://webkitgtk.org/2021/05/14/webkitgtk2.33.1-released.html https://webkitgtk.org/2021/06/08/webkitgtk2.33.2-released.html https://webkitgtk.org/2021/07/09/webkitgtk2.32.2-released.html https://webkitgtk.org/2021/07/23/webkitgtk2.32.3-released.html https://webkitgtk.org/2021/08/16/webkitgtk2.33.3-released.html https://webkitgtk.org/2021/09/17/webkitgtk2.32.4-released.html https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html --- www/webkit2-gtk3/Makefile | 13 +- www/webkit2-gtk3/distinfo | 6 +- www/webkit2-gtk3/files/patch-CMakeLists.txt | 14 -- .../files/patch-Source-cmake-OptionsCommon.cmake | 12 +- ...ource_JavaScriptCore_assembler_ARM64Assembler.h | 4 +- ...ource_JavaScriptCore_assembler_ARMv7Assembler.h | 4 +- ...urce_JavaScriptCore_jit_ExecutableAllocator.cpp | 4 +- .../files/patch-Source_JavaScriptCore_jsc.cpp | 4 +- ...patch-Source_JavaScriptCore_offlineasm_arm64.rb | 4 +- ...rce_JavaScriptCore_runtime_NativeExecutable.cpp | 4 +- .../files/patch-Source_WTF_wtf_RAMSize.cpp | 27 +-- ...urce_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp | 4 +- ..._WebCore_platform_graphics_egl_GLContextEGL.cpp | 11 -- ...re_platform_graphics_x11_PlatformDisplayX11.cpp | 23 --- .../patch-Source_WebCore_platform_network_DNS.h | 4 +- .../files/patch-Source_bmalloc_bmalloc_BPlatform.h | 4 +- .../files/patch-Source_cmake_WebKitCommon.cmake | 14 ++ www/webkit2-gtk3/files/patch-revert-11ccaf183fad | 211 +++++++++++++++++++++ www/webkit2-gtk3/pkg-plist | 7 +- 19 files changed, 275 insertions(+), 99 deletions(-) diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 4ea4a3bedc4a..324174735da9 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -1,8 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> PORTNAME= webkit -DISTVERSION= 2.30.5 -PORTREVISION= 2 +DISTVERSION= 2.34.0 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 @@ -54,9 +53,11 @@ CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0 CMAKE_ARGS= -DPORT=GTK CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \ ENABLE_GLES2 \ - USE_SYSTEMD + USE_SYSTEMD \ + ENABLE_GAMEPAD CMAKE_ON= ENABLE_MINIBROWSER \ - USE_SYSTEM_MALLOC + USE_SYSTEM_MALLOC \ + USE_SOUP2 CMAKE_OFF_armv6= ENABLE_JIT CMAKE_OFF_armv7= ENABLE_JIT CMAKE_OFF_powerpc= ENABLE_JIT @@ -96,10 +97,6 @@ WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ libwpe-1.0.so:www/libwpe \ libWPEBackend-fdo-1.0.so:www/wpebackend-fdo -post-patch: - @${REINPLACE_CMD} -e 's|/usr/lib/browser/plugins|${BROWSER_PLUGINS_DIR}|' \ - ${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp - pre-configure: # .if !exists() evaluates too early before cairo has a chance to be installed @if ! pkg-config --exists cairo-egl; then \ diff --git a/www/webkit2-gtk3/distinfo b/www/webkit2-gtk3/distinfo index d08d50c6fe86..191c53042ef1 100644 --- a/www/webkit2-gtk3/distinfo +++ b/www/webkit2-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613230723 -SHA256 (gnome/webkitgtk-2.30.5.tar.xz) = 7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f -SIZE (gnome/webkitgtk-2.30.5.tar.xz) = 22311832 +TIMESTAMP = 1632350519 +SHA256 (gnome/webkitgtk-2.34.0.tar.xz) = 880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34 +SIZE (gnome/webkitgtk-2.34.0.tar.xz) = 24998292 diff --git a/www/webkit2-gtk3/files/patch-CMakeLists.txt b/www/webkit2-gtk3/files/patch-CMakeLists.txt deleted file mode 100644 index e4a6eeeb1f90..000000000000 --- a/www/webkit2-gtk3/files/patch-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- CMakeLists.txt.orig 2020-08-12 09:17:37 UTC -+++ CMakeLists.txt -@@ -109,9 +109,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64 - endif () - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") - set(WTF_CPU_X86 1) --elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") -+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)") - set(WTF_CPU_PPC 1) --elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)") - set(WTF_CPU_PPC64 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") - set(WTF_CPU_PPC64LE 1) diff --git a/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake b/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake index 0d23fd122bfb..f830b5c9116a 100644 --- a/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake +++ b/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake @@ -1,11 +1,11 @@ ---- Source/cmake/OptionsCommon.cmake.orig 2020-03-01 08:15:43.203077000 +1300 -+++ Source/cmake/OptionsCommon.cmake 2020-03-01 08:14:23.672978000 +1300 -@@ -155,7 +155,7 @@ +--- Source/cmake/OptionsCommon.cmake.orig 2021-09-22 23:05:58 UTC ++++ Source/cmake/OptionsCommon.cmake +@@ -144,7 +144,7 @@ WEBKIT_CHECK_HAVE_FUNCTION(HAVE_VASPRINTF vasprintf) # Check for symbols WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h) if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")) --WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h) -+#WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h) +- WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h) ++ #WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h) endif () + WEBKIT_CHECK_HAVE_SYMBOL(HAVE_TIMINGSAFE_BCMP timingsafe_bcmp string.h) # Windows has signal.h but is missing symbols that are used in calls to signal. - WEBKIT_CHECK_HAVE_SYMBOL(HAVE_SIGNAL_H SIGTRAP signal.h) diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h index 806540151f1c..181df653d2f1 100644 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h @@ -1,6 +1,6 @@ ---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2020-08-12 09:17:52 UTC +--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2021-09-22 23:05:58 UTC +++ Source/JavaScriptCore/assembler/ARM64Assembler.h -@@ -2825,6 +2825,8 @@ class ARM64Assembler { (public) +@@ -2950,6 +2950,8 @@ class ARM64Assembler { (public) { #if OS(DARWIN) sys_cache_control(kCacheFunctionPrepareForExecution, code, size); diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h index 01f641222269..42294c5de4bc 100644 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h @@ -1,6 +1,6 @@ ---- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2020-08-12 09:17:52 UTC +--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2021-09-22 23:05:58 UTC +++ Source/JavaScriptCore/assembler/ARMv7Assembler.h -@@ -2396,6 +2396,8 @@ class ARMv7Assembler { (public) +@@ -2402,6 +2402,8 @@ class ARMv7Assembler { (public) { #if OS(DARWIN) sys_cache_control(kCacheFunctionPrepareForExecution, code, size); diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp index ef345c16b335..4682641a2130 100644 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp @@ -1,6 +1,6 @@ ---- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2021-02-07 10:45:05 UTC +--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2021-09-22 23:05:58 UTC +++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp -@@ -76,7 +76,7 @@ namespace JSC { +@@ -95,7 +95,7 @@ namespace JSC { using namespace WTF; diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp index c01af45d95f4..5ed01ccd90af 100644 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp @@ -1,6 +1,6 @@ ---- Source/JavaScriptCore/jsc.cpp.orig 2020-08-12 09:17:53 UTC +--- Source/JavaScriptCore/jsc.cpp.orig 2021-09-22 23:05:58 UTC +++ Source/JavaScriptCore/jsc.cpp -@@ -94,6 +94,9 @@ +@@ -100,6 +100,9 @@ #else #include <unistd.h> #endif diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb index 5989f8958ae9..6dc60845f9aa 100644 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb @@ -1,6 +1,6 @@ ---- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2020-08-12 09:17:53 UTC +--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2021-09-22 23:05:58 UTC +++ Source/JavaScriptCore/offlineasm/arm64.rb -@@ -1098,7 +1098,7 @@ class Instruction +@@ -1127,7 +1127,7 @@ class Instruction $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]" # On Linux, use ELF GOT relocation specifiers. diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp index 326b47573b1e..47a726b426cb 100644 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp @@ -1,4 +1,4 @@ ---- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig 2021-02-15 20:45:27 UTC +--- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig 2021-09-22 23:05:58 UTC +++ Source/JavaScriptCore/runtime/NativeExecutable.cpp @@ -24,6 +24,7 @@ */ @@ -7,4 +7,4 @@ +#include "ExecutableBaseInlines.h" #include "NativeExecutable.h" - #include "JSCInlines.h" + #include "ExecutableBaseInlines.h" diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp index f64849bc6466..8c6b00de1d48 100644 --- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp +++ b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp @@ -1,17 +1,15 @@ ---- Source/WTF/wtf/RAMSize.cpp.orig 2020-08-12 09:17:54 UTC +--- Source/WTF/wtf/RAMSize.cpp.orig 2021-09-22 23:29:42 UTC +++ Source/WTF/wtf/RAMSize.cpp -@@ -34,6 +34,10 @@ - #if OS(LINUX) +@@ -35,6 +35,8 @@ #include <sys/sysinfo.h> - #endif // OS(LINUX) -+#if OS(FREEBSD) + #elif OS(UNIX) + #include <unistd.h> +#include <sys/types.h> +#include <sys/sysctl.h> -+#endif + #endif // OS(LINUX) || OS(UNIX) #else #include <bmalloc/bmalloc.h> - #endif -@@ -54,10 +58,18 @@ static size_t computeRAMSize() +@@ -56,14 +58,18 @@ static size_t computeRAMSize() return ramSizeGuess; return status.ullTotalPhys; #elif USE(SYSTEM_MALLOC) @@ -20,14 +18,17 @@ struct sysinfo si; sysinfo(&si); return si.totalram * si.mem_unit; -+#elif OS(FREEBSD) + #elif OS(UNIX) +- long pages = sysconf(_SC_PHYS_PAGES); +- long pageSize = sysconf(_SC_PAGE_SIZE); +- return pages * pageSize; + size_t physmem, len; + int mib[2] = { CTL_HW, HW_PHYSMEM }; + if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0 -+ && len == sizeof(physmem)) -+ return physmem; ++ && len == sizeof(physmem)) ++ return physmem; + else -+ return 512 * MB; // guess ++ return 512 * MB; // guess #else #error "Missing a platform specific way of determining the available RAM" - #endif // OS(LINUX) || OS(FREEBSD) + #endif // OS(LINUX) || OS(FREEBSD) || OS(UNIX) diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp index 1b14ef50772c..a4e820ab8dbd 100644 --- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp +++ b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp @@ -1,4 +1,4 @@ ---- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2020-08-12 09:17:54 UTC +--- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2021-09-22 23:05:58 UTC +++ Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp @@ -28,7 +28,7 @@ #include "config.h" @@ -7,5 +7,5 @@ -#include <malloc.h> +#include <stdlib.h> #include <unistd.h> + #include <wtf/Logging.h> #include <wtf/MainThread.h> - #include <wtf/MemoryFootprint.h> diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp deleted file mode 100644 index 4dbd2acb2018..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.orig 2018-07-25 11:56:31 UTC -+++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp -@@ -45,6 +45,8 @@ - #include "OpenGLShims.h" - #endif - -+#include <X11/Xlib.h> -+ - #if ENABLE(ACCELERATED_2D_CANVAS) - // cairo-gl.h includes some definitions from GLX that conflict with - // the ones provided by us. Since GLContextEGL doesn't use any GLX diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp deleted file mode 100644 index b28e346ad858..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp +++ /dev/null @@ -1,23 +0,0 @@ -Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971 -Part of https://github.com/WebKit/WebKit/commit/29421afdcd64 - -Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: unknown type name 'XVisualInfo' - XVisualInfo visualTemplate; - ^ -Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:136:5: error: unknown type name 'XVisualInfo' - XVisualInfo* visualInfo = XGetVisualInfo(m_display, VisualScreenMask, &visualTemplate, &visualCount); - ^ -Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:136:57: error: use of undeclared identifier 'VisualScreenMask' - XVisualInfo* visualInfo = XGetVisualInfo(m_display, VisualScreenMask, &visualTemplate, &visualCount); - ^ - ---- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp.orig 2020-08-12 09:17:55 UTC -+++ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -@@ -32,6 +32,7 @@ - #include <X11/Xlib.h> - #include <X11/extensions/Xcomposite.h> - #if PLATFORM(GTK) -+#include <X11/Xutil.h> - #include <X11/extensions/Xdamage.h> - #endif - diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h index 620577405476..ee10afd21da1 100644 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h +++ b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h @@ -1,6 +1,6 @@ ---- Source/WebCore/platform/network/DNS.h.orig 2020-09-30 07:03:48 UTC +--- Source/WebCore/platform/network/DNS.h.orig 2021-09-22 23:05:58 UTC +++ Source/WebCore/platform/network/DNS.h -@@ -29,6 +29,7 @@ +@@ -33,6 +33,7 @@ #include <winsock2.h> #include <ws2tcpip.h> #else diff --git a/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h index 21e0bc56f9d6..bf77aefc2750 100644 --- a/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h +++ b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h @@ -1,6 +1,6 @@ ---- Source/bmalloc/bmalloc/BPlatform.h.orig 2020-08-12 09:17:57 UTC +--- Source/bmalloc/bmalloc/BPlatform.h.orig 2021-09-22 23:05:58 UTC +++ Source/bmalloc/bmalloc/BPlatform.h -@@ -159,6 +159,7 @@ +@@ -163,6 +163,7 @@ #elif defined(__ARM_ARCH_6__) \ || defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6K__) \ diff --git a/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake b/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake new file mode 100644 index 000000000000..6db859f9c221 --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake @@ -0,0 +1,14 @@ +--- Source/cmake/WebKitCommon.cmake.orig 2021-09-22 23:05:58 UTC ++++ Source/cmake/WebKitCommon.cmake +@@ -106,9 +106,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON) + endif () + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") + set(WTF_CPU_X86 1) +- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") ++ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)") + set(WTF_CPU_PPC 1) +- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") ++ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)") + set(WTF_CPU_PPC64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") + set(WTF_CPU_PPC64LE 1) diff --git a/www/webkit2-gtk3/files/patch-revert-11ccaf183fad b/www/webkit2-gtk3/files/patch-revert-11ccaf183fad new file mode 100644 index 000000000000..23ad25609a5b --- /dev/null +++ b/www/webkit2-gtk3/files/patch-revert-11ccaf183fad @@ -0,0 +1,211 @@ +Regressed by: https://github.com/WebKit/WebKit/commit/11ccaf183fad + +GStreamer.cpp.o -c /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/p +latform/graphics/gstreamer/MediaSampleGStreamer.cpp +/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/graphics/gs +treamer/MediaSampleGStreamer.cpp:220:12: error: call to implicitly-deleted copy constructor o +f 'WebCore::PlatformSample' + return sample; + ^~~~~~ +/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample +.h:57:7: note: copy constructor of 'PlatformSample' is implicitly deleted because field 'samp +le' has a deleted copy constructor + } sample; + ^ +/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample +.h:56:66: note: copy constructor of '' is implicitly deleted because variant field 'byteRange +Sample' has a non-trivial copy constructor + std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample; + ^ +1 error generated. + +diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h +index 4c5f1d2..e61e7fc 100644 +--- Source/WTF/wtf/PlatformHave.h ++++ Source/WTF/wtf/PlatformHave.h +@@ -909,6 +909,12 @@ + #endif + #endif + ++#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110300 ++#if !defined(HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON) ++#define HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON 1 ++#endif ++#endif ++ + #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110200) \ + || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140400) + #define HAVE_AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS 1 +diff --git Source/WebCore/page/RuntimeEnabledFeatures.h Source/WebCore/page/RuntimeEnabledFeatures.h +index c97386f..6bb9794 100644 +--- Source/WebCore/page/RuntimeEnabledFeatures.h ++++ Source/WebCore/page/RuntimeEnabledFeatures.h +@@ -243,6 +243,11 @@ public: + void setDisableMediaExperiencePIDInheritance(bool isDisabled) { m_disableMediaExperiencePIDInheritance = isDisabled; } + bool disableMediaExperiencePIDInheritance() const { return m_disableMediaExperiencePIDInheritance; } + #endif ++ ++#if HAVE(MT_PLUGIN_FORMAT_READER) ++ void setWebMFormatReaderEnabled(bool isEnabled) { m_webMFormatReaderEnabled = isEnabled; } ++ bool webMFormatReaderEnabled() const { return m_webMFormatReaderEnabled; } ++#endif + + #if ENABLE(VORBIS) + WEBCORE_EXPORT void setVorbisDecoderEnabled(bool isEnabled); +@@ -375,6 +380,10 @@ private: + bool m_webMFormatReaderEnabled { false }; + #endif + ++#if HAVE(MT_PLUGIN_FORMAT_READER) ++ bool m_webMFormatReaderEnabled { false }; ++#endif ++ + #if ENABLE(MEDIA_SOURCE) + bool m_webMParserEnabled { false }; + bool m_webMWebAudioEnabled { false }; +diff --git Source/WebCore/platform/MediaSample.h Source/WebCore/platform/MediaSample.h +index 0847b97..d34ba7f 100644 +--- Source/WebCore/platform/MediaSample.h ++++ Source/WebCore/platform/MediaSample.h +@@ -34,8 +34,6 @@ + + typedef struct opaqueCMSampleBuffer *CMSampleBufferRef; + typedef struct _GstSample GstSample; +-typedef struct OpaqueMTPluginByteSource *MTPluginByteSourceRef; +-typedef const struct opaqueCMFormatDescription *CMFormatDescriptionRef; + + namespace WebCore { + +@@ -47,13 +45,11 @@ struct PlatformSample { + MockSampleBoxType, + CMSampleBufferType, + GStreamerSampleType, +- ByteRangeSampleType, + } type; + union { + MockSampleBox* mockSampleBox; + CMSampleBufferRef cmSampleBuffer; + GstSample* gstSample; +- std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample; + } sample; + }; + +@@ -91,12 +87,6 @@ public: + virtual SampleFlags flags() const = 0; + virtual PlatformSample platformSample() = 0; + +- struct ByteRange { +- size_t byteOffset { 0 }; +- size_t byteLength { 0 }; +- }; +- virtual std::optional<ByteRange> byteRange() const = 0; +- + enum class VideoRotation { + None = 0, + UpsideDown = 180, +diff --git Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h +index d7a49b9..874c3dc 100644 +--- Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h ++++ Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h +@@ -57,7 +57,6 @@ public: + Ref<MediaSample> createNonDisplayingCopy() const override; + SampleFlags flags() const override { return m_flags; } + PlatformSample platformSample() override; +- std::optional<ByteRange> byteRange() const override { return std::nullopt; } + void dump(PrintStream&) const override; + RefPtr<JSC::Uint8ClampedArray> getRGBAImageData() const final; + +diff --git Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp +index 5cb60b9..83da5b0 100644 +--- Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp ++++ Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp +@@ -62,7 +62,6 @@ private: + size_t sizeInBytes() const override { return sizeof(m_box); } + SampleFlags flags() const override; + PlatformSample platformSample() override; +- std::optional<ByteRange> byteRange() const override { return std::nullopt; } + FloatSize presentationSize() const override { return FloatSize(); } + void dump(PrintStream&) const override; + void offsetTimestampsBy(const MediaTime& offset) override { m_box.offsetTimestampsBy(offset); } +diff --git Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp +index 496e42a..43664ed 100644 +--- Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp ++++ Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp +@@ -23,14 +23,15 @@ + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <WebKit/WKMediaFormatReader.h> ++#include "config.h" + +-extern "C" WK_EXPORT OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionaryRef, MTPluginFormatReaderRef*); ++#if HAVE(MT_PLUGIN_FORMAT_READER) + +-OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef byteSource, CFAllocatorRef allocator, CFDictionaryRef, MTPluginFormatReaderRef* formatReader) ++OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionary ++Ref, MTPluginFormatReaderRef* formatReader) + { +- OSStatus status = WKMediaFormatReaderCreate(allocator, formatReader); +- if (status != noErr) +- return status; +- return WKMediaFormatReaderStartOnMainThread(*formatReader, byteSource); ++ *formatReader = nullptr; ++ return kMTPluginFormatReaderError_InternalFailure; + } ++ ++#endif // HAVE(MT_PLUGIN_FORMAT_READER) +diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.cpp Source/WebKit/Shared/WebPreferencesDefaultValues.cpp +index 8b24061..83e3a04 100644 +--- Source/WebKit/Shared/WebPreferencesDefaultValues.cpp ++++ Source/WebKit/Shared/WebPreferencesDefaultValues.cpp +@@ -289,6 +289,19 @@ bool defaultWebMFormatReaderEnabled() + + #endif // ENABLE(WEBM_FORMAT_READER) + ++#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER) ++ ++bool defaultWebMFormatReaderEnabled() ++{ ++#if HAVE(SYSTEM_FEATURE_FLAGS) ++ return isFeatureFlagEnabled("webm_format_reader"); ++#endif ++ ++ return false; ++} ++ ++#endif ++ + #if ENABLE(VP9) + + bool defaultVP8DecoderEnabled() +diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.h Source/WebKit/Shared/WebPreferencesDefaultValues.h +index c7af0cb..c1c91ed 100644 +--- Source/WebKit/Shared/WebPreferencesDefaultValues.h ++++ Source/WebKit/Shared/WebPreferencesDefaultValues.h +@@ -95,6 +95,10 @@ bool defaultWebXREnabled(); + bool defaultWebMFormatReaderEnabled(); + #endif + ++#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER) ++bool defaultWebMFormatReaderEnabled(); ++#endif ++ + #if ENABLE(VP9) + bool defaultVP8DecoderEnabled(); + bool defaultVP9DecoderEnabled(); +diff --git Source/WebKit/SourcesCocoa.txt Source/WebKit/SourcesCocoa.txt +index 78fb424..ac04aa8 100644 +--- Source/WebKit/SourcesCocoa.txt ++++ Source/WebKit/SourcesCocoa.txt +@@ -229,6 +229,11 @@ Shared/mac/MediaFormatReader/MediaSampleByteRange.cpp + Shared/mac/MediaFormatReader/MediaSampleCursor.cpp + Shared/mac/MediaFormatReader/MediaTrackReader.cpp + ++Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp ++Shared/mac/MediaFormatReader/FormatReader.cpp ++Shared/mac/MediaFormatReader/SampleCursor.cpp ++Shared/mac/MediaFormatReader/TrackReader.cpp ++ + Shared/Plugins/mac/PluginSandboxProfile.mm + + Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm diff --git a/www/webkit2-gtk3/pkg-plist b/www/webkit2-gtk3/pkg-plist index ab34df353f0b..06190debb987 100644 --- a/www/webkit2-gtk3/pkg-plist +++ b/www/webkit2-gtk3/pkg-plist @@ -52,6 +52,8 @@ include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h +include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h +include/webkitgtk-4.0/webkit2/WebKitMemoryPressureSettings.h include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h @@ -219,17 +221,16 @@ lib/girepository-1.0/WebKit2-4.0.typelib lib/girepository-1.0/WebKit2WebExtension-4.0.typelib lib/libjavascriptcoregtk-4.0.so lib/libjavascriptcoregtk-4.0.so.18 -lib/libjavascriptcoregtk-4.0.so.18.17.13 +lib/libjavascriptcoregtk-4.0.so.18.19.5 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.49.9 +lib/libwebkit2gtk-4.0.so.37.55.3 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so libdata/pkgconfig/javascriptcoregtk-4.0.pc libdata/pkgconfig/webkit2gtk-4.0.pc libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc libexec/webkit2gtk-4.0/MiniBrowser libexec/webkit2gtk-4.0/WebKitNetworkProcess -libexec/webkit2gtk-4.0/WebKitPluginProcess libexec/webkit2gtk-4.0/WebKitWebProcess libexec/webkit2gtk-4.0/jsc share/gir-1.0/JavaScriptCore-4.0.gir
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109270840.18R8e9bN044971>