4 files changed, 40 insertions, 22 deletions

diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index fcd9850c331f..64582184ae4a 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -3,12 +3,11 @@
 # Whom:					FreeBSD GNOME Team <gnome@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/cheese/Makefile,v 1.58 2010/04/27 15:51:59 kwm Exp $
+#   $MCom: ports/multimedia/cheese/Makefile,v 1.63 2010/09/28 08:21:02 kwm Exp $
 #
 
 PORTNAME=	cheese
-PORTVERSION=	2.30.1
-PORTREVISION=	3
+PORTVERSION=	2.32.0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index 4208c352ab0d..32da8e840986 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/cheese-2.30.1.tar.bz2) = 1599fded8a1797ea51fb010af4e6c45b
-SHA256 (gnome2/cheese-2.30.1.tar.bz2) = 48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030d4eed3bc3cbd9a
-SIZE (gnome2/cheese-2.30.1.tar.bz2) = 5266128
+MD5 (gnome2/cheese-2.32.0.tar.bz2) = e3b822e46b2558d0bbdfa4809d5d3c24
+SHA256 (gnome2/cheese-2.32.0.tar.bz2) = 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087
+SIZE (gnome2/cheese-2.32.0.tar.bz2) = 5303805
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 05da52bbd4f6..8604c237799c 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-03-29 16:27:42.000000000 -0400
-+++ libcheese/cheese-camera-device-monitor.c	2010-04-17 17:57:57.000000000 -0400
+--- 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
 @@ -24,24 +24,11 @@
  #endif
  
@@ -54,12 +54,12 @@
  } CheeseCameraDeviceMonitorPrivate;
  
  enum
-@@ -102,111 +87,79 @@ cheese_camera_device_monitor_error_quark
+@@ -102,111 +87,77 @@ 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,
@@ -93,7 +93,7 @@
 -      vendor_id = g_ascii_strtoll (vendor, NULL, 16);
 -    product = g_udev_device_get_property (udevice, "ID_MODEL_ID");
 -    if (product != NULL)
