Update cheese to 2.26.0.

version 2.26.0
  - Lock gdk mutex in photo-saved and video-saved callbacks Those signals are emitted
    within a gstreamer callback so outside the mainloop, hence the need for locking.
    This fixes the flash locking issue and also the one about the grey thumbview
    right after the flash, fixes bug #566098
  - added/updated translations
    - as, courtesy of Amitakhya Phukan
    - bn_IN, courtesy of Runa Bhattacharjee
    - ca, courtesy of Joan Duran
    - cs, courtesy of Lucas Lommer
    - de, courtesy of Mario Blättermann
    - el, courtesy of Jennie Petoumenou
    - fr, courtesy of Robert-André Mauchin
    - gl, courtesy of Suso Baleato
    - lt, courtesy of Vytautas Rėkus
    - or, courtesy of Manoj Kumar Giri
    - te, courtesy of Krishna Babu K
    - th, courtesy of Theppitak Karoonboonyanan

version 2.25.92
  - Remove g_error calls where the error is not supposed to abort execution.
    Replace them with more suited g_warnings, fixes bug #562179
  - Print cheese verbose messages even if log dir doesn't exist, fixes bug #573573
  - added/updated translations
    - ro, courtesy of Adi Roiban
    - sv, courtesy of Daniel Nylander

version 2.25.91
  - replace deprecated gtk symbols inside hildon code, fixes bug #571383, courtesy of Thomas Andersen
  - added/updated translations
    - es, courtesy of Jorge González
    - et, courtesy of Mattias Põldaru
    - ro, courtesy of Adi Roiban
    - vi, courtesy of Clytie Siddall
    - zh_HK, courtesy of Chao-Hsiung Liao
    - zh_TW, courtesy of Chao-Hsiung Liao

version 2.25.90
  - fixed lack of period at the end of a few paragraphs in the documentation,
    adopted "screenshot" instead of "screen shot", fixes bug #566718, courtesy of Leonardo Ferreira Fontenelle
  - reverse icon view scroll buttons scroll direction for RTL locales, fixes bug #566197, courtesy of Yair Hershkovitz
  - added/updated translations
    - de, courtesy of Hendrik Richter
    - el, courtesy of Fotis Tsamis
    - es, courtesy of Jorge González
    - fr, courtesy of Claude Paroz
    - ko, courtesy of Changwoo Ryu
    - zh_CN, courtesy of 甘露(Gan Lu)

version 2.25.4
  - added/updated translations
    - be@latin, courtesy of Ihar Hrachyshka
    - lv, courtesy of Raivis Dejus
    - pt_BR, courtesy of Leonardo Ferreira Fontenelle

version 2.25.3
  - single includes fix, fixes bug #563537, courtesy of Pedro Fragoso
  - added/updated translations
    - pa, courtesy of Amanpreet Singh Alam

version 2.25.2
  - print vendor and product id while probing devices. provide some more device informations for easier bug triaging.
  - remove unnecesary include files, to meet GnomeGoal http://live.gnome.org/GnomeGoals/CleanupGTKIncludes
  - don't use random access glist methods when accessing a list sequentially
    and properly free list elements after use, fixes bug #560514 and #560347, courtesy of Giuseppe Fuggiano
  - Use gtk_show_uri to open files and xdg-open i.s.o. gnome-open
  - Use gtk_message_dialog_format_secondary_markup correctly
  - print the cheese version if the -v flag is set
  - add support for cams which support only one resolution, fixes bug #560032, courtesy of Hans de Goede
  - added/updated translations
    - es, courtesy of Jorge González
    - ku, courtesy of Erdal Ronahi

