Update to 2.26.2. Set LICENSE to gnu-gpl-v2.

version 2.26.2
  - Don't take new photo while waiting for the previous
    Ignore new photo requests if we are still waiting for an "handoff"
    signal for the previous one, fixes bug #582902
  - Fix a couple of trivial memory leaks in the thumbnail generator code, fixes bug #578289
  - Don't return if "image-loading" icon is not found, we will have an empty
    pixbuf while the thumbnail thread is running but it is surely better than
    no thumbnail at all. Try to fallback to generic "image" icon before giving up,
    fixes (at least it should) bug #582240.
  - added/updated translations
    - ar, courtesy of Khaled Hosny
    - be, courtesy of Ягор Кур'яновіч
    - el, courtesy of Simos Xenitellis
    - es, courtesy of Jorge González
    - kn, courtesy of Shankar Prasad

4 files changed, 30 insertions, 19 deletions

diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile
index 5a02b02a0be..2f85e21117b 100644
--- a/graphics/cheese/Makefile
+++ b/graphics/cheese/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2009/03/16 22:45:14 jmcneill Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/20 15:37:38 wiz Exp $
 
-DISTNAME=	cheese-2.26.0
+DISTNAME=	cheese-2.26.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/cheese/2.26/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/cheese/
 COMMENT=	Use your webcam to take photos and videos
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/graphics/cheese/PLIST b/graphics/cheese/PLIST
index aa9789f1d24..756d9a31d2f 100644
--- a/graphics/cheese/PLIST
+++ b/graphics/cheese/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/03/16 22:45:14 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/05/20 15:37:38 wiz Exp $
 bin/cheese
 libexec/cheese/cheese-bugreport.sh
 share/applications/cheese.desktop
@@ -84,6 +84,7 @@ share/icons/hicolor/48x48/apps/cheese.png
 share/icons/hicolor/scalable/apps/cheese.svg
 share/locale/ar/LC_MESSAGES/cheese.mo
 share/locale/as/LC_MESSAGES/cheese.mo
+share/locale/be/LC_MESSAGES/cheese.mo
 share/locale/be@latin/LC_MESSAGES/cheese.mo
 share/locale/bg/LC_MESSAGES/cheese.mo
 share/locale/bn_IN/LC_MESSAGES/cheese.mo
@@ -158,12 +159,19 @@ share/omf/cheese/cheese-th.omf
 @dirrm share/omf/cheese
 @comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/gnome/help/cheese/th/figures
 @dirrm share/gnome/help/cheese/th
 @dirrm share/gnome/help/cheese/sv/figures
@@ -192,8 +200,10 @@ share/omf/cheese/cheese-th.omf
 @dirrm share/gnome/help/cheese/C
 @dirrm share/gnome/help/cheese
 @comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in dbus: @dirrm share/dbus-1/services
+@comment in dbus: @dirrm share/dbus-1
 @dirrm share/cheese/sounds
 @dirrm share/cheese/pixmaps
 @dirrm share/cheese/icons/hicolor/scalable/actions
diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo
index ac3c2ec80e1..739aeb27f2c 100644
--- a/graphics/cheese/distinfo
+++ b/graphics/cheese/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2009/03/16 22:45:14 jmcneill Exp $
+$NetBSD: distinfo,v 1.11 2009/05/20 15:37:38 wiz Exp $
 
-SHA1 (cheese-2.26.0.tar.gz) = e92e57cea5a9ab9e59c694885c7ae7537e9499a4
-RMD160 (cheese-2.26.0.tar.gz) = aaa449b185c82fee9ba0d1796244c3991d660333
-Size (cheese-2.26.0.tar.gz) = 3366174 bytes
+SHA1 (cheese-2.26.2.tar.gz) = a4fa5f333a71658641e16176032915c15ab64cd4
+RMD160 (cheese-2.26.2.tar.gz) = 0734e1f9a051a9191dcdd15abd8f36c8802b4429
+Size (cheese-2.26.2.tar.gz) = 3372810 bytes
 SHA1 (patch-aa) = dcb50c18f53385b524c58e8205d448dcdbc09ec2
