update to 0.5.8

changes:
-UI improvements (editable menu shortcuts, eject)
-bugfixes and cleanup

6 files changed, 58 insertions, 41 deletions

diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 3b0a2755413..0af15d4d1eb 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2006/08/01 14:56:06 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/10/17 16:23:47 drochner Exp $
 
-DISTNAME=	gxine-0.5.7
-PKGREVISION=	1
+DISTNAME=	gxine-0.5.8
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/gxine/PLIST b/multimedia/gxine/PLIST
index 39ead8b5de4..d060569090f 100644
--- a/multimedia/gxine/PLIST
+++ b/multimedia/gxine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/07/07 18:28:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/10/17 16:23:47 drochner Exp $
 bin/gxine
 bin/gxine_client
 lib/gxine/gxineplugin.la
@@ -20,7 +20,7 @@ share/gxine/pixmaps/set-saturation.svg
 share/gxine/pixmaps/set-volume.svg
 share/gxine/pixmaps/speaker.png
 share/gxine/pixmaps/splash.png
-share/icons/hicolor/48x48/apps/gxine.png
+share/icons/hicolor/64x64/apps/gxine.png
 share/pixmaps/gxine.png
 share/locale/cs/LC_MESSAGES/gxine.mo
 share/locale/cs/LC_MESSAGES/gxine.theme.mo
@@ -30,6 +30,8 @@ share/locale/fr/LC_MESSAGES/gxine.mo
 share/locale/fr/LC_MESSAGES/gxine.theme.mo
 share/locale/it/LC_MESSAGES/gxine.mo
 share/locale/it/LC_MESSAGES/gxine.theme.mo
+share/locale/ja/LC_MESSAGES/gxine.mo
+share/locale/ja/LC_MESSAGES/gxine.theme.mo
 share/locale/pl/LC_MESSAGES/gxine.mo
 share/locale/pl/LC_MESSAGES/gxine.theme.mo
 share/locale/ru/LC_MESSAGES/gxine.mo
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index 0fd8c30cd74..0693bc7b00a 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.16 2006/08/01 14:56:06 joerg Exp $
+$NetBSD: distinfo,v 1.17 2006/10/17 16:23:47 drochner Exp $
 
-SHA1 (gxine-0.5.7.tar.bz2) = 806732097cffcfe23d24be0a1abc1640767e9b13
-RMD160 (gxine-0.5.7.tar.bz2) = 063212e277426274169384dd3e104eed127bf914
-Size (gxine-0.5.7.tar.bz2) = 964963 bytes
+SHA1 (gxine-0.5.8.tar.bz2) = 55aa45fae3fbfba7610e36f82f53f627c2a68635
+RMD160 (gxine-0.5.8.tar.bz2) = 726faf60beb54e7cf033e7f03850c04d0d63693e
+Size (gxine-0.5.8.tar.bz2) = 1014295 bytes
 SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc
 SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52
 SHA1 (patch-ac) = f8ace1735fe3927c66e26d52f4a6094517483eaa
 SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852
 SHA1 (patch-af) = dbea07d9c9df05ae523bca1642eb844c45e5a459
-SHA1 (patch-ag) = f814a4e0c6706d3e588180e1dcfacd97204cb8cd
+SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692
 SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86
-SHA1 (patch-ai) = 46a40d08b77e10a3d96bdf61ac31e1f02eba65e8
+SHA1 (patch-ai) = 5f90f28584b9248a38f58790575524ebbd33db57
 SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
 SHA1 (patch-ak) = f13bc48f7c836405a0587e378cc7ec0de5a4710e
-SHA1 (patch-al) = 56711d0d42cb6b6e42b8c9c11d2869bfd5ccbf62
+SHA1 (patch-al) = edd6f33b53f2cbe8d9ca8d609cf80ddb8d210cd9
 SHA1 (patch-am) = 25e7e53bd56cd30cf06dd010f78ed0715767421a
 SHA1 (patch-an) = e8fd4c81fad14e907aad2bffc3962c39322ac0e5
 SHA1 (patch-ao) = 97e176786b0e910913ecea018b5948401f69c379
diff --git a/multimedia/gxine/patches/patch-ag b/multimedia/gxine/patches/patch-ag
index 77525a2452f..966b73357cb 100644
--- a/multimedia/gxine/patches/patch-ag
+++ b/multimedia/gxine/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2006/05/03 12:47:47 drochner Exp $
+$NetBSD: patch-ag,v 1.3 2006/10/17 16:23:47 drochner Exp $
 
---- src/defs.h.orig	2006-04-29 01:14:10.000000000 +0200
+--- src/defs.h.orig	2006-08-21 09:14:49.000000000 +0200
 +++ src/defs.h
 @@ -46,7 +46,7 @@
  
@@ -8,6 +8,6 @@ $NetBSD: patch-ag,v 1.2 2006/05/03 12:47:47 drochner Exp $
  #ifdef LOG
 -#define logprintf(FMT,...) g_print (FMT, ## __VA_ARGS__)
 +#define logprintf(FMT,...) g_print (FMT , ## __VA_ARGS__)
+ #define logperror(STR) perror (STR)
  #else
  #define logprintf(FMT,...)
- #endif
diff --git a/multimedia/gxine/patches/patch-ai b/multimedia/gxine/patches/patch-ai
index 1915ed1cd69..9746b793fa3 100644
--- a/multimedia/gxine/patches/patch-ai
+++ b/multimedia/gxine/patches/patch-ai
@@ -1,18 +1,25 @@
-$NetBSD: patch-ai,v 1.3 2006/05/03 12:47:47 drochner Exp $
+$NetBSD: patch-ai,v 1.4 2006/10/17 16:23:47 drochner Exp $
 