version 2.25.1
  - change the default font of the countdown widget to bitstream vera sans bold
  - drop libgnome/libgnome-vfs dependencies, fixes bug #556580, courtesy of Cosimo Cecchi
  - exit correctly with unknown command line arguments, fixes bug #556084.
  - change the ui behaviour of the fullscreen toolbar, to show always when in
    effects chooser mode, fixes bug #548546
  - added/updated translations
    - ca, courtesy of Gil Forcada
    - de, courtesy of Hendrik Richter
    - es, courtesy of Jorge González
    - fr, courtesy of Robert-André Mauchin
    - he, courtesy of Mark Krapivner
    - nb, courtesy of Kjartan Maraas
    - nl, courtesy of Wouter Bolsterlee
    - pt_BR, courtesy of Vladimir Melo
    - sr, courtesy of Горан Ракић
    - sr@latin, courtesy of Goran Rakić
    - th, courtesy of Theppitak Karoonboonyanan
    - uk, courtesy of Maxim V. Dziumanenko

4 files changed, 46 insertions, 35 deletions

diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile
index eb2b3d6368c..5a02b02a0be 100644
--- a/graphics/cheese/Makefile
+++ b/graphics/cheese/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2009/02/06 17:46:02 jmorse Exp $
+# $NetBSD: Makefile,v 1.12 2009/03/16 22:45:14 jmcneill Exp $
 
-DISTNAME=	cheese-2.24.3
-PKGREVISION=	1
+DISTNAME=	cheese-2.26.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/cheese/2.24/}
+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
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=	gettext-m4-[0-9]*:../../devel/gettext-m4
 DEPENDS+= gst-plugins0.10-theora>=0.10.1:../../multimedia/gst-plugins0.10-theora
 DEPENDS+= gst-plugins0.10-ogg>=0.10.1:../../multimedia/gst-plugins0.10-ogg
@@ -20,8 +21,6 @@ DEPENDS+= gst-plugins0.10-vorbis>=0.10.1:../../audio/gst-plugins0.10-vorbis
 DEPENDS+= gst-plugins0.10-v4l2>=0.10.10:../../multimedia/gst-plugins0.10-v4l2
 .endif
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		pkg-config perl intltool gmake msgfmt
@@ -42,8 +41,6 @@ BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.16.0
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.20.0
-.include "../../devel/libgnomeui/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=		pango>=1.18.0
 .include "../../devel/pango/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=		cairo>=1.4.0
@@ -62,9 +59,8 @@ BUILDLINK_API_DEPENDS.dbus+=	dbus>=1.0
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.70
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.18.0
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../x11/gnome-desktop/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
diff --git a/graphics/cheese/PLIST b/graphics/cheese/PLIST
index 8e0e6ffdcee..aa9789f1d24 100644
--- a/graphics/cheese/PLIST
+++ b/graphics/cheese/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/01/14 15:48:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/03/16 22:45:14 jmcneill Exp $
 bin/cheese
 libexec/cheese/cheese-bugreport.sh
 share/applications/cheese.desktop
@@ -43,9 +43,15 @@ share/gnome/help/cheese/C/legal.xml
 share/gnome/help/cheese/ca/cheese.xml
 share/gnome/help/cheese/ca/figures/cheese-effects-screenshot.jpg
 share/gnome/help/cheese/ca/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/de/cheese.xml
+share/gnome/help/cheese/de/figures/cheese-effects-screenshot.jpg
+share/gnome/help/cheese/de/figures/cheese-screenshot.jpg
 share/gnome/help/cheese/el/cheese.xml
 share/gnome/help/cheese/el/figures/cheese-effects-screenshot.jpg
 share/gnome/help/cheese/el/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/en_GB/cheese.xml
+share/gnome/help/cheese/en_GB/figures/cheese-effects-screenshot.jpg
+share/gnome/help/cheese/en_GB/figures/cheese-screenshot.jpg
 share/gnome/help/cheese/es/cheese.xml
 share/gnome/help/cheese/es/figures/cheese-effects-screenshot.jpg
 share/gnome/help/cheese/es/figures/cheese-screenshot.jpg
