gentoo auto-resync : 07:12:2024 - 02:07:26

5 files changed, 125 insertions, 3 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 691279811b3a..101b0e2faa97 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,11 +1,12 @@
 AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802
 AUX 2.44.4-fix-icu76.1.patch 1215 BLAKE2B 0d4aa869b52eb6579ff58421982e80f02077e064988b30887af9d7da5a1c31bb652fdc406fbfe4e0895cd4c4e0e67b2cc4e363e8d8c60aac5d5683808fd52080 SHA512 356051853ce56e040aed620a6cb68dba75c2387ed396cfea85c2fcd5e51998a31ea2e2eca5305d9aa99b66f6f8ea7e8983851c77ca654a97ec3b3ecce8bd651c
+AUX 2.46.4-no-egl.patch 4739 BLAKE2B 6fde02d0dbcff8c89d10af7c9081880d29196174335409241929513155d093bca70545698b8a653d454a05c58b1fba4b90bfd42d285ded3c268376b917f92d78 SHA512 0bb8ba9d9f41100908f762063f7e0e3eca57a4aefa1e9203bfcb114f745acf61b78a76a05a4ed09c7aa0053effd3ff07e0c9cd3fa583a9520648c82845af8a1d
 DIST webkitgtk-2.44.4.tar.xz 35858056 BLAKE2B 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c SHA512 037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9
 DIST webkitgtk-2.46.4.tar.xz 42899016 BLAKE2B df837d4acf53fc404e0ed4de074756c9585238cb8696f4627a7c720bc8d9bff7483ae19b41f564044ebe4bfc8ce0a8673c3773a8f2fe8cea689c214f62f4a645 SHA512 9f3967524ef2ca3242609d4e49e773d33bb944f109a6fbf30d2cc3179eb563df59044b2bc627bcdc9991e09e9d3041b9dc5c22c857227385508ada6276829e29
 EBUILD webkit-gtk-2.44.4-r410.ebuild 7909 BLAKE2B 2c547c9f14882583fdf020a450dc84d1584205ba4d659b07fde44cc2c21916ae37ec64db77148261dd700ec07d203d3322f97e864dc87bacd3688846c482116c SHA512 1ea30d126cc5ca5d57dd5a101572dd0f570121a0a3dd002c36c87e8ce977063ad2ec9d6a2e84fb9d1ba319f54bb882f2d423155311d3fdf1ecd1db5f605c1b4c
 EBUILD webkit-gtk-2.44.4-r600.ebuild 8650 BLAKE2B 91c5240a65bd29376f36d56783b600159722b1f0686d69ed2ad9551d8872e9495f59a5e38203a0c279527e643948048f35ee7f08edf0993bae519e229d14d71c SHA512 7a8904c9755d768021f8840db35f0658de9580257df0b62b92d5a6d995c80fe1aaf976059c6232d3cdf12957aa48e02708d25ce6eab40d6f5049023b880c02dd
 EBUILD webkit-gtk-2.44.4.ebuild 7757 BLAKE2B 94f79a2ac9f8f1b3f95297c50af5aa155604ef670e7600d7e567cb5971fc509efd9e07a9fd892010b2bd7332912a17407031d658cd2ba393678ebf5b7c7c2e42 SHA512 b8cdbf26b732b669da0ec5c5feb7fb708f27dc285792dca74aef3bf49d4b0d774b8d6d79603c65a564deae345e0c40b5d6f106225463cab6c4e5f3ea3813db26