---- src/key_events.c.orig	2006-03-07 22:26:26.000000000 +0100
+--- src/key_events.c.orig	2006-10-03 01:43:11.000000000 +0200
 +++ src/key_events.c
-@@ -660,8 +660,8 @@ void kb_edit_show (void) {
+@@ -731,6 +731,7 @@ void kb_edit_show (void)
  
  static void do_edit_binding (void)
  {
--  editkey = *lookup_binding (&catch_key_iter);
-   char *title;
-+  editkey = *lookup_binding (&catch_key_iter);
- 
-   gtk_entry_set_text (GTK_ENTRY (kb_binding_desc), editkey.desc);
++  char *title;
+   editkey = *lookup_binding (&catch_key_iter);
+   editdesc = editkey.desc;
+   editkey.desc = getdesc (&editkey);
+@@ -739,7 +740,7 @@ static void do_edit_binding (void)
    gtk_text_buffer_set_text (kb_binding_command_buf, editkey.cmd, -1);
-@@ -990,9 +990,7 @@ static JSBool js_keypad_show (JSContext 
+   gtk_entry_set_text (GTK_ENTRY (kb_binding_key), editkey.keyname);
+ 
+-  char *title = g_strdup_printf (_("Keybinding: %s"), editkey.desc);
++  title = g_strdup_printf (_("Keybinding: %s"), editkey.desc);
+   gtk_window_set_title (GTK_WINDOW (kb_binding_edit_dlg), title);
+   free (title);
+ 
+@@ -1069,9 +1070,7 @@ static JSBool js_keypad_show (JSContext 
  
  /* Xine event mapping data */
  
@@ -23,7 +30,7 @@ $NetBSD: patch-ai,v 1.3 2006/05/03 12:47:47 drochner Exp $
      { "ANGLE_NEXT", XINE_EVENT_INPUT_ANGLE_NEXT },
      { "ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
      { "DOWN", XINE_EVENT_INPUT_DOWN },
-@@ -1033,7 +1031,10 @@ static const kb_xine_event_map_t xine_in
+@@ -1112,7 +1111,10 @@ static const kb_xine_event_map_t xine_in
      { "9", XINE_EVENT_INPUT_NUMBER_9 },
      { "-", -1 }, /* null event */
      { "" }
@@ -35,7 +42,7 @@ $NetBSD: patch-ai,v 1.3 2006/05/03 12:47:47 drochner Exp $
  };
  
  
-@@ -1080,9 +1081,7 @@ static void kb_xine_event_help (se_t *se
+@@ -1159,9 +1161,7 @@ static void kb_xine_event_help (se_t *se
  
  
  
@@ -46,7 +53,7 @@ $NetBSD: patch-ai,v 1.3 2006/05/03 12:47:47 drochner Exp $
      { "AUDIO", XINE_EVENT_VDR_MUTE + 1 /* ..._VDR_AUDIO */ },
      { "BACK", XINE_EVENT_VDR_BACK },
      { "BLUE", XINE_EVENT_VDR_BLUE },
-@@ -1118,7 +1117,10 @@ static const kb_xine_event_map_t xine_vd
+@@ -1197,7 +1197,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-al b/multimedia/gxine/patches/patch-al
index 02e4e4cf5fa..10d3945068a 100644
--- a/multimedia/gxine/patches/patch-al
+++ b/multimedia/gxine/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2006/08/01 14:56:06 joerg Exp $
+$NetBSD: patch-al,v 1.3 2006/10/17 16:23:47 drochner Exp $
 
---- src/engine.c.orig	2006-06-30 14:56:00.000000000 +0000
+--- src/engine.c.orig	2006-08-11 15:45:07.000000000 +0200
 +++ src/engine.c
 @@ -36,7 +36,7 @@
  
@@ -11,26 +11,35 @@ $NetBSD: patch-al,v 1.2 2006/08/01 14:56:06 joerg Exp $
  
  gboolean initialised = FALSE;
  
-@@ -299,8 +299,7 @@ static gboolean js_queue_cb (GtkWidget *
+@@ -300,9 +300,18 @@ static gboolean js_queue_cb (GtkWidget *
+   /* js_lock must be recursive since, if the engine is busy, this function
+    * WILL be re-entered from the same thread with the lock already held.
+    */
+-  static pthread_mutex_t js_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++  static pthread_mutex_t js_lock;
++  static int jslock_inited = 0;
++  pthread_mutexattr_t ma;
+   exec_t *js;
+ 
++  if (!jslock_inited) {
++	  pthread_mutexattr_init(&ma);
++	  pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE);
++	  pthread_mutex_init(&js_lock, &ma);
++	  jslock_inited++;
++  }
++
+   pthread_mutex_lock (&js_lock);
    while ((js = g_async_queue_try_pop (js_queue)))
    {
-     /* spin; play_exec gets this & the GDK lock in reverse order */ 
--    while (pthread_mutex_trylock (&widgets_update_lock))
--      sched_yield ();
-+    pthread_mutex_lock (&widgets_update_lock);
-     pthread_mutex_unlock (&widgets_update_lock); /* JS 'play()' needs it */
-     engine_exec_obj (js->cmd, js->obj, js->cb, js->cb_data, js->ecb, js->src);
-     free (js->cmd);
-@@ -412,7 +411,12 @@ void engine_init (void)
+@@ -428,6 +437,11 @@ void engine_init (void)
  {
    char *cfgfilename;
    GtkWidget *w;
 +  pthread_mutexattr_t ma;
-   
++
 +  pthread_mutexattr_init(&ma);
 +  pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE);
 +  pthread_mutex_init(&engine_lock, &ma);
-+
+ 
    /*
     * init the global xine engine
-    */