@@ -77,6 +83,7 @@ share/icons/hicolor/32x32/apps/cheese.png
 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@latin/LC_MESSAGES/cheese.mo
 share/locale/bg/LC_MESSAGES/cheese.mo
 share/locale/bn_IN/LC_MESSAGES/cheese.mo
@@ -103,7 +110,9 @@ share/locale/it/LC_MESSAGES/cheese.mo
 share/locale/ja/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
 share/locale/lt/LC_MESSAGES/cheese.mo
+share/locale/lv/LC_MESSAGES/cheese.mo
 share/locale/mk/LC_MESSAGES/cheese.mo
 share/locale/ml/LC_MESSAGES/cheese.mo
 share/locale/mr/LC_MESSAGES/cheese.mo
@@ -135,7 +144,9 @@ share/locale/zh_HK/LC_MESSAGES/cheese.mo
 share/locale/zh_TW/LC_MESSAGES/cheese.mo
 share/omf/cheese/cheese-C.omf
 share/omf/cheese/cheese-ca.omf
+share/omf/cheese/cheese-de.omf
 share/omf/cheese/cheese-el.omf
+share/omf/cheese/cheese-en_GB.omf
 share/omf/cheese/cheese-es.omf
 share/omf/cheese/cheese-fr.omf
 share/omf/cheese/cheese-nl.omf
@@ -169,8 +180,12 @@ share/omf/cheese/cheese-th.omf
 @dirrm share/gnome/help/cheese/fr
 @dirrm share/gnome/help/cheese/es/figures
 @dirrm share/gnome/help/cheese/es
+@dirrm share/gnome/help/cheese/en_GB/figures
+@dirrm share/gnome/help/cheese/en_GB
 @dirrm share/gnome/help/cheese/el/figures
 @dirrm share/gnome/help/cheese/el
+@dirrm share/gnome/help/cheese/de/figures
+@dirrm share/gnome/help/cheese/de
 @dirrm share/gnome/help/cheese/ca/figures
 @dirrm share/gnome/help/cheese/ca
 @dirrm share/gnome/help/cheese/C/figures
diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo
index f2c829be6d3..ac3c2ec80e1 100644
--- a/graphics/cheese/distinfo
+++ b/graphics/cheese/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2009/02/06 17:01:49 jmorse Exp $
+$NetBSD: distinfo,v 1.10 2009/03/16 22:45:14 jmcneill Exp $
 
-SHA1 (cheese-2.24.3.tar.gz) = d5056dc88ef0100e7f37e7f3a39e2de5332e14fe
-RMD160 (cheese-2.24.3.tar.gz) = 5df906796afbe21e500a77f1db993d89104605f3
-Size (cheese-2.24.3.tar.gz) = 3166488 bytes
+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 (patch-aa) = dcb50c18f53385b524c58e8205d448dcdbc09ec2
-SHA1 (patch-ab) = 3b01eeb7fd7f9c8252963f46f54de6625e6716af
+SHA1 (patch-ab) = 34025563082d44e0d6b701ba5405469ba806a66c
 SHA1 (patch-ac) = 4db9fc3c6288ba6eb20ad98aca8875326952dfd8
 SHA1 (patch-ad) = 8755f4b1dc133f1ab6164894a9ea19cb96a8a49b
diff --git a/graphics/cheese/patches/patch-ab b/graphics/cheese/patches/patch-ab
index 6be4e4566c1..8b75d7e1893 100644
--- a/graphics/cheese/patches/patch-ab
+++ b/graphics/cheese/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2009/02/06 17:01:49 jmorse Exp $
+$NetBSD: patch-ab,v 1.7 2009/03/16 22:45:14 jmcneill Exp $
 
---- ./src/cheese-webcam.c.orig	2008-11-24 23:03:19.000000000 +0000
-+++ ./src/cheese-webcam.c	2009-02-04 01:19:38.000000000 +0000
-@@ -32,13 +32,26 @@
+--- src/cheese-webcam.c.orig	2009-03-16 13:46:10.000000000 -0400
++++ src/cheese-webcam.c
+@@ -31,13 +31,26 @@
  #include <gst/gst.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
  #include <X11/Xlib.h>
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.6 2009/02/06 17:01:49 jmorse Exp $
  
  #include "cheese-webcam.h"
  #include "cheese-flash.h"
-@@ -244,6 +257,7 @@ cheese_webcam_bus_message_cb (GstBus *bu
+@@ -243,6 +256,7 @@ cheese_webcam_bus_message_cb (GstBus *bu
    }
  }
  
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.6 2009/02/06 17:01:49 jmorse Exp $
  static void
  cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam)
  {
-@@ -305,8 +319,12 @@ cheese_webcam_get_video_devices_from_hal
+@@ -304,8 +318,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.6 2009/02/06 17:01:49 jmorse Exp $
      gint vendor_id = 0;
      gint product_id = 0;
      gchar *property_name = NULL;
-@@ -320,14 +338,17 @@ cheese_webcam_get_video_devices_from_hal
+@@ -319,15 +337,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);
@@ -60,25 +60,25 @@ $NetBSD: patch-ab,v 1.6 2009/02/06 17:01:49 jmorse Exp $
 -      property_name = g_strjoin (".", subsystem, "vendor_id", NULL);
 -      vendor_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name , &error);
 -      if (dbus_error_is_set (&error)) {
--        g_warning ("error getting vendor id: %s: %s\n", error.name, error.message);
+-        g_warning ("error getting vendor id: %s: %s", error.name, error.message);
 -        dbus_error_free (&error);
--      }
--      g_free (property_name);
 +      if (subsystem == NULL) {
-+        vendor_id = g_strdup("{No vendor ID}");
++	vendor_id = g_strdup("{No vendor ID}");
 +      } else {
 +        property_name = g_strjoin (".", subsystem, "vendor_id", NULL);
 +        vendor_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name , &error);
 +        if (dbus_error_is_set (&error)) {
-+          g_warning ("error getting vendor id: %s: %s\n", error.name, error.message);
++          g_warning ("error getting vendor id: %s: %s", error.name, error.message);
 +          dbus_error_free (&error);
 +        }
 +        g_free (property_name);
-+      } /*no subsystem patch*/
- 
+       }
+-      g_free (property_name);
+-
        property_name = g_strjoin (".", subsystem, "product_id", NULL);
        product_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name, &error);
-@@ -365,9 +386,14 @@ cheese_webcam_get_video_devices_from_hal
+       if (dbus_error_is_set (&error)) {
+@@ -364,9 +384,14 @@ cheese_webcam_get_video_devices_from_hal
        libhal_free_string (device);
        continue;
      }
@@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.6 2009/02/06 17:01:49 jmorse Exp $
        ok = ioctl (fd, VIDIOCGCAP, &v1cap);
        if (ok < 0)
        {
-@@ -381,14 +407,22 @@ cheese_webcam_get_video_devices_from_hal
+@@ -380,14 +405,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.6 2009/02/06 17:01:49 jmorse Exp $
        if (!(cap & V4L2_CAP_VIDEO_CAPTURE))
        {
          g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n"
-@@ -399,6 +433,10 @@ cheese_webcam_get_video_devices_from_hal
+@@ -398,6 +431,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.6 2009/02/06 17:01:49 jmorse Exp $
      }
  
      g_print ("\n");
-@@ -434,6 +472,55 @@ fallback:
+@@ -433,6 +470,55 @@ fallback:
      priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
    }
  }
@@ -184,7 +184,7 @@ $NetBSD: patch-ab,v 1.6 2009/02/06 17:01:49 jmorse Exp $
  
  static void
  cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure)
-@@ -739,7 +826,11 @@ cheese_webcam_detect_webcam_devices (Che
+@@ -738,7 +824,11 @@ cheese_webcam_detect_webcam_devices (Che
  
    int i;