-EBUILD webkit-gtk-2.46.4-r410.ebuild 7889 BLAKE2B cb0185fe6b0673f4aaa8945074cd3b5fe201c9a503ed598959e73a8c376eb09813f8a57eed48095543c752dbb3b24db5d1ae3b83cf9001d2b56bcf007690a48a SHA512 a12f811a13585cf3fd310ef44640568ff5ee82a732abd184ea44223e83d4ad9913096e749d3e6d4d07fcfc90892c706070f93a5d678972d994291f1053a0bd7c
-EBUILD webkit-gtk-2.46.4-r600.ebuild 8633 BLAKE2B 4fe3419ab32227661c6020a32342c33678b28368a2c9157c918606a06a66c0ddbdd53afdaf4d50a9a85f4c5f399889f3f52f5495aa9b955a0649e479cb721e16 SHA512 d20a153affcd8536dc65f4cf60feb3e97665a6841127b34dbb7347399e8f41e83fc3b9d298ed604e3183a5ac6659a36a3c3ee3b8486ad3e0adf538ff814fa026
-EBUILD webkit-gtk-2.46.4.ebuild 7887 BLAKE2B 88453c06f882ee8fb025368da72030a2f78b25d03c9e6887b816ecd7614c3bd2ae192141104611da61b4aa64d383ad4cf0ae9b43b888bc9b1e30384db06ab991 SHA512 c7e2792e511c879bfe6dcb7a5dc039511f4daf809132089a284eb970fddf7103edfb71314e1c957f9aee729f54e8a89bd8d2b9fc687b7e3ba3ced5bd2bde26ca
+EBUILD webkit-gtk-2.46.4-r410.ebuild 7965 BLAKE2B 605aa4530def2483f38d9fadf54f8496038ea53a2be2326d26c98ecc9c76cd75955d2258cbf50a95d07af4377d7c589cf87bcedd8fdb97245dec93a1782c4e9e SHA512 73365485e72c897118e8e088bec22904be664e4143185e2c22f39c681b6823c496c73f23ab33f1e970d8b6c45822bec3f5f89a659adde128c5334f008a24ceb2
+EBUILD webkit-gtk-2.46.4-r600.ebuild 8709 BLAKE2B 455caf98474e9ed09694579a636c307968f125ac57391848d83d121601a6906c49a8686d7a2c3412d801094ebc1833ad89040ccbb1ba61948245e5e3b7575bc7 SHA512 34fc007b4c3e78ee801257ac3661dd6c0bcee4f0f3367ad179bfe8866109eba592bf5829c578f31608f5ab043fee9dc688186c9d2d18345817f0d09fbf3cba90
+EBUILD webkit-gtk-2.46.4.ebuild 7963 BLAKE2B 1dd43c3b0b5ee4b53ef8d99954d2d6f1f8a1e17713898760b1e87bb944cd1593e97d898c87761f40324b88e9bc5d8517d027f4553e5dd35e86e8485a656302b5 SHA512 981924192b2010b31eadd2ad7ee764818215c3d2b1df98be4b30d6fe5b21c03bfbebe8f52332a1281934b4cfaf11be129caafe4346368ba4644805c6a9455ecf
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/files/2.46.4-no-egl.patch b/net-libs/webkit-gtk/files/2.46.4-no-egl.patch
new file mode 100644
index 000000000000..cf66a8c3bf45
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.46.4-no-egl.patch
@@ -0,0 +1,115 @@
+https://bugs.gentoo.org/945827
+https://bugs.webkit.org/show_bug.cgi?id=283750
+https://github.com/WebKit/WebKit/commit/1cfbdd74e97ea29636ce442322b5399b43937401
+
+From 9cd50ae71cd463145529f86ca0306319cc9a4321 Mon Sep 17 00:00:00 2001
+From: Philippe Normand <philn@igalia.com>
+Date: Wed, 27 Nov 2024 07:20:41 -0800
+Subject: [PATCH] [WPE][GTK] Build fixes for gbm disabled and release logs
+ disabled https://bugs.webkit.org/show_bug.cgi?id=283750
+
+* Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp:
+(WebCore::PeerConnectionBackend::PeerConnectionBackend):
+* Source/WebCore/Modules/mediastream/PeerConnectionBackend.h:
+* Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp:
+(WebCore::GStreamerMediaEndpoint::startRTCLogs):
+* Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:
+* Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h:
+(WKWPE::ViewPlatform::ViewPlatform):
+
+Cherrypicked https://commits.webkit.org/287124@main to 2.46.4
+--- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
++++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
+@@ -165,6 +165,10 @@ PeerConnectionBackend::PeerConnectionBackend(RTCPeerConnection& peerConnection)
+         m_shouldFilterICECandidates = page->webRTCProvider().isSupportingMDNS();
+ #endif
+ 
++#if RELEASE_LOG_DISABLED
++    m_logIdentifierString = makeString(hex(reinterpret_cast<uintptr_t>(this)));
++#endif
++
+ #if !RELEASE_LOG_DISABLED && (PLATFORM(WPE) || PLATFORM(GTK))
+     m_jsonFilePath = String::fromUTF8(getenv("WEBKIT_WEBRTC_JSON_EVENTS_FILE"));
+     if (!m_jsonFilePath.isEmpty())
+--- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
++++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
+@@ -281,8 +281,8 @@ private:
+ #if !RELEASE_LOG_DISABLED
+     Ref<const Logger> m_logger;
+     const void* m_logIdentifier;
+-    String m_logIdentifierString;
+ #endif
++    String m_logIdentifierString;
+     bool m_finishedGatheringCandidates { false };
+     bool m_isProcessingLocalDescriptionAnswer { false };
+ 
+--- a/Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp
++++ b/Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp
+@@ -2228,7 +2228,9 @@ std::optional<bool> GStreamerMediaEndpoint::canTrickleIceCandidates() const
+ void GStreamerMediaEndpoint::startRTCLogs()
+ {
+     m_isGatheringRTCLogs = true;
++#if !RELEASE_LOG_DISABLED
+     startLoggingStats();
++#endif
+ }
+ 
+ void GStreamerMediaEndpoint::stopRTCLogs()
+--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
+@@ -1726,7 +1726,7 @@ void gstStructureFilterAndMapInPlace(GstStructure* structure, Function<bool(GstI
+ #endif
+ }
+ 
+-#if !GST_CHECK_VERSION(1, 24, 0)
++#if USE(GBM) && !GST_CHECK_VERSION(1, 24, 0)
+ static GstVideoFormat drmFourccToGstVideoFormat(uint32_t fourcc)
+ {
+     switch (fourcc) {
+@@ -1761,7 +1761,7 @@ static GstVideoFormat drmFourccToGstVideoFormat(uint32_t fourcc)
+     RELEASE_ASSERT_NOT_REACHED();
+     return GST_VIDEO_FORMAT_UNKNOWN;
+ }
+-#endif // !GST_CHECK_VERSION(1, 24, 0)
++#endif // USE(GBM) && !GST_CHECK_VERSION(1, 24, 0)
+ 
+ #if USE(GBM)
+ GRefPtr<GstCaps> buildDMABufCaps()
+@@ -1805,7 +1805,7 @@ GRefPtr<GstCaps> buildDMABufCaps()
+                 gst_value_list_append_and_take_value(&supportedFormats, &value);
+             }
+         }
+-#else
++#elif USE(GBM)
+         GValue value = G_VALUE_INIT;
+         g_value_init(&value, G_TYPE_STRING);
+         g_value_set_string(&value, gst_video_format_to_string(drmFourccToGstVideoFormat(format.fourcc)));
+@@ -1815,7 +1815,7 @@ GRefPtr<GstCaps> buildDMABufCaps()
+ 
+ #if GST_CHECK_VERSION(1, 24, 0)
+     gst_caps_set_value(caps.get(), "drm-format", &supportedFormats);
+-#else
++#elif USE(GBM)
+     gst_caps_set_value(caps.get(), "format", &supportedFormats);
+ #endif
+     g_value_unset(&supportedFormats);
+--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
++++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
+@@ -93,13 +93,14 @@ private:
+ #if !RELEASE_LOG_DISABLED
+     Ref<const Logger> m_logger;
+     const void* m_logIdentifier;
++#endif
++
+     uint64_t m_nextSourceBufferID { 0 };
+ 
+     // Stores known track IDs, so we can work around ID collisions between multiple source buffers.
+     // The registry is placed here to enforce ID uniqueness specifically by player, not by process,
+     // since its not an issue if multiple players use the same ID, and we want to preserve IDs as much as possible.
+     HashSet<TrackID, WTF::IntHash<TrackID>, WTF::UnsignedWithZeroKeyHashTraits<TrackID>> m_trackIdRegistry;
+-#endif
+ };
+ 
+ } // namespace WebCore
+-- 
+2.47.1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.4-r410.ebuild
index ae6d1d99d97d..8e3a28eb83da 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.4-r410.ebuild
@@ -148,6 +148,8 @@ src_prepare() {
 
 	# https://bugs.gentoo.org/943213
 	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
+	# https://bugs.gentoo.org/945827
+	eapply "${FILESDIR}"/2.46.4-no-egl.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.4-r600.ebuild
index 753098b08520..67d0513a0a53 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.4-r600.ebuild
@@ -159,6 +159,8 @@ src_prepare() {
 
 	# https://bugs.gentoo.org/943213
 	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
+	# https://bugs.gentoo.org/945827
+	eapply "${FILESDIR}"/2.46.4-no-egl.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.4.ebuild
index 251e70b171d4..299d89ff4edc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.4.ebuild
@@ -148,6 +148,8 @@ src_prepare() {
 
 	# https://bugs.gentoo.org/943213
 	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
+	# https://bugs.gentoo.org/945827
+	eapply "${FILESDIR}"/2.46.4-no-egl.patch
 }
 
 src_configure() {