diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-10-08 19:24:25 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-10-08 19:24:25 +0800 |
| commit | 5090a53b85cfd34f01994e94ac90b7a6da28b851 (patch) | |
| tree | 3582bc80f41a826c48573bac199016805df9e5bb | |
| parent | 3475fa2beccd341fb14a6b5d12a604567ca75c1e (diff) | |
| download | marcuscom-ports-5090a53b85cfd34f01994e94ac90b7a6da28b851.tar.gz marcuscom-ports-5090a53b85cfd34f01994e94ac90b7a6da28b851.tar.zst marcuscom-ports-5090a53b85cfd34f01994e94ac90b7a6da28b851.zip | |
Sync with ports, fix compile with clang.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18778 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c | 12 |
1 files changed, 6 insertions, 6 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 8604c2377..628066e47 100644 --- a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c +++ b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c @@ -1,5 +1,5 @@ ---- libcheese/cheese-camera-device-monitor.c.orig 2010-08-16 23:00:43.000000000 +0200 -+++ libcheese/cheese-camera-device-monitor.c 2010-08-18 09:51:48.000000000 +0200 +--- libcheese/cheese-camera-device-monitor.c.orig 2010-09-27 09:54:58.000000000 +0000 ++++ libcheese/cheese-camera-device-monitor.c 2013-02-08 19:52:15.000000000 +0000 @@ -24,24 +24,11 @@ #endif @@ -54,12 +54,12 @@ } CheeseCameraDeviceMonitorPrivate; enum -@@ -102,111 +87,77 @@ cheese_camera_device_monitor_error_quark +@@ -102,111 +87,78 @@ cheese_camera_device_monitor_error_quark return g_quark_from_static_string ("cheese-camera-error-quark"); } -#ifdef HAVE_UDEV --static void + static void -cheese_camera_device_monitor_added (CheeseCameraDeviceMonitor *monitor, - GUdevDevice *udevice) +cheese_camera_device_monitor_handle_udi (CheeseCameraDeviceMonitor *monitor, @@ -210,7 +210,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); @@ -375,7 +375,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) { |