Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/cheese-01-lack-v4l1.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18095 cffd815aff74
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18095
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
     1
 
--- ./configure.ac.orig	2009-05-16 22:38:55.926956000 +0800
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
     2
 
+++ ./configure.ac	2009-05-16 22:39:26.689492000 +0800
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
     3
 
@@ -15,7 +15,7 @@
15976
b2d1646f2c88 Bump Cheese to the latest devel build and update patches.
elaine
parents:
diff changeset 
     4
 
 AC_HEADER_STDC
b2d1646f2c88 Bump Cheese to the latest devel build and update patches.
elaine
parents:
diff changeset 
     5
 
 AM_PROG_LIBTOOL
b2d1646f2c88 Bump Cheese to the latest devel build and update patches.
elaine
parents:
diff changeset 
     6
b2d1646f2c88 Bump Cheese to the latest devel build and update patches.
elaine
parents:
diff changeset 
     7
 
-CFLAGS="${CFLAGS} -Wall"
18095
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
     8
 
+CFLAGS="${CFLAGS}"
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
     9
18094
05150cd7daed 2010-06-07 Brian Lu <[email protected]>
hawklu
parents: 17934
diff changeset 
    10
 
 GNOME_MAINTAINER_MODE_DEFINES
05150cd7daed 2010-06-07 Brian Lu <[email protected]>
hawklu
parents: 17934
diff changeset 
    11
 
 GNOME_COMPILE_WARNINGS
18095
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    12
 
@@ -68,7 +68,7 @@
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    13
 
 CAIRO_REQUIRED=1.4.0
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    14
 
 DBUS_REQUIRED=1.0
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    15
 
 DBUS_GLIB_REQUIRED=0.7
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    16
 
-HAL_REQUIRED=0.5.9
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    17
 
+HAL_REQUIRED=0.5.8
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    18
 
 PANGOCAIRO_REQUIRED=1.18.0
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    19
 
 LIBRSVG_REQUIRED=2.18.0
15976
b2d1646f2c88 Bump Cheese to the latest devel build and update patches.
elaine
parents:
diff changeset 
    20
18095
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    21
 
--- ./src/cheese-webcam.c.orig	2009-05-19 04:46:03.000000000 +0800
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    22
 
+++ ./src/cheese-webcam.c	2009-06-30 11:47:32.067516000 +0800
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    23
 
@@ -37,7 +37,7 @@
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    24
 
 #include <fcntl.h>
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    25
 
 #include <unistd.h>
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    26
 
 #include <sys/ioctl.h>
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    27
 
-#include <linux/videodev.h>
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    28
 
+#include <sys/videodev2.h>
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    29
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    30
 
 #include "cheese-webcam.h"
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    31
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    32
 
diff -ruN cheese-2.27.4.orig/src/cheese-webcam.c cheese-2.27.4/src/cheese-webcam.c
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    33
 
--- cheese-2.27.4.orig/src/cheese-webcam.c	2009-07-19 21:48:47.753253823 +0100
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    34
 
+++ cheese-2.27.4/src/cheese-webcam.c	2009-07-19 21:51:57.393929931 +0100
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    35
 
@@ -335,7 +335,7 @@
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    36
 
     char                   *subsystem  = NULL;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    37
 
     char                   *gstreamer_src, *product_name;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    38
 
     struct v4l2_capability  v2cap;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    39
 
-    struct video_capability v1cap;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    40
 
+    //struct video_capability v1cap;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    41
 
     gint                    vendor_id     = 0;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    42
 
     gint                    product_id    = 0;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    43
 
     gchar                  *property_name = NULL;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    44
 
@@ -398,23 +398,7 @@
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    45
 
       continue;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    46
 
     }
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    47
 
     ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    48
 
-    if (ok < 0)
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    49
 
-    {
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    50
 
-      ok = ioctl (fd, VIDIOCGCAP, &v1cap);
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    51
 
-      if (ok < 0)
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    52
 
-      {
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    53
 
-        g_warning ("Error while probing v4l capabilities for %s: %s",
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    54
 
-                   device, strerror (errno));
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    55
 
-        libhal_free_string (device);
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    56
 
-        close (fd);
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    57
 
-        continue;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    58
 
-      }
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    59
 
-      g_print ("Detected v4l device: %s\n", v1cap.name);
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    60
 
-      g_print ("Device type: %d\n", v1cap.type);
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    61
 
-      gstreamer_src = "v4lsrc";
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    62
 
-      product_name  = v1cap.name;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    63
 
-    }
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    64
 
-    else
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    65
 
+    if (ok >= 0)
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    66
 
     {
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    67
 
       guint cap = v2cap.capabilities;
cffd815aff74 Rolled back the patch to the version that for cheese 2.28.1.
davelam
parents: 18094
diff changeset 
    68
 
       g_print ("Detected v4l2 device: %s\n", v2cap.card);
upstream/oracle/spec-files