Compare commits

..

No commits in common. "c8" and "imports/c8s/cheese-3.28.0-3.el8" have entirely different histories.

2 changed files with 1 additions and 44 deletions

View File

@ -1,38 +0,0 @@
diff --cc libcheese/cheese-camera-device.c
index e994c5f5,8f1e13af..00000000
--- a/libcheese/cheese-camera-device.c
+++ b/libcheese/cheese-camera-device.c
@@@ -181,18 -219,8 +181,19 @@@ cheese_camera_device_filter_caps (Chees
{
GstCaps *filter;
GstCaps *allowed;
+ gsize i;
+
+ filter = gst_caps_new_empty ();
- filter = format_caps (formats);
+ for (i = 0; formats[i] != NULL; i++)
+ {
+ gst_caps_append (filter,
+ gst_caps_new_simple (formats[i],
+ "framerate", GST_TYPE_FRACTION_RANGE,
+ 0, 1, CHEESE_MAXIMUM_RATE, 1,
++ "format", G_TYPE_STRING, "YUY2",
+ NULL));
+ }
allowed = gst_caps_intersect (caps, filter);
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
index 5b4b43b5..a15733bd 100644
--- a/libcheese/cheese-camera-device-monitor.c
+++ b/libcheese/cheese-camera-device-monitor.c
@@ -294,7 +294,7 @@ initable_init (GInitable *initable,
gst_bus_add_watch (bus, cheese_camera_device_monitor_bus_func, monitor);
gst_object_unref (bus);
- caps = gst_caps_new_empty_simple ("video/x-raw");
+ caps = gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING, "YUY2", NULL);
gst_device_monitor_add_filter (priv->monitor, "Video/Source", caps);
gst_caps_unref (caps);

View File

@ -1,7 +1,7 @@
Name: cheese
Epoch: 2
Version: 3.28.0
Release: 4%{?dist}
Release: 3%{?dist}
Summary: Application for taking pictures and movies from a webcam
License: GPLv2+
@ -9,8 +9,6 @@ URL: https://wiki.gnome.org/Apps/Cheese
Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=1625735
Patch0: cheese-3.28.0-fix-accelerators.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1923065
Patch1: cheese-3.28.0-ignore-non-YUY2-formats.patch
BuildRequires: chrpath
BuildRequires: desktop-file-utils
@ -122,9 +120,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk
%changelog
* Thu Mar 24 2022 David King <dking@redhat.com> - 2:3.28.0-4
- Ignore grayscale formats from IR cameras (#1923065)
* Wed Nov 25 2020 David King <dking@redhat.com> - 2:3.28.0-3
- Fix keyboard accelerator patch (#1625735)