Update package version to 2.50.1
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
name: webkitgtk
|
||||
description: Cross-platform web browser engine for GTK
|
||||
version: 2.50.0
|
||||
version: 2.50.1
|
||||
revision: 1
|
||||
url: https://webkitgtk.org/
|
||||
license: AFL2.0 OR GPL2-or-later,Apache-2.0,Apache-2.0 WITH LLVM-exception,BSD-2-Clause,BSD-2-Clause-Views,BSD-3-Clause,BSD-Source-Code,BSL1.0,GPL2-only,GPL3-only WITH Autoconf-exception-3.0,GPL3-or-later WITH Bison-exception-2.2,ICU,ISC,LGPL2.1-only,LGPL2.1-or-later,MIT,MPL1.1,MPL2,NCSA,NCSA OR MIT,OFL1.1,SunPro,Unicode-TOU,bzip2-1.0.6
|
||||
@@ -62,7 +62,7 @@ downloads:
|
||||
- url: https://webkitgtk.org/releases/webkitgtk-${BPM_PKG_VERSION}.tar.xz
|
||||
extract_to: ${BPM_SOURCE}
|
||||
extract_strip_components: 1
|
||||
checksum: e564b8099f9a3ae32409539b290bbd2ad084e99b6d22d4aac5e51e4554df8bc2
|
||||
checksum: 33e912ee6e3cdb4b9803715f50686af85a60af47f1cf72a6acc6a2db1bb3d9fe
|
||||
split_packages:
|
||||
- name: webkitgtk4
|
||||
description: Cross-platform web browser engine for GTK4
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
From 61a456e19153033fd9592f40b985d5d03483e969 Mon Sep 17 00:00:00 2001
|
||||
From: Philippe Normand <[email protected]>
|
||||
Date: Tue, 30 Sep 2025 00:53:34 -0700
|
||||
Subject: [PATCH] [GStreamer] Build broken when using GStreamer 1.27.2 built
|
||||
from tarballs https://bugs.webkit.org/show_bug.cgi?id=299656
|
||||
|
||||
Reviewed by Xabier Rodriguez-Calvar.
|
||||
|
||||
gst_pad_probe_info_set_buffer() will ship in GStreamer 1.27.3 which hasn't been released yet. So
|
||||
when building against 1.27.2 use our internal implementation. Also make sure builds against current
|
||||
GStreamer git main still work, by checking the full (including nano) version.
|
||||
|
||||
* Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:
|
||||
* Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h:
|
||||
|
||||
Canonical link: https://commits.webkit.org/300744@main
|
||||
---
|
||||
.../WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp | 2 +-
|
||||
Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h | 5 ++++-
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
index 3e974df4e292..ef2b2fb013cf 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
@@ -2045,7 +2045,7 @@ GstBuffer* gst_buffer_new_memdup(gconstpointer data, gsize size)
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if !GST_CHECK_VERSION(1, 27, 0)
|
||||
+#if !GST_CHECK_VERSION_FULL(1, 27, 2, 1) && !GST_CHECK_VERSION(1, 27, 3) && !GST_CHECK_VERSION(1, 28, 0)
|
||||
void gst_pad_probe_info_set_buffer(GstPadProbeInfo* info, GstBuffer* buffer)
|
||||
{
|
||||
g_return_if_fail(info->type & GST_PAD_PROBE_TYPE_BUFFER);
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
index 3e8fe5112676..f8286c5a999a 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
@@ -50,6 +50,9 @@ using TrackID = uint64_t;
|
||||
template<typename MappedArg>
|
||||
using TrackIDHashMap = HashMap<TrackID, MappedArg, WTF::IntHash<TrackID>, WTF::UnsignedWithZeroKeyHashTraits<TrackID>>;
|
||||
|
||||
+#define GST_CHECK_VERSION_FULL(major, minor, micro, nano) \
|
||||
+ (GST_CHECK_VERSION(major, minor, micro) && (GST_VERSION_NANO >= nano))
|
||||
+
|
||||
inline bool webkitGstCheckVersion(guint major, guint minor, guint micro)
|
||||
{
|
||||
guint currentMajor, currentMinor, currentMicro, currentNano;
|
||||
@@ -469,7 +472,7 @@ class GstIteratorAdaptor {
|
||||
GstBuffer* gst_buffer_new_memdup(gconstpointer data, gsize size);
|
||||
#endif
|
||||
|
||||
-#if !GST_CHECK_VERSION(1, 27, 0)
|
||||
+#if !GST_CHECK_VERSION_FULL(1, 27, 2, 1) && !GST_CHECK_VERSION(1, 27, 3) && !GST_CHECK_VERSION(1, 28, 0)
|
||||
void gst_pad_probe_info_set_buffer(GstPadProbeInfo*, GstBuffer*);
|
||||
#endif
|
||||
|
||||
@@ -2,13 +2,6 @@
|
||||
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
||||
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
||||
|
||||
# The prepare function is executed in the root of the temp directory
|
||||
# This function is used for putting downloaded files to the correct location or applying patches
|
||||
prepare() {
|
||||
cd "$BPM_SOURCE"
|
||||
patch -Np1 -i "$BPM_WORKDIR"/gstreamer-1.27.2.patch
|
||||
}
|
||||
|
||||
# The build function is executed in the source directory
|
||||
# This function is used to compile the source code
|
||||
build() {
|
||||
|
||||
Reference in New Issue
Block a user