summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-04-18 04:06:47 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-04-18 04:06:47 +0800
commitbd3305a813929106876368de0fce9ec6782488d6 (patch)
treee4d9b8317ab554d468d1e1a2fd59b039da798d4b
parent5500a12f92d26f9fb5d00396d5f3b76fbacf4d43 (diff)
downloadmarcuscom-ports-bd3305a813929106876368de0fce9ec6782488d6.tar
marcuscom-ports-bd3305a813929106876368de0fce9ec6782488d6.tar.gz
marcuscom-ports-bd3305a813929106876368de0fce9ec6782488d6.tar.bz2
marcuscom-ports-bd3305a813929106876368de0fce9ec6782488d6.tar.lz
marcuscom-ports-bd3305a813929106876368de0fce9ec6782488d6.tar.xz
marcuscom-ports-bd3305a813929106876368de0fce9ec6782488d6.tar.zst
marcuscom-ports-bd3305a813929106876368de0fce9ec6782488d6.zip
Add a missing header.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14051 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
index 330b7715c..98928842f 100644
--- a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
+++ b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
@@ -1,12 +1,12 @@
--- libcheese/cheese-camera-device-monitor.c.orig 2010-03-29 16:27:42.000000000 -0400
-+++ libcheese/cheese-camera-device-monitor.c 2010-04-17 12:09:21.000000000 -0400
-@@ -25,24 +25,9 @@
++++ libcheese/cheese-camera-device-monitor.c 2010-04-17 16:03:28.000000000 -0400
+@@ -25,23 +25,9 @@
#include <glib-object.h>
#include <dbus/dbus-glib-lowlevel.h>
+#include <libhal.h>
#include <string.h>
-
+-
-#ifdef HAVE_UDEV
- #define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1
- #include <gudev/gudev.h>
@@ -22,11 +22,11 @@
- #include <sys/videodev2.h>
- #endif /* USE_SYS_VIDEOIO_H */
-#endif
--
++#include <unistd.h>
+
#include "cheese-camera-device-monitor.h"
#include "cheese-marshal.h"
-
-@@ -54,9 +39,9 @@
+@@ -54,9 +40,9 @@
* #CheeseCameraDeviceMonitor provides a basic interface for
* video4linux device enumeration and hotplugging.
*
@@ -38,7 +38,7 @@
* CheeseCameraDeviceMonitor::added or
* CheeseCameraDeviceMonitor::removed signal when an event happens.
*/
-@@ -80,11 +65,9 @@ enum CheeseCameraDeviceMonitorError
+@@ -80,11 +66,9 @@ enum CheeseCameraDeviceMonitorError
typedef struct
{
@@ -52,7 +52,7 @@
} CheeseCameraDeviceMonitorPrivate;
enum
-@@ -102,111 +85,79 @@ cheese_camera_device_monitor_error_quark
+@@ -102,111 +86,79 @@ cheese_camera_device_monitor_error_quark
return g_quark_from_static_string ("cheese-camera-error-quark");
}
@@ -207,7 +207,7 @@
}
/**
-@@ -222,115 +173,85 @@ void
+@@ -222,115 +174,85 @@ void
cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor)
{
CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
@@ -371,7 +371,7 @@
G_OBJECT_CLASS (cheese_camera_device_monitor_parent_class)->finalize (object);
}
-@@ -385,14 +306,52 @@ cheese_camera_device_monitor_class_init
+@@ -385,14 +307,52 @@ cheese_camera_device_monitor_class_init
static void
cheese_camera_device_monitor_init (CheeseCameraDeviceMonitor *monitor)
{