--- a/ChangeLog	Sun Jul 19 20:04:37 2009 +0000
+++ b/ChangeLog	Sun Jul 19 21:02:48 2009 +0000
@@ -1,3 +1,7 @@
+2009-07-19  Christian Kelly  <[email protected]>
+
+	* patches/cheese-01-lack-v4l1.diff, SUNWcheese.spec: Bump to 2.27.4.
+
 2009-07-19  Christian Kelly  <[email protected]>
 
 	* SUNWgnome-a11y-libs.spec: Fix problem overwriting /usr/java.

--- a/SUNWcheese.spec	Sun Jul 19 20:04:37 2009 +0000
+++ b/SUNWcheese.spec	Sun Jul 19 21:02:48 2009 +0000
@@ -15,7 +15,7 @@
 
 Name:                    SUNWcheese
 Summary:                 Cheese - GNOME application for taking photos and videos from a webcam
-Version:                 2.27.3
+Version:                 2.27.4
 Source:                  http://ftp.gnome.org/pub/GNOME/sources/cheese/2.27/cheese-%{version}.tar.gz
 
 # owner:elaine date:2008-09-01 type:branding
@@ -88,7 +88,8 @@
     CPUS=1
 fi
 
-autoconf
+libtoolize --force
+autoreconf
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} \
             --libdir=%{_libdir}              \
             --libexecdir=%{_libexecdir}      \

--- a/patches/cheese-01-lack-v4l1.diff	Sun Jul 19 20:04:37 2009 +0000
+++ b/patches/cheese-01-lack-v4l1.diff	Sun Jul 19 21:02:48 2009 +0000
@@ -29,16 +29,19 @@
  
  #include "cheese-webcam.h"
  
-@@ -303,7 +303,7 @@
-     char                   *subsystem = NULL;
+diff -ruN cheese-2.27.4.orig/src/cheese-webcam.c cheese-2.27.4/src/cheese-webcam.c
+--- cheese-2.27.4.orig/src/cheese-webcam.c	2009-07-19 21:48:47.753253823 +0100
++++ cheese-2.27.4/src/cheese-webcam.c	2009-07-19 21:51:57.393929931 +0100
+@@ -335,7 +335,7 @@
+     char                   *subsystem  = NULL;
      char                   *gstreamer_src, *product_name;
      struct v4l2_capability  v2cap;
 -    struct video_capability v1cap;
 +    //struct video_capability v1cap;
-     gint vendor_id = 0;
-     gint product_id = 0;
-     gchar *property_name = NULL;
-@@ -363,23 +363,7 @@
+     gint                    vendor_id     = 0;
+     gint                    product_id    = 0;
+     gchar                  *property_name = NULL;
+@@ -398,23 +398,7 @@
        continue;
      }
      ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
@@ -48,7 +51,7 @@
 -      if (ok < 0)
 -      {
 -        g_warning ("Error while probing v4l capabilities for %s: %s",
--                 device, strerror (errno));
+-                   device, strerror (errno));
 -        libhal_free_string (device);
 -        close (fd);
 -        continue;