--      product_id = g_ascii_strtoll (vendor, NULL, 16);
+-      product_id = g_ascii_strtoll (product, NULL, 16);
 -    if (vendor_id == 0 || product_id == 0)
 -    {
 -      GST_WARNING ("Error getting vendor and product id");
@@ -119,10 +119,10 @@
 +  if (dbus_error_is_set (&error))
    {
 -    GST_WARNING ("Error getting V4L device");
+-    return;
 +    GST_WARNING ("error getting V4L device for %s: %s: %s", udi, error.name, error.message);
 +    dbus_error_free (&error);
 +    libhal_free_string (product_name);
-     return;
    }
  
 -  /* vbi devices support capture capability too, but cannot be used,
@@ -181,12 +181,13 @@
  static void
 -cheese_camera_device_monitor_removed (CheeseCameraDeviceMonitor *monitor,
 -                                      GUdevDevice               *udevice)
-+cheese_camera_device_monitor_removed (LibHalContext             *ctx,
-+                                      const char                *udi)
- {
+-{
 -  g_signal_emit (monitor, monitor_signals[REMOVED], 0,
 -                 g_udev_device_get_property (udevice, "DEVPATH"));
 -}
++cheese_camera_device_monitor_removed (LibHalContext             *ctx,
++                                      const char                *udi)
++ {
 +  CheeseCameraDeviceMonitor *monitor;
 +  void *data;
  
@@ -209,7 +210,7 @@
  }
  
  /**
-@@ -222,115 +175,85 @@ void
+@@ -222,115 +173,85 @@ void
  cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor)
  {
    CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
@@ -221,19 +222,20 @@
 +  DBusError   error;
  
 -  if (priv->client == NULL)
+-    return;
 +  GST_INFO ("Probing devices with HAL...");
-+
-+  if (priv->hal_ctx == NULL)
-     return;
  
 -  GST_INFO ("Probing devices with udev...");
-+  dbus_error_init (&error);
++  if (priv->hal_ctx == NULL)
++     return;
  
 -  devices = g_udev_client_query_by_subsystem (priv->client, "video4linux");
-+  udis = libhal_find_device_by_capability (priv->hal_ctx, "video4linux", &num_udis, &error);
++  dbus_error_init (&error);
  
 -  /* Initialize camera structures */
 -  for (l = devices; l != NULL; l = l->next)
++  udis = libhal_find_device_by_capability (priv->hal_ctx, "video4linux", &num_udis, &error);
++
 +  if (dbus_error_is_set (&error))
    {
 -    cheese_camera_device_monitor_added (monitor, l->data);
@@ -373,7 +375,7 @@
    G_OBJECT_CLASS (cheese_camera_device_monitor_parent_class)->finalize (object);
  }
  
-@@ -385,14 +308,52 @@ cheese_camera_device_monitor_class_init 
+@@ -385,14 +306,52 @@ cheese_camera_device_monitor_class_init 
  static void
  cheese_camera_device_monitor_init (CheeseCameraDeviceMonitor *monitor)
  {
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index cf424dad1a6b..2755ff708d95 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -161,6 +161,13 @@ share/gnome/help/cheese/ru/figures/cheese-main.jpg
 share/gnome/help/cheese/ru/figures/cheese-preferences.jpg
 share/gnome/help/cheese/ru/figures/cheese-share.jpg
 share/gnome/help/cheese/ru/figures/cheese-wide.jpg
+share/gnome/help/cheese/sl/cheese.xml
+share/gnome/help/cheese/sl/figures/cheese-effects.jpg
+share/gnome/help/cheese/sl/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/sl/figures/cheese-main.jpg
+share/gnome/help/cheese/sl/figures/cheese-preferences.jpg
+share/gnome/help/cheese/sl/figures/cheese-share.jpg
+share/gnome/help/cheese/sl/figures/cheese-wide.jpg
 share/gnome/help/cheese/sv/cheese.xml
 share/gnome/help/cheese/sv/figures/cheese-effects.jpg
 share/gnome/help/cheese/sv/figures/cheese-fullscreen.jpg
@@ -222,6 +229,8 @@ share/locale/hu/LC_MESSAGES/cheese.mo
 share/locale/id/LC_MESSAGES/cheese.mo
 share/locale/it/LC_MESSAGES/cheese.mo
 share/locale/ja/LC_MESSAGES/cheese.mo
+share/locale/ka/LC_MESSAGES/cheese.mo
+share/locale/kk/LC_MESSAGES/cheese.mo
 share/locale/kn/LC_MESSAGES/cheese.mo
 share/locale/ko/LC_MESSAGES/cheese.mo
 share/locale/ku/LC_MESSAGES/cheese.mo
@@ -254,6 +263,7 @@ share/locale/ta/LC_MESSAGES/cheese.mo
 share/locale/te/LC_MESSAGES/cheese.mo
 share/locale/th/LC_MESSAGES/cheese.mo
 share/locale/tr/LC_MESSAGES/cheese.mo
+share/locale/ug/LC_MESSAGES/cheese.mo
 share/locale/uk/LC_MESSAGES/cheese.mo
 share/locale/vi/LC_MESSAGES/cheese.mo
 share/locale/zh_CN/LC_MESSAGES/cheese.mo
@@ -272,6 +282,7 @@ share/omf/cheese/cheese-nl.omf
 share/omf/cheese/cheese-oc.omf
 share/omf/cheese/cheese-pt_BR.omf
 share/omf/cheese/cheese-ru.omf
+share/omf/cheese/cheese-sl.omf
 share/omf/cheese/cheese-sv.omf
 share/omf/cheese/cheese-th.omf
 share/omf/cheese/cheese-zh_CN.omf
@@ -284,6 +295,8 @@ share/omf/cheese/cheese-zh_CN.omf
 @dirrm share/gnome/help/cheese/th
 @dirrm share/gnome/help/cheese/sv/figures
 @dirrm share/gnome/help/cheese/sv
+@dirrm share/gnome/help/cheese/sl/figures
+@dirrm share/gnome/help/cheese/sl
 @dirrm share/gnome/help/cheese/ru/figures
 @dirrm share/gnome/help/cheese/ru
 @dirrm share/gnome/help/cheese/pt_BR/figures
@@ -334,6 +347,8 @@ share/omf/cheese/cheese-zh_CN.omf
 @dirrm include/cheese
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -350,6 +365,8 @@ share/omf/cheese/cheese-zh_CN.omf
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
 @dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES