update to 0.5.904

changes:
-bugfixes

pkgsrc note: I've disabled console output redirection into a log
window because it doesn't work on NetBSD. Is something like
"stdout = fdopen(blah)" legal?

9 files changed, 97 insertions, 85 deletions

diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index f0a513c373d..12663444550 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2008/11/10 17:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2009/04/17 16:51:07 drochner Exp $
 
-DISTNAME=	gxine-0.5.11
-PKGREVISION=	3
+DISTNAME=	gxine-0.5.904
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,9 +11,10 @@ COMMENT=	Gtk-based media player
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config perl:build
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--disable-lirc
 USE_DIRS+=		xdg-1.1
 
 BROKEN_GETTEXT_DETECTION=	yes
@@ -27,12 +27,15 @@ PKG_SYSCONFSUBDIR=	gxine
 CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../www/firefox/buildlink3.mk"
+# XXX does not work with pkgsrc firefox3
+#.include "../../www/firefox3/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/gxine/PLIST b/multimedia/gxine/PLIST
index 383ec5e72b2..e2e2c10f6f0 100644
--- a/multimedia/gxine/PLIST
+++ b/multimedia/gxine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/11/28 21:49:57 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/04/17 16:51:07 drochner Exp $
 bin/gxine
 bin/gxine_client
 lib/gxine/gxineplugin.la
@@ -14,17 +14,33 @@ share/gxine/logo.mpv
 share/gxine/mediamarks
 share/gxine/pixmaps/gxine-icon.xpm
 share/gxine/pixmaps/nospeaker.png
+share/gxine/pixmaps/set-brightness.png
 share/gxine/pixmaps/set-brightness.svg
+share/gxine/pixmaps/set-channel.png
+share/gxine/pixmaps/set-channel.svg
+share/gxine/pixmaps/set-contrast.png
 share/gxine/pixmaps/set-contrast.svg
+share/gxine/pixmaps/set-hue.png
+share/gxine/pixmaps/set-hue.svg
+share/gxine/pixmaps/set-saturation.png
 share/gxine/pixmaps/set-saturation.svg
+share/gxine/pixmaps/set-sync.png
+share/gxine/pixmaps/set-sync.svg
+share/gxine/pixmaps/set-volume.png
 share/gxine/pixmaps/set-volume.svg
 share/gxine/pixmaps/speaker.png
 share/gxine/pixmaps/splash.png
+share/gxine/pixmaps/subtitle.png
+share/gxine/pixmaps/subtitle.svg
 share/icons/hicolor/64x64/apps/gxine.png
 share/locale/cs/LC_MESSAGES/gxine.mo
 share/locale/cs/LC_MESSAGES/gxine.theme.mo
 share/locale/de/LC_MESSAGES/gxine.mo
 share/locale/de/LC_MESSAGES/gxine.theme.mo
+share/locale/es/LC_MESSAGES/gxine.mo
+share/locale/es/LC_MESSAGES/gxine.theme.mo
+share/locale/fi/LC_MESSAGES/gxine.mo
+share/locale/fi/LC_MESSAGES/gxine.theme.mo
 share/locale/fr/LC_MESSAGES/gxine.mo
 share/locale/fr/LC_MESSAGES/gxine.theme.mo
 share/locale/it/LC_MESSAGES/gxine.mo
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index 02460aae00c..e3464a32a26 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.22 2008/09/03 17:47:03 drochner Exp $
+$NetBSD: distinfo,v 1.23 2009/04/17 16:51:07 drochner Exp $
 
-SHA1 (gxine-0.5.11.tar.bz2) = 74d7e46ff55261c36994b60d66e55720cdb9e165
-RMD160 (gxine-0.5.11.tar.bz2) = 37593c2b926dc0ef3745744c9a9ea79fd4f4d391
-Size (gxine-0.5.11.tar.bz2) = 1028982 bytes
+SHA1 (gxine-0.5.904.tar.bz2) = a0908d60a165dbe05fb168067906507398ceb126
+RMD160 (gxine-0.5.904.tar.bz2) = 4e4918d395f68e3d74682b5d15425d76a7698b8f
+Size (gxine-0.5.904.tar.bz2) = 1189649 bytes
 SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc
 SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52
 SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852
