Mercurial Mercurial > upstream > spec-files-extra / 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-hal-backend.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1362 477b50cb04b5
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1362
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     1
 
--- ./src/cheese-webcam.c.ori	2008-08-19 02:32:53.000000000 +0800
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     2
 
+++ ./src/cheese-webcam.c	2008-09-01 17:05:27.001865000 +0800
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     3
 
@@ -241,6 +241,10 @@
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     4
 
                      * refers to a fake device so that resolution changing still
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     5
 
                      * works even if the computer doesn't have a webcam. */
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     6
 
   char **udis;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     7
 
+#ifdef SOLARIS
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     8
 
+  char *dev_name;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
     9
 
+  struct stat s;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    10
 
+#endif
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    11
 
   DBusError error;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    12
 
   LibHalContext *hal_ctx;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    13
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    14
 
@@ -287,6 +291,19 @@
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    15
 
   if (num_udis > 0)
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    16
 
         priv->num_webcam_devices = num_devices = num_udis;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    17
 
   else
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    18
 
+#ifdef SOLARIS
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    19
 
+    for (i = 0;;i++)
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    20
 
+    {
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    21
 
+      dev_name = g_strdup_printf("%s%d", "/dev/video", i);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    22
 
+      if (lstat(dev_name, &s) != 0)
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    23
 
+        break;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    24
 
+      else
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    25
 
+        priv->num_webcam_devices = num_devices = num_udis = 1;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    26
 
+    }
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    27
 
+  if (num_udis >= 1 && i > 0)
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    28
 
+    dev_name = g_strdup_printf("%s%d", "/dev/video", --i);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    29
 
+  else
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    30
 
+#endif
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    31
 
   {
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    32
 
     num_devices = 1;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    33
 
     priv->num_webcam_devices = num_udis;  /* We don't have any real cameras--
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    34
 
@@ -304,6 +321,7 @@
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    35
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    36
 
   for (i = 0; i < priv->num_webcam_devices; i++)
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    37
 
   {
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    38
 
+#ifndef SOLARIS
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    39
 
     char *device;
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    40
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    41
 
     device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    42
 
@@ -315,8 +333,14 @@
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    43
 
     }
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    44
 
     priv->webcam_devices[i].video_device = g_strdup (device);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    45
 
     libhal_free_string (device);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    46
 
+#else
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    47
 
+    priv->webcam_devices[i].video_device = g_strdup (dev_name);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    48
 
+#endif
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    49
 
   }
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    50
 
   libhal_free_string_array (udis);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    51
 
+#ifdef SOLARIS
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    52
 
+  libhal_free_string(dev_name);
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    53
 
+#endif
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    54
 
 }
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    55
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    56
 
 static void
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    57
 
--- ./configure.ac.ori	2008-09-01 17:01:24.368827000 +0800
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    58
 
+++ ./configure.ac	2008-09-01 17:04:02.005457000 +0800
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    59
 
@@ -15,7 +15,7 @@
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    60
 
 AC_HEADER_STDC
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    61
 
 AM_PROG_LIBTOOL
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    62
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    63
 
-CFLAGS="${CFLAGS} -Wall"
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    64
 
+CFLAGS="${CFLAGS} -DSOLARIS"
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    65
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    66
 
 GNOME_MAINTAINER_MODE_DEFINES
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    67
 
 GNOME_COMPILE_WARNINGS
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    68
 
@@ -66,7 +66,7 @@
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    69
 
 GNOME_VFS_REQUIRED=2.18.0
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    70
 
 LIBEBOOK_REQUIRED=1.12.0
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    71
 
 DBUS_REQUIRED=1.0
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    72
 
-HAL_REQUIRED=0.5.9
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    73
 
+HAL_REQUIRED=0.5.8
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    74
 
 DBUS_GLIB_REQUIRED=0.7
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    75
 
 LIBRSVG_REQUIRED=2.18.0
477b50cb04b5 Bump Cheese to 2.23.90. Add patches and remove an obsolete patch.
elaine_sun
parents:
diff changeset 
    76
 
 PANGOCAIRO_REQUIRED=1.18.0
upstream/spec-files-extra