Home | History | Annotate | Download | only in patches
      1 --- ./configure.ac.orig	2009-05-16 22:38:55.926956000 +0800
      2 +++ ./configure.ac	2009-05-16 22:39:26.689492000 +0800
      3 @@ -15,7 +15,7 @@
      4  AC_HEADER_STDC
      5  AM_PROG_LIBTOOL
      6  
      7 -CFLAGS="${CFLAGS} -Wall"
      8 +CFLAGS="${CFLAGS}"
      9  
     10  GNOME_MAINTAINER_MODE_DEFINES
     11  GNOME_COMPILE_WARNINGS
     12 @@ -68,7 +68,7 @@
     13  CAIRO_REQUIRED=1.4.0
     14  DBUS_REQUIRED=1.0
     15  DBUS_GLIB_REQUIRED=0.7
     16 -HAL_REQUIRED=0.5.9
     17 +HAL_REQUIRED=0.5.8
     18  PANGOCAIRO_REQUIRED=1.18.0
     19  LIBRSVG_REQUIRED=2.18.0
     20  
     21 --- ./src/cheese-webcam.c.orig	2009-05-19 04:46:03.000000000 +0800
     22 +++ ./src/cheese-webcam.c	2009-06-30 11:47:32.067516000 +0800
     23 @@ -37,7 +37,7 @@
     24  #include <fcntl.h>
     25  #include <unistd.h>
     26  #include <sys/ioctl.h>
     27 -#include <linux/videodev.h>
     28 +#include <sys/videodev2.h>
     29  
     30  #include "cheese-webcam.h"
     31  
     32 diff -ruN cheese-2.27.4.orig/src/cheese-webcam.c cheese-2.27.4/src/cheese-webcam.c
     33 --- cheese-2.27.4.orig/src/cheese-webcam.c	2009-07-19 21:48:47.753253823 +0100
     34 +++ cheese-2.27.4/src/cheese-webcam.c	2009-07-19 21:51:57.393929931 +0100
     35 @@ -335,7 +335,7 @@
     36      char                   *subsystem  = NULL;
     37      char                   *gstreamer_src, *product_name;
     38      struct v4l2_capability  v2cap;
     39 -    struct video_capability v1cap;
     40 +    //struct video_capability v1cap;
     41      gint                    vendor_id     = 0;
     42      gint                    product_id    = 0;
     43      gchar                  *property_name = NULL;
     44 @@ -398,23 +398,7 @@
     45        continue;
     46      }
     47      ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
     48 -    if (ok < 0)
     49 -    {
     50 -      ok = ioctl (fd, VIDIOCGCAP, &v1cap);
     51 -      if (ok < 0)
     52 -      {
     53 -        g_warning ("Error while probing v4l capabilities for %s: %s",
     54 -                   device, strerror (errno));
     55 -        libhal_free_string (device);
     56 -        close (fd);
     57 -        continue;
     58 -      }
     59 -      g_print ("Detected v4l device: %s\n", v1cap.name);
     60 -      g_print ("Device type: %d\n", v1cap.type);
     61 -      gstreamer_src = "v4lsrc";
     62 -      product_name  = v1cap.name;
     63 -    }
     64 -    else
     65 +    if (ok >= 0)
     66      {
     67        guint cap = v2cap.capabilities;
     68        g_print ("Detected v4l2 device: %s\n", v2cap.card);
     69