From 802e203715ae69d8041f483e9950b9d933696421 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 27 2022 12:24:06 +0000 Subject: import cheese-3.28.0-4.el8 --- diff --git a/SOURCES/cheese-3.28.0-ignore-non-YUY2-formats.patch b/SOURCES/cheese-3.28.0-ignore-non-YUY2-formats.patch new file mode 100644 index 0000000..6c51945 --- /dev/null +++ b/SOURCES/cheese-3.28.0-ignore-non-YUY2-formats.patch @@ -0,0 +1,38 @@ +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); + diff --git a/SPECS/cheese.spec b/SPECS/cheese.spec index 0c432c9..8eb5332 100644 --- a/SPECS/cheese.spec +++ b/SPECS/cheese.spec @@ -1,7 +1,7 @@ Name: cheese Epoch: 2 Version: 3.28.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Application for taking pictures and movies from a webcam License: GPLv2+ @@ -9,6 +9,8 @@ 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 @@ -120,6 +122,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk %changelog +* Thu Mar 24 2022 David King - 2:3.28.0-4 +- Ignore grayscale formats from IR cameras (#1923065) + * Wed Nov 25 2020 David King - 2:3.28.0-3 - Fix keyboard accelerator patch (#1625735)