Update to 2.24.2:

version 2.24.2
- print vendor and product id while probing devices. provide some more device informations for easier bug triaging.
- don't use random access glist methods when accessing a list sequentially.
  properly free list elements after use, fixes bug #560514, courtesy of Giuseppe Fuggiano
- print the cheese version if the -v flag is set
- free gslist properly without a memory leak, fixes bug #560347, courtesy of Giuseppe Fuggiano
- cheese now supports webcams which support only one resolution, fixes bug #560032, courtesy of Hans de Goede
- change the default font of the countdown widget to bitstream vera sans bold
  - added/updated translations
    - pt_BR, courtesy of Joao Emanuel
    - de, courtesy of Hendrik Richter
    - uk, courtesy of Maxim V. Dziumanenko
    - ca, courtesy of Joan Duran

3 files changed, 21 insertions, 30 deletions

diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile
index 7b14bdb955f..204c77c9e94 100644
--- a/graphics/cheese/Makefile
+++ b/graphics/cheese/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2008/11/28 14:29:31 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2008/12/02 11:47:09 wiz Exp $
 
-DISTNAME=	cheese-2.24.1
-PKGREVISION=	1
+DISTNAME=	cheese-2.24.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/cheese/2.24/}
 
diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo
index 14c94ebf7b9..e54219c3687 100644
--- a/graphics/cheese/distinfo
+++ b/graphics/cheese/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/11/29 13:57:31 jmcneill Exp $
+$NetBSD: distinfo,v 1.6 2008/12/02 11:47:09 wiz Exp $
 
-SHA1 (cheese-2.24.1.tar.gz) = 87bde5fba2e956f05f3849b5501ce6490bd6bae2
-RMD160 (cheese-2.24.1.tar.gz) = 1501a43d3af6565a39e16a9a0378223c6a687e3d
-Size (cheese-2.24.1.tar.gz) = 2874336 bytes
+SHA1 (cheese-2.24.2.tar.gz) = efa0de5e3d663a7417244b3f463844edefe7835c
+RMD160 (cheese-2.24.2.tar.gz) = 619bf834d9e71b0901a8c177e4e3109e57e81587
+Size (cheese-2.24.2.tar.gz) = 2878710 bytes
 SHA1 (patch-aa) = 6be8e2b429a3033202cc20aad329ca3979489427
-SHA1 (patch-ab) = 1f273bc49e6d4cd76dad0bc9e60db7ed395d6d83
+SHA1 (patch-ab) = bb7a12f2ed26bdd134ee5ac114f1d4a6ca409267
 SHA1 (patch-ac) = 4db9fc3c6288ba6eb20ad98aca8875326952dfd8
 SHA1 (patch-ad) = 8755f4b1dc133f1ab6164894a9ea19cb96a8a49b
diff --git a/graphics/cheese/patches/patch-ab b/graphics/cheese/patches/patch-ab
index 8dcfb9dec68..a4aa542e1c8 100644
--- a/graphics/cheese/patches/patch-ab
+++ b/graphics/cheese/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $
+$NetBSD: patch-ab,v 1.4 2008/12/02 11:47:09 wiz Exp $
 
---- src/cheese-webcam.c.orig	2008-10-20 12:01:47.000000000 -0400
+--- src/cheese-webcam.c.orig	2008-11-24 23:03:19.000000000 +0000
 +++ src/cheese-webcam.c
 @@ -32,13 +32,24 @@
  #include <gst/gst.h>
@@ -29,15 +29,7 @@ $NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $
  
  #include "cheese-webcam.h"
  #include "cheese-flash.h"
-@@ -234,7 +245,6 @@ cheese_webcam_bus_message_cb (GstBus *bu
-       g_print ("Received EOS message\n");
- 
-       g_source_remove (priv->eos_timeout_id);
--
-       g_signal_emit (webcam, webcam_signals[VIDEO_SAVED], 0);
- 
-       cheese_webcam_change_sink (webcam, priv->video_display_bin,
-@@ -244,6 +254,7 @@ cheese_webcam_bus_message_cb (GstBus *bu
+@@ -244,6 +255,7 @@ cheese_webcam_bus_message_cb (GstBus *bu
    }
  }
  
@@ -45,17 +37,17 @@ $NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $
  static void
  cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam)
  {
-@@ -302,7 +313,9 @@ cheese_webcam_get_video_devices_from_hal
-     char                   *device;
+@@ -306,7 +318,9 @@ cheese_webcam_get_video_devices_from_hal
+     char                   *subsystem = NULL;
      char                   *gstreamer_src, *product_name;
      struct v4l2_capability  v2cap;
 +#ifdef VIDIOCGCAP
      struct video_capability v1cap;
 +#endif
- 
-     device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error);
-     if (dbus_error_is_set (&error))
-@@ -330,6 +343,7 @@ cheese_webcam_get_video_devices_from_hal
+     gint vendor_id = 0;
+     gint product_id = 0;
+     gchar *property_name = NULL;
+@@ -368,6 +382,7 @@ cheese_webcam_get_video_devices_from_hal
      ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
      if (ok < 0)
      {
@@ -63,7 +55,7 @@ $NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $
        ok = ioctl (fd, VIDIOCGCAP, &v1cap);
        if (ok < 0)
        {
-@@ -343,6 +357,13 @@ cheese_webcam_get_video_devices_from_hal
+@@ -381,6 +396,13 @@ cheese_webcam_get_video_devices_from_hal
        g_print ("Device type: %d\n", v1cap.type);
        gstreamer_src = "v4lsrc";
        product_name  = v1cap.name;
@@ -77,7 +69,7 @@ $NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $
      }
      else
      {
-@@ -394,6 +415,55 @@ fallback:
+@@ -434,6 +456,55 @@ fallback:
      priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
    }
  }
@@ -133,7 +125,7 @@ $NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $
  
  static void
  cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure)
-@@ -698,7 +768,11 @@ cheese_webcam_detect_webcam_devices (Che
+@@ -739,7 +810,11 @@ cheese_webcam_detect_webcam_devices (Che
  
    int i;
  
@@ -142,6 +134,6 @@ $NetBSD: patch-ab,v 1.3 2008/11/28 14:29:31 jmcneill Exp $
 +#else
 +  cheese_webcam_get_video_devices_from_probe (webcam);
 +#endif
+ 
+   g_print ("Probing supported video formats...\n");
    for (i = 0; i < priv->num_webcam_devices; i++)
-   {
-     cheese_webcam_get_webcam_device_data (webcam, &(priv->webcam_devices[i]));