diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-01-05 06:31:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-01-05 06:31:58 +0000 |
commit | e4d9d6796d5018e338f0b27a3bc97716195bf0b8 (patch) | |
tree | 38d56da69a3b5d5ccc7d73796d38469f5d4e610c /net-libs/webkit-gtk | |
parent | 38efae7f3eb932ed41510139679efd5c1e2f5eda (diff) |
gentoo auto-resync : 05:01:2025 - 06:31:57edge
Diffstat (limited to 'net-libs/webkit-gtk')
-rw-r--r-- | net-libs/webkit-gtk/Manifest | 1 | ||||
-rw-r--r-- | net-libs/webkit-gtk/files/2.46.4-no-egl.patch | 115 |
2 files changed, 0 insertions, 116 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 5408fcedd53b..c164a95db89d 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,6 +1,5 @@ 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.5.tar.xz 42898600 BLAKE2B 04f824f9864749c13810318c06e5da90265025062a706030bece73661cf89b8d972040c508ca5b4267d476f9dac8fcdaa82943409f6ae45ab84801d899a1ed7f SHA512 9a0eb018361d407f13b303f66babcdc9960075bf69b83cf2ee8f708e5396cfa9e0a720f77695aea216072392e0603c2dc8ad50e6d56f962d4a52e9cdadf38275 EBUILD webkit-gtk-2.44.4-r410.ebuild 7909 BLAKE2B 637ade4977c2abc8806dd6dbe7478ac553dad8afdca52b6462b05fdd55e0541dc7ac009341ce603332c0db99cfd613b23a15ecca33c276ca0e1ea99aa6473b89 SHA512 49bb6abae1f14df378b704539f22807d139221901d896f591e5034f237bcfc19bc23432e3ee84709d25677f9b6d4c5095919d0ddf451020198d69226f324ce18 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 deleted file mode 100644 index cf66a8c3bf45..000000000000 --- a/net-libs/webkit-gtk/files/2.46.4-no-egl.patch +++ /dev/null @@ -1,115 +0,0 @@ -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 |