Update to version 0.4.5

Changes:

0.4.5:
======
- SECURITY FIX (pst.advisory 2005-21)
  Remotely-exploitable missing-format-string vulnerability in some
  message dialogue boxes.

- Fixed some brokenness in the visualisations menu; hide/show the
  video widget as needed when selecting an item from that menu.
- Better handling of uninstantiatable post-plugins (when configuring).
- Caught and replaced another asprintf. [Bug 1204625]
- Compile fix (Solaris): need $(X_EXTRA_LIBS).
- Correct the documentation of the '-e' option in gxine.1.
- Don't set a title for the full-screen toolbar.
- Set up X threads earlier (it was being done too late).
  (based on a patch from Antti P Miettinen <ananaza@iki.fi>.)

0.4.4:
======
- Added support for VDR's AUDIO key.
- Made the browser plugin optional.
- Stop playback on playlist clear.
- Fixed a bug in multi-file drag+drop.

0.4.3:
======
- Fix a bug in JS vdr(). It should check the active MRL rather than
  the currently-selected playlist entry.
- Fix a post-plugin parameter handling error.
- Provide a few more default bindings with keys.
- Fix a compile failure when using xine-lib 1.0 headers. Whoops :-(
- Added doc/Keybindings-HOWTO (from Craig Sanders).

0.4.2:
======
- Use external JS lib by default (if available).
  If you're using amd64, you want this, I'm told.
- This version should be buildable and useable with GTK+2.2.
  It may also use, but not rely on, a few features from GTK+2.6.
- Configure switches for GTK+ versions compatibility and whether to
  use the desktop integration wizard. (Mainly for packagers.)
- Mark 'repeat' and 'random' buttons (playlist) as having accelerator
  keys.
- Improve prefs window numeric entry editing.
- "tvtime" deinterlace plugin support.
- Video and audio post-plugin chain support.
  The deinterlace plugin is prepended to the video chain if enabled.
  The visualisation plugin is prepended to the audio chain if active.
- Hide tab & border for single-page notebooks in the prefs window.
- Make columns in playlist etc. resizable.
- Fixed a few crash/warning bugs (mediamarks/playlist item edit) left
  over from 0.4.1.
- Respond to volume changes made externally.
- Fix crash on virtual desktop change. The full-screen window is now
  sticky and on all desktops. (If you have a better way of fixing
  this which *doesn't* require this, let me know.)
- Fix overlay bug with window managers, such as IceWM, which have
  their own toolbars.
- Text preferences which are uncommitted may be undone by Ctrl '-' or
  Undo.
- Make the visualisation setting a preference.
- Fix a few problems in playlist expansion via xine-lib.
- Add JS event(NAME) function and make event() and vdr() output help
  text if called without parameters.
- Add keybinding entries for 'next angle' and 'previous angle'.
- Save the A/V offset setting.
- Build fix: apparently, Spidermonkey isn't always libsmjs.so.
- Stop GTK's complaints when the locale doesn't use UTF-8.
  (This is done by telling gettext that we want translated text in
  UTF-8. Some is intended for the console; this isn't special-cased.)
- Add a few extra icons to the menus.
- Add config options for default window size and magnification of
  low-res video streams.
- Improve live-stream detection; recognise streams of unknown length.
- Improve the current stream title display.
- Rely on xine-lib's XML parser and quote some characters when saving
  the playlist, media marks and key bindings.
- Change the way in which the control button images are implemented.
  (There are problems with some GTK+ theme engines otherwise.)
- Try to update the current playlist item's title from the stream
  automatically unless the title has been edited.
- Deleting a playlist item will, if it is being played, cause the
  next item to be played (or the player to enter idle mode).
- Use ellipsis in long entries in the playlist & mediamarks windows.
  (Requires GTK+2.6.)
- Allow drag&drop for reordering playlist items.
- Prevent multiple install wizard instantiations.
- Add menu tooltips for plugins with short descriptions in the plugin
  chain configuration windows.
- Make playlist repeat & random settings persistent. (Guenter)

5 files changed, 24 insertions, 44 deletions

diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index bd93e7e416c..e527b7ed601 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/04/13 16:39:32 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/27 12:09:27 salo Exp $
 #
 
-DISTNAME=		gxine-0.4.1
+DISTNAME=		gxine-0.4.5
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
@@ -11,7 +11,9 @@ COMMENT=		Gtk-based media player
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
+USE_TOOLS+=		gmake
 
 PTHREAD_OPTS+=		require
 
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index 72e2c75a59f..8224b741280 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.5 2005/05/08 06:33:35 reed Exp $
+$NetBSD: distinfo,v 1.6 2005/05/27 12:09:27 salo Exp $
 
-SHA1 (gxine-0.4.1.tar.gz) = af8f758c0ce8b1c0917c9e02567d5479807aaec8
-RMD160 (gxine-0.4.1.tar.gz) = 71e86f371ee4d4a65b10efd62972be67bb160add
-Size (gxine-0.4.1.tar.gz) = 1286144 bytes
+SHA1 (gxine-0.4.5.tar.gz) = e18fea29164b10a93f9a4bc0de45db0db0d82fdd
+RMD160 (gxine-0.4.5.tar.gz) = b6ffce9caf73b244cfa674faed5def17edda9755
+Size (gxine-0.4.5.tar.gz) = 1322811 bytes
 SHA1 (patch-ab) = 581122a87dd3ea1a61b434ba721866efd3455ab6
 SHA1 (patch-ac) = b4db5fbfb45f283937b38db2d2e22110b7e113be
-SHA1 (patch-ad) = bde89fe3b8457b7795b33cdc4a05251d0a83da48
+SHA1 (patch-ad) = 1a0cf404f16806bc75cb12659a6f0f86e5e52705
 SHA1 (patch-af) = 0bf58de7d5d3a50731d30623bc76732e8d2f771f
 SHA1 (patch-ag) = 4c04a21a1fdb56c48384b3883ffb2692d5ac2abd
 SHA1 (patch-ah) = 46e1e60573d33deac2d0c8f5f5c901edb2ef5f27
-SHA1 (patch-ai) = f9c5ea86cad2de731304b6ffb96530aaf4161e86
+SHA1 (patch-ai) = 00deba3aa54610ccf66ae267792b93c307db106d
 SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
-SHA1 (patch-ak) = a7b01fc2e33414669c5390934d47e96062baabd0
diff --git a/multimedia/gxine/patches/patch-ad b/multimedia/gxine/patches/patch-ad
index 99af8bde4b3..13b36522706 100644
--- a/multimedia/gxine/patches/patch-ad
+++ b/multimedia/gxine/patches/patch-ad
@@ -1,3 +1,5 @@
+$NetBSD: patch-ad,v 1.4 2005/05/27 12:09:27 salo Exp $
+
 --- src/spidermonkey/jsprf.c.orig	Sat May  7 19:07:27 2005
 +++ src/spidermonkey/jsprf.c	Sat May  7 19:08:37 2005
 @@ -57,7 +57,11 @@
diff --git a/multimedia/gxine/patches/patch-ai b/multimedia/gxine/patches/patch-ai
index c5a272eb936..21941c98cef 100644
--- a/multimedia/gxine/patches/patch-ai
+++ b/multimedia/gxine/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.1 2005/04/13 16:39:32 rillig Exp $
+$NetBSD: patch-ai,v 1.2 2005/05/27 12:09:27 salo Exp $
 
 Needed for ISO C90 compliance.
 
---- src/key_events.c.orig	Fri Dec 17 01:32:59 2004
-+++ src/key_events.c	Tue Apr 12 12:58:06 2005
-@@ -605,8 +605,8 @@ void kb_edit_show (void) {
+--- src/key_events.c.orig	2005-04-26 00:11:56.000000000 +0200
++++ src/key_events.c	2005-05-27 13:05:59.000000000 +0200
+@@ -610,8 +610,8 @@
  
  static void do_edit_binding (void)
  {
@@ -14,7 +14,7 @@ Needed for ISO C90 compliance.
  
    gtk_entry_set_text (GTK_ENTRY (kb_binding_desc), editkey.desc);
    gtk_entry_set_text (GTK_ENTRY (kb_binding_command), editkey.cmd);
-@@ -1056,9 +1056,7 @@ static JSBool js_keybindings_show (JSCon
+@@ -1080,9 +1080,7 @@
  
  /* Xine event mapping data */
  
@@ -25,7 +25,7 @@ Needed for ISO C90 compliance.
      { "ANGLE_NEXT", XINE_EVENT_INPUT_ANGLE_NEXT },
      { "ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
      { "DOWN", XINE_EVENT_INPUT_DOWN },
-@@ -1099,7 +1097,10 @@ static const kb_xine_event_map_t xine_in
+@@ -1123,7 +1121,10 @@
      { "9", XINE_EVENT_INPUT_NUMBER_9 },
      { "-", -1 }, /* null event */
      { "" }
@@ -37,19 +37,18 @@ Needed for ISO C90 compliance.
  };
  
  
-@@ -1129,10 +1130,7 @@ int kb_xine_event_lookup (const kb_xine_
-   return 0;
- }
+@@ -1170,9 +1171,7 @@
+ 
+ 
  
--
 -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 */ },
      { "BACK", XINE_EVENT_VDR_BACK },
      { "BLUE", XINE_EVENT_VDR_BLUE },
-     { "CHANNELMINUS", XINE_EVENT_VDR_CHANNELMINUS },
-@@ -1166,7 +1164,10 @@ static const kb_xine_event_map_t xine_vd
+@@ -1207,7 +1206,10 @@
      { "VOLPLUS", XINE_EVENT_VDR_VOLPLUS },
      { "YELLOW", XINE_EVENT_VDR_YELLOW },
      { "" }
@@ -60,4 +59,4 @@ Needed for ISO C90 compliance.
 +  "VDR", &xine_vdr_ids
  };
  
- static JSBool js_vdr (JSContext *cx, JSObject *obj, uintN argc,
+ JSBool js_event_generic (JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
diff --git a/multimedia/gxine/patches/patch-ak b/multimedia/gxine/patches/patch-ak
deleted file mode 100644
index 1e8c25f4f6a..00000000000
--- a/multimedia/gxine/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/04/13 16:39:32 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/utils.c.orig	Fri Dec 17 01:33:00 2004
-+++ src/utils.c	Tue Apr 12 12:51:05 2005
-@@ -750,6 +750,7 @@ void ui_preferences_register (xine_t *th
-     N_("Top, visible"), N_("Bottom, visible"),
-     NULL
-   };
-+  int i;
- 
-   /* Register the experience level setting */
-   xine_config_register_enum
-@@ -759,7 +760,6 @@ void ui_preferences_register (xine_t *th
-      0, NULL, CONFIG_DATA_NONE);
- 
-   /* Register a few audio/video config items */
--  int i;
-   for (i = 0; i < sizeof (ranges) / sizeof (ranges[0]); ++i)
-   {
-     if (ranges[i].setting && !strncmp (ranges[i].setting, "gui.", 4))