-SHA1 (patch-af) = dbea07d9c9df05ae523bca1642eb844c45e5a459
+SHA1 (patch-af) = 6d58e572729217ae7a9a3ef2a177fb929f3da453
 SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692
 SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86
-SHA1 (patch-ai) = 5f90f28584b9248a38f58790575524ebbd33db57
+SHA1 (patch-ai) = 792fabf23d55fac337d6825e5ba28d1a80393ce9
 SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
-SHA1 (patch-ak) = a9f46b23427f8c660295211f2a9b0bb6143e83cd
+SHA1 (patch-ak) = f955f34a2cf028c0ab540413866fa330384a1aec
 SHA1 (patch-an) = e8fd4c81fad14e907aad2bffc3962c39322ac0e5
-SHA1 (patch-ao) = 97e176786b0e910913ecea018b5948401f69c379
-SHA1 (patch-aq) = e9f17986a2f7387cebdbbd5ddd6e0bc97eb87d0a
+SHA1 (patch-aq) = 51acfd7107eed0cf73462daa73024ef28964d9eb
 SHA1 (patch-ba) = 7ef029a5bdfa7cf037218ef134b418a2b4f2b03b
-SHA1 (patch-bb) = 12f21c0d43e267ebde0b1688abeac61f721ce43a
+SHA1 (patch-bb) = f4f96102cff0589e3c823b4dd96693668aa16a5f
diff --git a/multimedia/gxine/patches/patch-af b/multimedia/gxine/patches/patch-af
index dadfbec83d9..ffcd3e7a3b5 100644
--- a/multimedia/gxine/patches/patch-af
+++ b/multimedia/gxine/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.4 2006/07/07 18:28:48 drochner Exp $
+$NetBSD: patch-af,v 1.5 2009/04/17 16:51:07 drochner Exp $
 
---- doc/man/Makefile.in.orig	2006-07-05 03:06:43.000000000 +0200
+--- doc/man/Makefile.in.orig	2009-04-01 17:36:48.000000000 +0200
 +++ doc/man/Makefile.in
-@@ -218,7 +218,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = en de
+@@ -249,7 +249,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = $(MANLINGUAS)
 +SUBDIRS = en
  all: all-recursive
  
diff --git a/multimedia/gxine/patches/patch-ai b/multimedia/gxine/patches/patch-ai
index 9746b793fa3..4973c908e37 100644
--- a/multimedia/gxine/patches/patch-ai
+++ b/multimedia/gxine/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2006/10/17 16:23:47 drochner Exp $
+$NetBSD: patch-ai,v 1.5 2009/04/17 16:51:07 drochner Exp $
 
---- src/key_events.c.orig	2006-10-03 01:43:11.000000000 +0200
+--- src/key_events.c.orig	2009-03-25 17:41:49.000000000 +0100
 +++ src/key_events.c
