rpms/cheese/devel cheese-2.24.1-resolution-range.patch, NONE, 1.1 cheese.spec, 1.38, 1.39

Hans de Goede jwrdegoede at fedoraproject.org
Sun Nov 9 16:22:04 UTC 2008


Author: jwrdegoede

Update of /cvs/extras/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26521

Modified Files:
	cheese.spec 
Added Files:
	cheese-2.24.1-resolution-range.patch 
Log Message:
* Sun Nov  9 2008 Hans de Goede <hdegoede at redhat.com> 2.24.1-2
- Fix cams which only support 1 resolution not working (rh470698, gnome560032)


cheese-2.24.1-resolution-range.patch:

--- NEW FILE cheese-2.24.1-resolution-range.patch ---
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;
 


Index: cheese.spec
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cheese.spec	20 Oct 2008 16:20:33 -0000	1.38
+++ cheese.spec	9 Nov 2008 16:21:34 -0000	1.39
@@ -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 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -126,6 +129,9 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Sun Nov  9 2008 Hans de Goede <hdegoede at redhat.com> 2.24.1-2
+- Fix cams which only support 1 resolution not working (rh470698, gnome560032)
+
 * Mon Oct 20 2008 Matthias Clasen  <mclasen at redhat.com> 2.24.1-1
 - Update to 2.24.1
 




More information about the fedora-extras-commits mailing list