Add patch to fix cheese#51

This commit is contained in:
Michael Catanzaro 2022-05-13 08:19:05 -05:00
parent 3d0f632555
commit 060f803f08
2 changed files with 69 additions and 1 deletions

View File

@ -1,12 +1,14 @@
Name: clutter-gst3
Version: 3.0.27
Release: 7%{?dist}
Release: 8%{?dist}
Summary: GStreamer integration library for Clutter
License: LGPLv2+
URL: https://developer.gnome.org/clutter-gst/stable/
Source0: https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-%{version}.tar.xz
Patch0: remove-rgbx-bgrx-support.patch
BuildRequires: /usr/bin/chrpath
BuildRequires: pkgconfig(clutter-1.0)
BuildRequires: pkgconfig(cogl-2.0-experimental)
@ -76,6 +78,9 @@ rm -rf %{buildroot}%{_libdir}/gstreamer-1.0/
%changelog
* Thu May 13 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 3.0.27-8
- Add patch to fix cheese#51
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.27-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View File

@ -0,0 +1,63 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Tue, 26 Apr 2022 23:06:51 +0000
Subject: [PATCH] video-sink: Remove RGBx/BGRx support
The rgb24 renderer uses the wrong pixel stride and the rgb32 renderer
assumes alpha is meaningful. We can use neither.
Fixes: https://gitlab.gnome.org/GNOME/cheese/-/issues/51
---
clutter-gst/clutter-gst-video-sink.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 2cbabe6043ca..2c1c10c7810b 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -98,8 +98,6 @@ GST_DEBUG_CATEGORY_STATIC (clutter_gst_video_sink_debug);
"I420," \
"RGBA," \
"BGRA," \
- "RGBx," \
- "BGRx," \
"RGB," \
"BGR," \
"NV12 }"
@@ -1392,21 +1390,21 @@ static ClutterGstRenderer rgb32_glsl_renderer =
";"
#endif
MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
- "{ RGBA, BGRA, RGBx, BGRx }")),
+ "{ RGBA, BGRA }")),
1, /* n_layers */
clutter_gst_rgb32_glsl_setup_pipeline,
clutter_gst_rgb32_upload,
clutter_gst_rgb32_upload_gl,
clutter_gst_dummy_shutdown,
};
static ClutterGstRenderer rgb32_renderer =
{
"RGB 32",
CLUTTER_GST_RGB32,
0,
GST_STATIC_CAPS (MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
- "{ RGBA, BGRA, RGBx, BGRx }")),
+ "{ RGBA, BGRA }")),
2, /* n_layers */
clutter_gst_rgb32_setup_pipeline,
clutter_gst_rgb32_upload,
@@ -1907,12 +1905,10 @@ clutter_gst_video_sink_parse_caps (GstCaps *caps,
format = CLUTTER_GST_NV12;
break;
case GST_VIDEO_FORMAT_RGB:
- case GST_VIDEO_FORMAT_RGBx:
format = CLUTTER_GST_RGB24;
bgr = FALSE;
break;
case GST_VIDEO_FORMAT_BGR:
- case GST_VIDEO_FORMAT_BGRx:
format = CLUTTER_GST_RGB24;
bgr = TRUE;
break;