-SHA1 (patch-ab) = 34025563082d44e0d6b701ba5405469ba806a66c
+SHA1 (patch-ab) = 9a75be572cfe434427e65e9d4fa526e063b24f67
 SHA1 (patch-ac) = 4db9fc3c6288ba6eb20ad98aca8875326952dfd8
 SHA1 (patch-ad) = 8755f4b1dc133f1ab6164894a9ea19cb96a8a49b
diff --git a/graphics/cheese/patches/patch-ab b/graphics/cheese/patches/patch-ab
index 8b75d7e1893..c1753e7c5c1 100644
--- a/graphics/cheese/patches/patch-ab
+++ b/graphics/cheese/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
+$NetBSD: patch-ab,v 1.8 2009/05/20 15:37:38 wiz Exp $
 
---- src/cheese-webcam.c.orig	2009-03-16 13:46:10.000000000 -0400
+--- src/cheese-webcam.c.orig	2009-05-18 20:46:03.000000000 +0000
 +++ src/cheese-webcam.c
 @@ -31,13 +31,26 @@
  #include <gst/gst.h>
@@ -30,8 +30,8 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
 +#endif
  
  #include "cheese-webcam.h"
- #include "cheese-flash.h"
-@@ -243,6 +256,7 @@ cheese_webcam_bus_message_cb (GstBus *bu
+ 
+@@ -241,6 +254,7 @@ cheese_webcam_bus_message_cb (GstBus *bu
    }
  }
  
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
  static void
  cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam)
  {
-@@ -304,8 +318,12 @@ cheese_webcam_get_video_devices_from_hal
+@@ -302,8 +316,12 @@ cheese_webcam_get_video_devices_from_hal
      char                   *parent_udi = NULL;
      char                   *subsystem = NULL;
      char                   *gstreamer_src, *product_name;
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
      gint vendor_id = 0;
      gint product_id = 0;
      gchar *property_name = NULL;
-@@ -319,15 +337,17 @@ cheese_webcam_get_video_devices_from_hal
+@@ -317,15 +335,17 @@ cheese_webcam_get_video_devices_from_hal
  
      if (parent_udi != NULL) {
        subsystem = libhal_device_get_property_string (hal_ctx, parent_udi, "info.subsystem", NULL);
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
        property_name = g_strjoin (".", subsystem, "product_id", NULL);
        product_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name, &error);
        if (dbus_error_is_set (&error)) {
-@@ -364,9 +384,14 @@ cheese_webcam_get_video_devices_from_hal
+@@ -362,9 +382,14 @@ cheese_webcam_get_video_devices_from_hal
        libhal_free_string (device);
        continue;
      }
@@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
        ok = ioctl (fd, VIDIOCGCAP, &v1cap);
        if (ok < 0)
        {
-@@ -380,14 +405,22 @@ cheese_webcam_get_video_devices_from_hal
+@@ -378,14 +403,22 @@ cheese_webcam_get_video_devices_from_hal
        g_print ("Device type: %d\n", v1cap.type);
        gstreamer_src = "v4lsrc";
        product_name  = v1cap.name;
@@ -117,7 +117,7 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
        if (!(cap & V4L2_CAP_VIDEO_CAPTURE))
        {
          g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n"
-@@ -398,6 +431,10 @@ cheese_webcam_get_video_devices_from_hal
+@@ -396,6 +429,10 @@ cheese_webcam_get_video_devices_from_hal
        }
        gstreamer_src = "v4l2src";
        product_name  = (char *) v2cap.card;
@@ -128,7 +128,7 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
      }
  
      g_print ("\n");
-@@ -433,6 +470,55 @@ fallback:
+@@ -431,6 +468,55 @@ fallback:
      priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
    }
  }
@@ -184,7 +184,7 @@ $NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
  
  static void
  cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure)
-@@ -738,7 +824,11 @@ cheese_webcam_detect_webcam_devices (Che
+@@ -736,7 +822,11 @@ cheese_webcam_detect_webcam_devices (Che
  
    int i;