From 1b634c34d04021361d13d92d7debb461ea1a898e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 10 2018 05:39:39 +0000
Subject: import cheese-3.22.1-2.el7


---

diff --git a/SOURCES/cheese-3.22.1-fix-device-commandline.patch b/SOURCES/cheese-3.22.1-fix-device-commandline.patch
new file mode 100644
index 0000000..c3160c4
--- /dev/null
+++ b/SOURCES/cheese-3.22.1-fix-device-commandline.patch
@@ -0,0 +1,48 @@
+From c8c75796ff3e723d77bd68dec3fe91a072b36fc4 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Fri, 21 Apr 2017 11:59:39 +0200
+Subject: [PATCH 01/27] Correctly select the given camera device
+
+Due to a bug in the VAPI file the code would pass a string to the camera
+setup routine instead of a CameraDevice object. As the setup routine
+already has code to automatically select an appropriate device based on
+the name passing an argument is not even required.
+
+Note that the --device parameter might be somewhat confusing as it
+refers to the devices name and not to the /dev/videoX device file.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777047
+---
+ src/cheese-application.vala | 2 +-
+ src/vapi/cheese-common.vapi | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cheese-application.vala b/src/cheese-application.vala
+index 633a25eb..ee107395 100644
+--- a/src/cheese-application.vala
++++ b/src/cheese-application.vala
+@@ -203,7 +203,7 @@ public class Cheese.Application : Gtk.Application
+ 
+         try
+         {
+-            camera.setup (device);
++            camera.setup ();
+         }
+         catch (Error err)
+         {
+diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
+index a4c07a96..2ee13f18 100644
+--- a/src/vapi/cheese-common.vapi
++++ b/src/vapi/cheese-common.vapi
+@@ -48,7 +48,7 @@ namespace Cheese
+     public void                        toggle_effects_pipeline (bool active);
+     public void                        connect_effect_texture (Cheese.Effect effect, Clutter.Actor texture);
+     public void                        set_video_format (Cheese.VideoFormat format);
+-    public void                        setup (string udi) throws GLib.Error;
++    public void                        setup (Cheese.CameraDevice? device = null) throws GLib.Error;
+     public void                        start_video_recording (string filename);
+     public void                        stop ();
+     public void                        stop_video_recording ();
+-- 
+2.13.6
+
diff --git a/SPECS/cheese.spec b/SPECS/cheese.spec
index 8fc7fe5..17bfd73 100644
--- a/SPECS/cheese.spec
+++ b/SPECS/cheese.spec
@@ -1,12 +1,14 @@
 Name:           cheese
 Epoch:          2
 Version:        3.22.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Apps/Cheese
 Source0:        https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
+# https://bugzilla.redhat.com/show_bug.cgi?id=1444760
+Patch0:         cheese-3.22.1-fix-device-commandline.patch
 
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
@@ -71,6 +73,7 @@ for writing applications that require a webcam display widget.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -154,6 +157,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Thu Oct 19 2017 David King <dking@redhat.com> - 3.22.1-2
+- Fix a device argument crash (#1444760)
+
 * Wed Oct 19 2016 Kalev Lember <klember@redhat.com> - 2:3.22.1-1
 - Update to 3.22.1
 - Resolves: #1386826