svn commit: r311951 - head/multimedia/cheese/files

[Koop Mast]

Author: kwm
Date: Fri Feb  8 20:14:49 2013
New Revision: 311951
URL: http://svnweb.freebsd.org/changeset/ports/311951

Log:
  Fix build with clang.
  
  PR:		ports/174434
  Submitted by:	rm@

Modified:
  head/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c

Modified: head/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
==============================================================================
--- head/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c	Fri Feb  8 19:18:40 2013	(r311950)
+++ head/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c	Fri Feb  8 20:14:49 2013	(r311951)
@@ -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)
  {