From 3e63e1c8fcd238bb8558bf6f1840754b48603bdd Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 9 Nov 2008 16:21:34 +0000 Subject: [PATCH] - Fix cams which only support 1 resolution not working (rh470698, gnome560032) --- cheese-2.24.1-resolution-range.patch | 14 ++++++++++++++ cheese.spec | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 cheese-2.24.1-resolution-range.patch diff --git a/cheese-2.24.1-resolution-range.patch b/cheese-2.24.1-resolution-range.patch new file mode 100644 index 0000000..7449f90 --- /dev/null +++ b/cheese-2.24.1-resolution-range.patch @@ -0,0 +1,14 @@ +diff -up cheese-2.24.1/src/cheese-webcam.c~ cheese-2.24.1/src/cheese-webcam.c +--- cheese-2.24.1/src/cheese-webcam.c~ 2008-11-09 17:05:26.000000000 +0100 ++++ cheese-2.24.1/src/cheese-webcam.c 2008-11-09 17:05:26.000000000 +0100 +@@ -567,7 +567,9 @@ cheese_webcam_get_supported_video_format + + cur_width = min_width; + cur_height = min_height; +- while (cur_width < max_width && cur_height < max_height) ++ /* Gstreamer will sometimes give us a range with min_xxx == max_xxx, ++ we use <= here (and not below) to make this work */ ++ while (cur_width <= max_width && cur_height <= max_height) + { + CheeseVideoFormat video_format; + diff --git a/cheese.spec b/cheese.spec index 453923b..6c5aa1f 100644 --- a/cheese.spec +++ b/cheese.spec @@ -1,12 +1,14 @@ Name: cheese Version: 2.24.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A webcam application for snapshots and movies Group: Amusements/Graphics License: GPLv2+ URL: http://live.gnome.org/Cheese Source0: http://download.gnome.org/sources/cheese/2.24/%{name}-%{version}.tar.bz2 +# Submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=560032 +Patch0: cheese-2.24.1-resolution-range.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.10.0 @@ -42,6 +44,7 @@ gstreamer-backend. %prep %setup -q +%patch0 -p1 %build @@ -126,6 +129,9 @@ fi %{_datadir}/dbus-1/services/org.gnome.Cheese.service %changelog +* Sun Nov 9 2008 Hans de Goede 2.24.1-2 +- Fix cams which only support 1 resolution not working (rh470698, gnome560032) + * Mon Oct 20 2008 Matthias Clasen 2.24.1-1 - Update to 2.24.1