-@@ -731,6 +731,7 @@ void kb_edit_show (void)
+@@ -767,6 +767,7 @@ void kb_edit_show (void)
  
  static void do_edit_binding (void)
  {
@@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.4 2006/10/17 16:23:47 drochner Exp $
    editkey = *lookup_binding (&catch_key_iter);
    editdesc = editkey.desc;
    editkey.desc = getdesc (&editkey);
-@@ -739,7 +740,7 @@ static void do_edit_binding (void)
+@@ -775,7 +776,7 @@ static void do_edit_binding (void)
    gtk_text_buffer_set_text (kb_binding_command_buf, editkey.cmd, -1);
    gtk_entry_set_text (GTK_ENTRY (kb_binding_key), editkey.keyname);
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ai,v 1.4 2006/10/17 16:23:47 drochner Exp $
    gtk_window_set_title (GTK_WINDOW (kb_binding_edit_dlg), title);
    free (title);
  
-@@ -1069,9 +1070,7 @@ static JSBool js_keypad_show (JSContext 
+@@ -1110,9 +1111,7 @@ static JSBool js_keypad_show (JSContext 
  
  /* Xine event mapping data */
  
@@ -30,7 +30,7 @@ $NetBSD: patch-ai,v 1.4 2006/10/17 16:23:47 drochner Exp $
      { "ANGLE_NEXT", XINE_EVENT_INPUT_ANGLE_NEXT },
      { "ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
      { "DOWN", XINE_EVENT_INPUT_DOWN },
-@@ -1112,7 +1111,10 @@ static const kb_xine_event_map_t xine_in
+@@ -1153,7 +1152,10 @@ static const kb_xine_event_map_t xine_in
      { "9", XINE_EVENT_INPUT_NUMBER_9 },
      { "-", -1 }, /* null event */
      { "" }
@@ -42,18 +42,18 @@ $NetBSD: patch-ai,v 1.4 2006/10/17 16:23:47 drochner Exp $
  };
  
  
-@@ -1159,9 +1161,7 @@ static void kb_xine_event_help (se_t *se
- 
+@@ -1199,9 +1201,7 @@ static void kb_xine_event_help (se_t *se
+ }
  
  
 -static const kb_xine_event_map_t xine_vdr = {
 -  "VDR",
 -  {
 +static const kb_xine_event_id_t xine_vdr_ids[] = {
-     { "AUDIO", XINE_EVENT_VDR_MUTE + 1 /* ..._VDR_AUDIO */ },
+     { "AUDIO", XINE_EVENT_VDR_AUDIO },
      { "BACK", XINE_EVENT_VDR_BACK },
      { "BLUE", XINE_EVENT_VDR_BLUE },
-@@ -1197,7 +1197,10 @@ static const kb_xine_event_map_t xine_vd
+@@ -1239,7 +1239,10 @@ static const kb_xine_event_map_t xine_vd
      { "VOLPLUS", XINE_EVENT_VDR_VOLPLUS },
      { "YELLOW", XINE_EVENT_VDR_YELLOW },
      { "" }
diff --git a/multimedia/gxine/patches/patch-ak b/multimedia/gxine/patches/patch-ak
index 35a167d2bfc..8833083aa59 100644
--- a/multimedia/gxine/patches/patch-ak
+++ b/multimedia/gxine/patches/patch-ak
@@ -1,27 +1,27 @@
-$NetBSD: patch-ak,v 1.8 2008/02/08 17:33:02 drochner Exp $
+$NetBSD: patch-ak,v 1.9 2009/04/17 16:51:07 drochner Exp $
 
---- configure.orig	2007-02-01 02:12:35.000000000 +0100
+--- configure.orig	2009-04-01 17:36:50.000000000 +0200
 +++ configure
-@@ -26336,6 +26336,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+@@ -19713,6 +19713,7 @@ $as_echo "$ac_try_echo") >&5
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_Xinerama_XineramaQueryExtension=yes
 +  X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -26607,14 +26608,14 @@ case $host in
+@@ -19989,14 +19990,14 @@ case $host in
      LDFLAGS="$LDFLAGS -L/usr/local/lib"
      ;;
    *)
 -   THREAD_LIBS="-lpthread"
--    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+-    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 +   THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+    { echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
++    { $as_echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
@@ -29,18 +29,3 @@ $NetBSD: patch-ak,v 1.8 2008/02/08 17:33:02 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26968,11 +26969,11 @@ echo $ECHO_N "checking for XINE-LIB vers
-       XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs`
-       XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags`
-       xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \
--             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-+             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'`
-       xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \
--             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'`
-       xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
--             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-+             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
-       xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir`
-       xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir`
-       xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir`
diff --git a/multimedia/gxine/patches/patch-ao b/multimedia/gxine/patches/patch-ao
deleted file mode 100644
index 8b2f6956ef8..00000000000
--- a/multimedia/gxine/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2006/07/07 18:28:48 drochner Exp $
-
---- src/ui.c.orig	2006-05-17 23:59:45.000000000 +0200
-+++ src/ui.c
-@@ -948,11 +948,9 @@ void ui_init (void)
- gboolean ui_post_init (void)
- {
-   unsigned int i;
--  gdk_threads_enter ();
-   for (i = 0; i < G_N_ELEMENTS (ranges); ++i)
-     if (ranges[i].param && i != Control_VOLUME)
-       xine_set_param (stream, ranges[i].param, starts[i]);
--  gdk_threads_leave ();
-   return FALSE;
- }
- 
diff --git a/multimedia/gxine/patches/patch-aq b/multimedia/gxine/patches/patch-aq
index 3df2d204d9c..f3c9ac9c2db 100644
--- a/multimedia/gxine/patches/patch-aq
+++ b/multimedia/gxine/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2006/07/07 18:28:48 drochner Exp $
+$NetBSD: patch-aq,v 1.3 2009/04/17 16:51:07 drochner Exp $
 
---- misc/Makefile.in.orig	2006-07-05 03:06:44.000000000 +0200
+--- misc/Makefile.in.orig	2009-04-01 17:36:49.000000000 +0200
 +++ misc/Makefile.in
-@@ -228,7 +228,7 @@ program_transform_name = @program_transf
- psdir = @psdir@
+@@ -256,7 +256,7 @@ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
 -sysconfdir = $(GXINE_CONFPATH)
 +sysconfdir = $(prefix)/share/examples/gxine
  target_alias = @target_alias@
- SUBDIRS = po
- xmlfiles = \
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
diff --git a/multimedia/gxine/patches/patch-bb b/multimedia/gxine/patches/patch-bb
index b89b56fb577..55b87b517fd 100644
--- a/multimedia/gxine/patches/patch-bb
+++ b/multimedia/gxine/patches/patch-bb
@@ -1,13 +1,38 @@
-$NetBSD: patch-bb,v 1.1 2008/09/03 17:47:03 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2009/04/17 16:51:07 drochner Exp $
 
---- ./src/console_output.c.orig	2008-09-03 12:15:36.000000000 +0200
-+++ ./src/console_output.c
-@@ -78,7 +78,7 @@ console_output_init (void)
+--- src/console_output.c.orig	2009-03-25 17:41:49.000000000 +0100
++++ src/console_output.c
+@@ -28,7 +28,7 @@
+ #include <stdint.h>
+ #include <glib.h>
+ 
+-#ifdef GXINE_CLIENT
++#if 1
+ /* defines & functions for gxine_client */
+ 
+ # define STDOUT stdout
+@@ -139,7 +139,7 @@ xlate_g_printerr (const char *text)
+   console_unlock ();
+ }
+ 
+-#ifndef GXINE_CLIENT
++#if 0
+ static void * __attribute__ ((noreturn))
+ console_log_captured (void *data)
  {
+@@ -185,13 +185,13 @@ console_output_init (void)
    const char *cset;
+ 
    g_get_charset (&cset);
 -  char *dest = g_strconcat (cset, "//TRANSLIT", NULL);
 +  char *dest = g_strconcat (cset, /*"//TRANSLIT",*/ NULL);
    xlate = g_iconv_open (dest, "utf-8");
    g_free (dest);
    g_set_print_handler (xlate_g_print);
+   g_set_printerr_handler (xlate_g_printerr);
+ 
+-#ifndef GXINE_CLIENT
++#if 0
+   int i;
+   FILE *newfd[2];
+   pthread_t thread;