* [PR PATCH] webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
@ 2022-09-09 5:29 averycoolbean
2022-09-09 5:44 ` averycoolbean
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: averycoolbean @ 2022-09-09 5:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]
There is a new pull request by averycoolbean against master on the void-packages repository
https://github.com/averycoolbean/void-packages master
https://github.com/void-linux/void-packages/pull/39180
webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR:**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
this would properly resolve issue [#34781](https://github.com/void-linux/void-packages/issues/34781) by applying the final fix already included in webkitgtk versions 2.36.4 and up
full credit for the fix goes to Philippe Normand [here](https://bugs.webkit.org/attachment.cgi?id=451364&action=diff), i just copy-pasted it onto this older version to generate a fitting patch
@q66 you asked to be pinged before touching this package
A patch file from https://github.com/void-linux/void-packages/pull/39180.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-39180.patch --]
[-- Type: text/x-diff, Size: 2449 bytes --]
From 79bcff3f012204c3f36705875bc025751b4e1e51 Mon Sep 17 00:00:00 2001
From: coolbean <thecoolestofbeans@protonmail.com>
Date: Fri, 9 Sep 2022 06:34:26 +0200
Subject: [PATCH 1/2] add no gstreamer plugin dependency patch
---
srcpkgs/webkit2gtk/patches/nogstbad.patch | 29 +++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/webkit2gtk/patches/nogstbad.patch
diff --git a/srcpkgs/webkit2gtk/patches/nogstbad.patch b/srcpkgs/webkit2gtk/patches/nogstbad.patch
new file mode 100644
index 000000000000..d5a69ddba9e6
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/nogstbad.patch
@@ -0,0 +1,29 @@
+From c9fa538715b7a40a24ed187d14995ee67a04b718 Mon Sep 17 00:00:00 2001
+From: coolbean <thecoolestofbeans@protonmail.com>
+Date: Fri, 9 Sep 2022 05:22:55 +0200
+Subject: [PATCH] apply patch
+
+---
+ .../graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+index 3237520e..d612c10a 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+@@ -3402,6 +3402,12 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
+
+ if (!m_player->isVideoPlayer()) {
+ m_videoSink = makeGStreamerElement("fakevideosink", nullptr);
++ if (!m_videoSink) {
++ GST_DEBUG_OBJECT(m_pipeline.get(), "Falling back to fakesink for video rendering");
++ m_videoSink = gst_element_factory_make("fakesink", nullptr);
++ g_object_set(m_videoSink.get(), "sync", TRUE, nullptr);
++ }
++
+ return m_videoSink.get();
+ }
+
+--
+2.37.3
+
From cecbeb50f76ea035f0b4044419822c291c53f5a7 Mon Sep 17 00:00:00 2001
From: coolbean <thecoolestofbeans@protonmail.com>
Date: Fri, 9 Sep 2022 06:54:40 +0200
Subject: [PATCH 2/2] bump revision number
---
srcpkgs/webkit2gtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index e103f2ce06c8..3dd8e1255916 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
# ping q66 before touching this
pkgname=webkit2gtk
version=2.34.6
-revision=2
+revision=3
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
2022-09-09 5:29 [PR PATCH] webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency averycoolbean
@ 2022-09-09 5:44 ` averycoolbean
2022-09-09 6:25 ` [PR PATCH] [Updated] " averycoolbean
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: averycoolbean @ 2022-09-09 5:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
New comment by averycoolbean on void-packages repository
https://github.com/void-linux/void-packages/pull/39180#issuecomment-1241522786
Comment:
saved as a draft cause i made a really silly mistake while generating the original patch file (kinda sorta missed an entire other file), ill commit the proper patch once ive built the package *again* to confirm it still builds without issue
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
2022-09-09 5:29 [PR PATCH] webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency averycoolbean
2022-09-09 5:44 ` averycoolbean
@ 2022-09-09 6:25 ` averycoolbean
2022-09-09 11:40 ` q66
2022-09-09 11:40 ` [PR PATCH] [Closed]: " q66
3 siblings, 0 replies; 5+ messages in thread
From: averycoolbean @ 2022-09-09 6:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1595 bytes --]
There is an updated pull request by averycoolbean against master on the void-packages repository
https://github.com/averycoolbean/void-packages master
https://github.com/void-linux/void-packages/pull/39180
webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR:**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
this would properly resolve issue [#34781](https://github.com/void-linux/void-packages/issues/34781) by applying the final fix already included in webkitgtk versions 2.36.4 and up
full credit for the fix goes to Philippe Normand [here](https://bugs.webkit.org/attachment.cgi?id=451364&action=diff), i just copy-pasted it onto this older version to generate a fitting patch
@q66 you asked to be pinged before touching this package
A patch file from https://github.com/void-linux/void-packages/pull/39180.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-39180.patch --]
[-- Type: text/x-diff, Size: 5048 bytes --]
From 79bcff3f012204c3f36705875bc025751b4e1e51 Mon Sep 17 00:00:00 2001
From: coolbean <thecoolestofbeans@protonmail.com>
Date: Fri, 9 Sep 2022 06:34:26 +0200
Subject: [PATCH 1/3] add no gstreamer plugin dependency patch
---
srcpkgs/webkit2gtk/patches/nogstbad.patch | 29 +++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/webkit2gtk/patches/nogstbad.patch
diff --git a/srcpkgs/webkit2gtk/patches/nogstbad.patch b/srcpkgs/webkit2gtk/patches/nogstbad.patch
new file mode 100644
index 000000000000..d5a69ddba9e6
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/nogstbad.patch
@@ -0,0 +1,29 @@
+From c9fa538715b7a40a24ed187d14995ee67a04b718 Mon Sep 17 00:00:00 2001
+From: coolbean <thecoolestofbeans@protonmail.com>
+Date: Fri, 9 Sep 2022 05:22:55 +0200
+Subject: [PATCH] apply patch
+
+---
+ .../graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+index 3237520e..d612c10a 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+@@ -3402,6 +3402,12 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
+
+ if (!m_player->isVideoPlayer()) {
+ m_videoSink = makeGStreamerElement("fakevideosink", nullptr);
++ if (!m_videoSink) {
++ GST_DEBUG_OBJECT(m_pipeline.get(), "Falling back to fakesink for video rendering");
++ m_videoSink = gst_element_factory_make("fakesink", nullptr);
++ g_object_set(m_videoSink.get(), "sync", TRUE, nullptr);
++ }
++
+ return m_videoSink.get();
+ }
+
+--
+2.37.3
+
From cecbeb50f76ea035f0b4044419822c291c53f5a7 Mon Sep 17 00:00:00 2001
From: coolbean <thecoolestofbeans@protonmail.com>
Date: Fri, 9 Sep 2022 06:54:40 +0200
Subject: [PATCH 2/3] bump revision number
---
srcpkgs/webkit2gtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index e103f2ce06c8..3dd8e1255916 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
# ping q66 before touching this
pkgname=webkit2gtk
version=2.34.6
-revision=2
+revision=3
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
From d663daa69cc09ccd2cc15a68e18bfc3092c02417 Mon Sep 17 00:00:00 2001
From: coolbean <thecoolestofbeans@protonmail.com>
Date: Fri, 9 Sep 2022 08:24:35 +0200
Subject: [PATCH 3/3] adding the actual full patch
---
srcpkgs/webkit2gtk/patches/nogstbad.patch | 36 +++++++++++++++--------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/webkit2gtk/patches/nogstbad.patch b/srcpkgs/webkit2gtk/patches/nogstbad.patch
index d5a69ddba9e6..b0eeaf432788 100644
--- a/srcpkgs/webkit2gtk/patches/nogstbad.patch
+++ b/srcpkgs/webkit2gtk/patches/nogstbad.patch
@@ -1,12 +1,27 @@
-From c9fa538715b7a40a24ed187d14995ee67a04b718 Mon Sep 17 00:00:00 2001
-From: coolbean <thecoolestofbeans@protonmail.com>
-Date: Fri, 9 Sep 2022 05:22:55 +0200
-Subject: [PATCH] apply patch
-
----
- .../graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
+diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
+index abaa20d4..26c68ea9 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
+@@ -526,7 +526,8 @@ GstBuffer* gstBufferNewWrappedFast(void* data, size_t length)
+ GstElement* makeGStreamerElement(const char* factoryName, const char* name)
+ {
+ auto* element = gst_element_factory_make(factoryName, name);
+- RELEASE_ASSERT_WITH_MESSAGE(element, "GStreamer element %s not found. Please install it", factoryName);
++ if (!element)
++ WTFLogAlways("GStreamer element %s not found. Please install it", factoryName);
+ return element;
+ }
+
+@@ -534,7 +535,8 @@ GstElement* makeGStreamerBin(const char* description, bool ghostUnlinkedPads)
+ {
+ GUniqueOutPtr<GError> error;
+ auto* bin = gst_parse_bin_from_description(description, ghostUnlinkedPads, &error.outPtr());
+- RELEASE_ASSERT_WITH_MESSAGE(bin, "Unable to create bin for description: \"%s\". Error: %s", description, error->message);
++ if (!bin)
++ WTFLogAlways("Unable to create bin for description: \"%s\". Error: %s", description, error->message);
+ return bin;
+ }
+
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 3237520e..d612c10a 100644
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -24,6 +39,3 @@ index 3237520e..d612c10a 100644
return m_videoSink.get();
}
---
-2.37.3
-
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
2022-09-09 5:29 [PR PATCH] webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency averycoolbean
2022-09-09 5:44 ` averycoolbean
2022-09-09 6:25 ` [PR PATCH] [Updated] " averycoolbean
@ 2022-09-09 11:40 ` q66
2022-09-09 11:40 ` [PR PATCH] [Closed]: " q66
3 siblings, 0 replies; 5+ messages in thread
From: q66 @ 2022-09-09 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/39180#issuecomment-1241871354
Comment:
i will update webkitgtk to 2.36 later
that said, gst-plugins-bad should be a build dependency anyway because it enables functionality otherwise not available
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
2022-09-09 5:29 [PR PATCH] webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency averycoolbean
` (2 preceding siblings ...)
2022-09-09 11:40 ` q66
@ 2022-09-09 11:40 ` q66
3 siblings, 0 replies; 5+ messages in thread
From: q66 @ 2022-09-09 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]
There's a closed pull request on the void-packages repository
webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency
https://github.com/void-linux/void-packages/pull/39180
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR:**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
this would properly resolve issue [#34781](https://github.com/void-linux/void-packages/issues/34781) by applying the final fix already included in webkitgtk versions 2.36.4 and up
full credit for the fix goes to Philippe Normand [here](https://bugs.webkit.org/attachment.cgi?id=451364&action=diff), i just copy-pasted it onto this older version to generate a fitting patch
@q66 you asked to be pinged before touching this package
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-09 11:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09 5:29 [PR PATCH] webkit2gtk: add patch to resolve unintended gst-plugins-bad1 dependency averycoolbean
2022-09-09 5:44 ` averycoolbean
2022-09-09 6:25 ` [PR PATCH] [Updated] " averycoolbean
2022-09-09 11:40 ` q66
2022-09-09 11:40 ` [PR PATCH] [Closed]: " q66
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).