diff --git a/.gitignore b/.gitignore index 7af52c1..2173299 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.48.1.tar.xz +SOURCES/webkitgtk-2.48.2.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index af17198..9dc2df4 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -f7939f920f92f6b1395b8573f069d3fb9c085b3f SOURCES/webkitgtk-2.48.1.tar.xz +e1a216588ad5eaf71b548b035699319f74cbd8da SOURCES/webkitgtk-2.48.2.tar.xz 04b10b8a486542c4551269c20b18b5c1c6cb4f94 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/denormal-disabler-build.patch b/SOURCES/denormal-disabler-build.patch deleted file mode 100644 index 8660563..0000000 --- a/SOURCES/denormal-disabler-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/WebCore/platform/audio/DenormalDisabler.cpp b/Source/WebCore/platform/audio/DenormalDisabler.cpp -index 35715e663ce7..44ba08a33d5d 100644 ---- a/Source/WebCore/platform/audio/DenormalDisabler.cpp -+++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp -@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler() - } - } - #else --DenormalDisabler::DenormalDisabler() = default -+DenormalDisabler::DenormalDisabler() = default; - DenormalDisabler::~DenormalDisabler() = default; - #endif diff --git a/SOURCES/gstreamer-1.16.patch b/SOURCES/gstreamer-1.16.patch index 89717be..46b7815 100644 --- a/SOURCES/gstreamer-1.16.patch +++ b/SOURCES/gstreamer-1.16.patch @@ -1,4 +1,4 @@ -From 08a5ccf6fc4a998ca1fb5aa13c314640dd95b874 Mon Sep 17 00:00:00 2001 +From 32e70166ad9e80a3a190c3a475736835a63f58d1 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 4 Apr 2025 14:00:12 -0500 Subject: [PATCH] Build against GStreamer 1.16 @@ -9,11 +9,11 @@ Subject: [PATCH] Build against GStreamer 1.16 .../gstreamer/GStreamerAudioMixer.cpp | 2 +- .../graphics/gstreamer/GStreamerCommon.cpp | 77 +++++++++++++------ .../graphics/gstreamer/GStreamerCommon.h | 16 ++++ - .../gstreamer/MediaPlayerPrivateGStreamer.cpp | 22 +----- + .../gstreamer/MediaPlayerPrivateGStreamer.cpp | 23 +----- .../gstreamer/GStreamerCodecUtilities.cpp | 39 ++++++---- .../VideoEncoderPrivateGStreamer.cpp | 16 ---- Source/cmake/GStreamerChecks.cmake | 4 +- - 9 files changed, 114 insertions(+), 100 deletions(-) + 9 files changed, 114 insertions(+), 101 deletions(-) diff --git a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp index 0abdeb14826e..65763f3cfde3 100644 @@ -106,7 +106,7 @@ index 8b30e0f14b6a..2d587f68a3b2 100644 GStreamerAudioMixer& GStreamerAudioMixer::singleton() diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp -index 25c8abd3ec90..5ca712566cbd 100644 +index 7adf0dabc73e..49043537e7f7 100644 --- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp +++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp @@ -132,6 +132,24 @@ GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTempl @@ -166,7 +166,7 @@ index 25c8abd3ec90..5ca712566cbd 100644 } unsigned getGstPlayFlag(const char* nick) -@@ -1358,6 +1351,36 @@ String gstStructureToJSONString(const GstStructure* structure) +@@ -1361,6 +1354,36 @@ String gstStructureToJSONString(const GstStructure* structure) return value->toJSONString(); } @@ -203,7 +203,7 @@ index 25c8abd3ec90..5ca712566cbd 100644 GstClockTime webkitGstInitTime() { return s_webkitGstInitTime; -@@ -1415,6 +1438,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info) +@@ -1418,6 +1441,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info) case GST_VIDEO_TRANSFER_BT709: colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt709; break; @@ -211,7 +211,7 @@ index 25c8abd3ec90..5ca712566cbd 100644 case GST_VIDEO_TRANSFER_BT601: colorSpace.transfer = PlatformVideoTransferCharacteristics::Smpte170m; break; -@@ -1427,6 +1451,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info) +@@ -1430,6 +1454,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info) case GST_VIDEO_TRANSFER_BT2020_10: colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_10bit; break; @@ -219,7 +219,7 @@ index 25c8abd3ec90..5ca712566cbd 100644 case GST_VIDEO_TRANSFER_BT2020_12: colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_12bit; break; -@@ -1545,6 +1570,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi +@@ -1548,6 +1573,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi case PlatformVideoTransferCharacteristics::Bt709: GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT709; break; @@ -227,7 +227,7 @@ index 25c8abd3ec90..5ca712566cbd 100644 case PlatformVideoTransferCharacteristics::Smpte170m: GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT601; break; -@@ -1557,6 +1583,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi +@@ -1560,6 +1586,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi case PlatformVideoTransferCharacteristics::Bt2020_10bit: GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_10; break; @@ -270,18 +270,19 @@ index f332ddd0e040..217132050db0 100644 PlatformVideoColorSpace videoColorSpaceFromCaps(const GstCaps*); diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -index 80fdb52a342c..30a535eb816b 100644 +index 9d6d57868055..3d1a5f76a4c2 100644 --- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp +++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -@@ -587,7 +587,6 @@ bool MediaPlayerPrivateGStreamer::doSeek(const SeekTarget& target, float rate) - - auto seekStart = toGstClockTime(startTime); +@@ -589,8 +589,6 @@ bool MediaPlayerPrivateGStreamer::doSeek(const SeekTarget& target, float rate, b auto seekStop = toGstClockTime(endTime); -- GST_DEBUG_OBJECT(pipeline(), "[Seek] Performing actual seek to %" GST_TIMEP_FORMAT " (endTime: %" GST_TIMEP_FORMAT ") at rate %f", &seekStart, &seekStop, rate); - return gst_element_seek(m_pipeline.get(), rate, GST_FORMAT_TIME, m_seekFlags, GST_SEEK_TYPE_SET, seekStart, GST_SEEK_TYPE_SET, seekStop); - } + GstEvent* event = gst_event_new_seek(rate, GST_FORMAT_TIME, m_seekFlags, GST_SEEK_TYPE_SET, seekStart, GST_SEEK_TYPE_SET, seekStop); -@@ -4153,26 +4152,7 @@ void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume +- GST_DEBUG_OBJECT(pipeline(), "[Seek] Performing actual seek to %" GST_TIMEP_FORMAT " (endTime: %" GST_TIMEP_FORMAT ") at rate %f", &seekStart, &seekStop, rate); +- + if (isAsync) { + gst_element_call_async(m_pipeline.get(), reinterpret_cast(+[](GstElement* pipeline, gpointer userData) { + GstEvent* event = static_cast(userData); +@@ -4167,26 +4165,7 @@ void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume bool MediaPlayerPrivateGStreamer::updateVideoSinkStatistics() { diff --git a/SOURCES/s390x-build.patch b/SOURCES/s390x-build.patch deleted file mode 100644 index 839b74b..0000000 --- a/SOURCES/s390x-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil.h b/Source/ThirdParty/ANGLE/src/common/mathutil.h -index 8f4579dc5611..4d981d4427bc 100644 ---- a/Source/ThirdParty/ANGLE/src/common/mathutil.h -+++ b/Source/ThirdParty/ANGLE/src/common/mathutil.h -@@ -550,7 +550,7 @@ inline R roundToNearest(T input) - { - static_assert(std::is_floating_point::value); - static_assert(std::numeric_limits::is_integer); --#if defined(__aarch64__) || defined(_M_ARM64) -+#if defined(__aarch64__) || defined(_M_ARM64) || defined(__s390x__) - // On armv8, this expression is compiled to a dedicated round-to-nearest instruction - return static_cast(std::round(input)); - #else diff --git a/SOURCES/webkitgtk-2.48.1.tar.xz.asc b/SOURCES/webkitgtk-2.48.1.tar.xz.asc deleted file mode 100644 index 427f248..0000000 --- a/SOURCES/webkitgtk-2.48.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmftAf8ACgkQbBAJtpOX -U5PdBg//TpfUIuSwl5OgwqsB8WNvrtCdGGwrYa3k9E9pp57KHLvlqNeDmToy/U9t -gAOIUIyIxgVBRgJQrcQW/NfPx49jd3ISt9h54A0c/MgIb4+4vsvoRz3pwX407+QR -7rZA72GA1im3u5+IWTGeeWzTGNQtvGbd1DzA6OpdvC0MRS2JAfYvgDHyAzaQu0Of -JZdMrZlwoaMeZDTKI+qV/ZY2mZ59xiD0ltRU6X1B7/YS2MEsqztO7FFWO/xuhdps -qIZF/jwuVfcGrI5JPVZzsf0V2RHmgF4j9rNEZwSxP8BkWfYQ+BjZI6gzKjVgDYED -6D70tf0+q9UqSSYaX0Wk2+IqaNiO09md4nYZJ1I6VLz8sm6AZTB2XXiWxB3hEuFO -j7Dk11I4DKPJjBHIQN/3kqutvRG5plyi4HIL2BzvnVstxrlTAocIFvhey1GOiLSu -UfX97ruyNECpwMIafxCsqOVAjg4wkf6df0yCJVokNRBunnsQPABjDXfhS7dDvE3B -6u2BIVudba2xEeMqqHZBrFAy4UXLcfJYnvvsBbPGFHibooCIuwd5VrTIVUE7bsI1 -QqEAlryx1grnyDN77aHri2bBK44aHMIix19kRgwdK8wcT3iz1vdUcgigcDYbD2Sc -0LGzxB5OY+jd7zvSczqNCX6Ll7W7dIgjR60nuVl4+yYNnzSM+EM= -=6kwl ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.48.2.tar.xz.asc b/SOURCES/webkitgtk-2.48.2.tar.xz.asc new file mode 100644 index 0000000..58c4a8a --- /dev/null +++ b/SOURCES/webkitgtk-2.48.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmgkcDwACgkQbBAJtpOX +U5NEhQ//Vdb5/kLRogQVuCz5+Ghx5efS4v7zLVWR2fOnpgLzQlZEdSWBMN89h0df +R8kAP3mb0eiwHJMJwhM0wB7AfwGpPWsKp8hhoQxBeMaSWwU4Wm/n/b6IrawuiPtq +6I+1nzLU+eqZ6pgOdEUblD8QOwW42cCO6IlHX4jEVJoYzOPSyQ6spGXO7WLO5rhb +WvUaYat9ddZyRIHQKrNjUm+XWwkvV5XI0wXHzsamA8+p+fUwP0pNDx1CzemhveOL +PaB9Xxu4f634j38HIzl9EsL78Aay+6uUyA3VYsvXtJxkP/1k1VJKyyGMZykaokgh +OMoPMoKZND9koAr7lAObabCdqe5+EXQNZLw0ydl9lKQS5Ps6/r0OfPIl+G6xXMlJ +/CSyqwl4Pwt5M4BthgJFL1wV6z6pOgYhFYd4Q30Z4dgJTxZSWiI9ygSuo3Sp0+Y+ +W95BP0IWaqZlofhUXbc38PMgBlyEBlSgBZ4wf43vv4Ro5Gwfq5CF8DIOpkEj8hS8 +z7TG+Hb3CYgTcss9VV9ZtckVI6DP0p4ScBQtPQrRckXyFDo1kukgCxzkzRZf+BZJ +XeUDGSuxxSeH2mSQRWe/Bw59RZf/1H3ivsuHQn7WNohHfIV+Uc0bPtVa31lGAeqr +q5iPxAe9Spsp4i/Bs/a1YXzP2uTWjknBryF07QVVcLf6XcgYEtI= +=k7du +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 45629e1..5ff94ec 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -9,7 +9,7 @@ # $ rhpkg build --target rhel-8.10.0-z-webkitgtk-stack-gate Name: webkit2gtk3 -Version: 2.48.1 +Version: 2.48.2 Release: 1%{?dist} Summary: GTK Web content engine library @@ -27,7 +27,6 @@ Source2: webkitgtk-keys.gpg ## Patch100: compiler-flags.patch -Patch101: s390x-build.patch ## ## Patches to support older or missing build dependencies @@ -50,7 +49,7 @@ Patch301: evolution-sandbox-warning.patch ## Upstream patches to remove, hopefully after next update ## -Patch: denormal-disabler-build.patch +# No patches currently! :) BuildRequires: bison BuildRequires: clang @@ -232,7 +231,6 @@ rm -rf Source/ThirdParty/qunit/ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_DOCUMENTATION=OFF \ -DENABLE_GAMEPAD=OFF \ - -DENABLE_JIT=OFF \ -DENABLE_SPEECH_SYNTHESIS=OFF \ -DENABLE_WEB_CODECS=OFF \ -DUSE_AVIF=OFF \ @@ -317,6 +315,10 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Thu May 15 2025 Michael Catanzaro - 2.48.2-1 +- Update to 2.48.2 +- Reenable JavaScriptCore JIT + * Fri Apr 11 2025 Michael Catanzaro - 2.48.1-1 - Update to 2.48.1