gxine: Update to 0.5.910. Fix build.

pkgsrc changes:

* Use newer spidermonkey instead of ancient firefox 3.6 xulrunner.
* Use gtk3 by default.

0.5.910: 2017-12-28
	* Improve Gtk3 support. (still not enabled by default, use --with-gtk3).
	* Fix running under Wayland.
	* Improve portability.
	* Improve build system. Require automake 1.11.
	* Fix memory and resource leaks.
0.5.909: 2017-07-18
	* Dust removal. Support for recent glib and gtk+ versions.
	* Require glib 2.32 or later.
	* Require gtk+ 2.18 or later.
	* Portability improvements.
	* Linkage fixes.
	* #include fixes.
	* Fix memory and resource leaks.
	* Initial support for gtk+ 3.
	* Call XInitThreads even with XCB. (Fixes some video output methods.)

0.5.908: 2014-05-10
	* Add input support for xineliboutput.
	* Use libgudev when available (HAL is obsolete).
	* Linkage fixes.
	* GLib #include fixes.
	* Stop g_remove_source() error spew.

0.5.907: 2012-02-21
	* Fix compilation with that nice stable API in libmozjs.
	  - There's a jsval change in Firefox 9.
	  - Firefox 10 drops JSFloat64 (looks like cleanup).
	* Fix a build failure which occurs when how to retrieve certain HAL
	  properties isn't known. (Observed on Debian hurd-i386.)
	* Quiet build (with automake 1.11 or later).
	  Also silence inlining complaints (from libmozjs headers).
	* Playlist segmentation fault fix.
	* input_menu() works again.

0.5.906: 2011-08-11
	* Reset pointer shape on stream stop/eject.
	* Use re-entrant versions of xine-lib's XML parser functions
	  (if available).
	* gxine.desktop now says that gxine can accept files or URLs.
	* Handle gamma, sharpness and noise reduction controls (if supported
	  by the selected video output driver).
	* Add vo_*.available (whether a given control is available).
	* Handle iconisation of the video window by preventing hiding &
	  re-showing while the window is iconised.
	* Portability changes (pthreads, console redirection).
	* Czech translation update.
	* More GDK functions over X11:
	  - prefer GDK for cursors and setting windows focus
	  - prefer X11 for system tray and GTK video window
	* Windows port of GTK video widget.
	* Handle relative paths in m3u playlists.
	* Fix focus grabbing (in the absence of Xinerama).

18 files changed, 86 insertions, 369 deletions

diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 12aeb2117af..382e28cf87b 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.106 2018/11/29 11:21:54 prlw1 Exp $
+# $NetBSD: Makefile,v 1.107 2019/06/18 12:38:36 nia Exp $
 
-DISTNAME=	gxine-0.5.905
-PKGREVISION=	58
+DISTNAME=	gxine-0.5.910
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xine-project.org/home
@@ -13,31 +12,45 @@ COMMENT=	Gtk-based media player
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config perl:build
+USE_TOOLS+=		msgfmt msgmerge xgettext
+USE_LANGUAGES=		c99
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--disable-lirc
+CONFIGURE_ARGS+=	--with-gtk3
+CONFIGURE_ARGS+=	--with-xcb
+CONFIGURE_ARGS+=	--without-browser-plugin
+
+BUILD_DEFS+=		PKG_SYSCONFBASE
 
 BROKEN_GETTEXT_DETECTION=	yes
 PTHREAD_OPTS+=			require
-# for svg->png icon conversion
-# XXX librsvg>=2.32 doesn't install the "rsvg" tool
-#BUILD_DEPENDS+=		librsvg-[0-9]*:../../graphics/librsvg
+
+# spidermonkey185
+NOT_PAX_MPROTECT_SAFE+=	bin/gxine
 
 EGDIR=			${PREFIX}/share/examples/gxine
 PKG_SYSCONFSUBDIR=	gxine
 
-.for f in gtkrc keypad.xml startup toolbar-fullscreen.xml toolbar-window.xml
+.for f in gtk.css gtkrc keypad.xml startup toolbar-fullscreen.xml toolbar-window.xml
 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 "../../devel/xulrunner192/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../lang/spidermonkey185/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gxine/PLIST b/multimedia/gxine/PLIST
index c641ceeb957..998191cd961 100644
--- a/multimedia/gxine/PLIST
+++ b/multimedia/gxine/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.13 2010/11/30 18:21:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/06/18 12:38:36 nia Exp $
 bin/gxine
 bin/gxine_client
-lib/gxine/gxineplugin.la
+man/de/man1/gxine.1
+man/de/man1/gxine_client.1
+man/es/man1/gxine.1
+man/es/man1/gxine_client.1
 man/man1/gxine.1
 man/man1/gxine_client.1
 share/applications/gxine.desktop
+share/examples/gxine/gtk.css
 share/examples/gxine/gtkrc
 share/examples/gxine/keypad.xml
 share/examples/gxine/startup
@@ -19,6 +23,7 @@ share/gxine/pixmaps/set-channel.svg
 share/gxine/pixmaps/set-contrast.svg
 share/gxine/pixmaps/set-hue.svg
 share/gxine/pixmaps/set-saturation.svg
+share/gxine/pixmaps/set-sharpness.svg
 share/gxine/pixmaps/set-sync.svg
 share/gxine/pixmaps/set-volume.svg
 share/gxine/pixmaps/speaker.png
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index 0dea1733f18..e2d000f67cc 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,21 +1,8 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 23:54:26 agc Exp $
+$NetBSD: distinfo,v 1.28 2019/06/18 12:38:36 nia Exp $
 
-SHA1 (gxine-0.5.905.tar.bz2) = dc01b617641d6eac4152259c592f15f31b9d9bf0
-RMD160 (gxine-0.5.905.tar.bz2) = 3dc30ba9f402d20e3ad3f469cc753607ccc3d194
-SHA512 (gxine-0.5.905.tar.bz2) = 744f283866b7fb4a5b834d3e6f2715538ad7a00fedf5819039129b07cfc25a1404e193118b94ebc74881b37b3e73540300992f164c1b30660b3f2cf6e5816747
-Size (gxine-0.5.905.tar.bz2) = 1203720 bytes
-SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc
-SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52
-SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852
-SHA1 (patch-af) = 6d58e572729217ae7a9a3ef2a177fb929f3da453
-SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692
-SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86
-SHA1 (patch-ai) = 792fabf23d55fac337d6825e5ba28d1a80393ce9
-SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
-SHA1 (patch-ak) = d055caed81560d53c922f772dc713bfca8ef5691
-SHA1 (patch-an) = 10789072010e0a2d868a24c21d97f902364f2587
-SHA1 (patch-aq) = 51acfd7107eed0cf73462daa73024ef28964d9eb
-SHA1 (patch-ba) = 7ef029a5bdfa7cf037218ef134b418a2b4f2b03b
-SHA1 (patch-bb) = f4f96102cff0589e3c823b4dd96693668aa16a5f
-SHA1 (patch-src_console_output_h) = 6e0cab99bc57497f52e6d965ffbaa5e18317edbe
-SHA1 (patch-src_engine_c) = 827d08132f8dbe1b88e1d6f8a073643cfdd9ca8c
+SHA1 (gxine-0.5.910.tar.xz) = d3e5569e7534600600fcfb1232916763c6150205
+RMD160 (gxine-0.5.910.tar.xz) = f06d641596b936ae137480c1a8334957ded87d7d
+SHA512 (gxine-0.5.910.tar.xz) = f105060bb0a86215ee7bfb5804795d400f1c79973e3141e8c8e3ecab249d8a6cdd6467a926625a6f89081d7160f192ea63a57f623de46c7634c4cc08431f897d
+Size (gxine-0.5.910.tar.xz) = 931616 bytes
+SHA1 (patch-ak) = 46ab35de6ac6f20b43955a72327806753eff143f
+SHA1 (patch-aq) = df68a399401f989b43d2d3f32026776418428e33
diff --git a/multimedia/gxine/patches/patch-aa b/multimedia/gxine/patches/patch-aa
deleted file mode 100644
index 26e104d3163..00000000000
--- a/multimedia/gxine/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/05/31 21:33:11 kristerw Exp $
-
---- src/post.c.orig	Tue May 31 23:11:08 2005
-+++ src/post.c	Tue May 31 23:12:30 2005
-@@ -81,6 +81,7 @@
-   const xine_post_in_t *in = xine_post_input (plugin, "parameters");
-   const xine_post_api_t *api;
-   const xine_post_api_descr_t *param_desc;
-+  char *params;
- 
-   if (!in)
-     return NULL;
-@@ -88,7 +89,7 @@
-   api = in->data;
-   param_desc = api->get_param_descr ();
- 
--  char *params = malloc (param_desc->struct_size);
-+  params = malloc (param_desc->struct_size);
-   api->get_parameters (plugin, params);
- 
-   for (;;)
-@@ -494,9 +495,10 @@
-   while ((++param)->type != POST_PARAM_TYPE_LAST)
-   {
-     GtkWidget *widget;
-+    gpointer param_p;
-     info->conf_w = realloc (info->conf_w,
- 			    (param_count + 2) * sizeof (GtkWidget *));
--    gpointer param_p = info->params + param->offset;
-+    param_p = info->params + param->offset;
-     switch (param->type)
-     {
-     case POST_PARAM_TYPE_INT:
diff --git a/multimedia/gxine/patches/patch-ab b/multimedia/gxine/patches/patch-ab
deleted file mode 100644
index 37d5d956a72..00000000000
--- a/multimedia/gxine/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/19 13:26:02 adam Exp $
-
---- src/http.c.orig	2005-03-17 00:55:23.000000000 +0000
-+++ src/http.c
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
diff --git a/multimedia/gxine/patches/patch-ad b/multimedia/gxine/patches/patch-ad
deleted file mode 100644
index 14db9390852..00000000000
--- a/multimedia/gxine/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2006/05/19 19:09:18 joerg Exp $
-
---- src/menu.c.orig	2006-05-19 17:58:22.000000000 +0000
-+++ src/menu.c
-@@ -255,7 +255,7 @@ void menu_add_items (GtkUIManager *ui, c
-  * Requires a function body, to which is passed int v = radio action value
-  */
- #define JS_CB_R(func) \
--  static always_inline void js_##func##_cb_int (int); \
-+  static void js_##func##_cb_int (int); \
-   static void js_##func##_cb (GtkRadioAction *action, gpointer data) \
-   { \
-     /* \
-@@ -266,17 +266,17 @@ void menu_add_items (GtkUIManager *ui, c
-     */ \
-     js_##func##_cb_int (gtk_radio_action_get_current_value (action)); \
-   } \
--  static always_inline void js_##func##_cb_int (int v)
-+  static void js_##func##_cb_int (int v)
-   /* function body goes here */
- 
- /* Toggle action callback (no Javascript)
-  * Requires a function body, to which is passed gboolean v = toggle state
-  */
- #define JS_CB_T(func) \
--  static always_inline void js_##func##_cb_int (gboolean); \
-+  static void js_##func##_cb_int (gboolean); \
-   static void js_##func##_cb (GtkToggleAction *action, gpointer data) \
-   { js_##func##_cb_int (gtk_toggle_action_get_active (action)); } \
--  static always_inline void js_##func##_cb_int (gboolean v)
-+  static void js_##func##_cb_int (gboolean v)
-   /* function body goes here */
- 
- /* File */
diff --git a/multimedia/gxine/patches/patch-af b/multimedia/gxine/patches/patch-af
deleted file mode 100644
index ffcd3e7a3b5..00000000000
--- a/multimedia/gxine/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 2009/04/17 16:51:07 drochner Exp $
-
---- doc/man/Makefile.in.orig	2009-04-01 17:36:48.000000000 +0200
-+++ doc/man/Makefile.in
-@@ -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
- 
- .SUFFIXES:
diff --git a/multimedia/gxine/patches/patch-ag b/multimedia/gxine/patches/patch-ag
deleted file mode 100644
index 966b73357cb..00000000000
--- a/multimedia/gxine/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/10/17 16:23:47 drochner Exp $
-
---- src/defs.h.orig	2006-08-21 09:14:49.000000000 +0200
-+++ src/defs.h
-@@ -46,7 +46,7 @@
- 
- /* debug logging */
- #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,...)
diff --git a/multimedia/gxine/patches/patch-ah b/multimedia/gxine/patches/patch-ah
deleted file mode 100644
index 90e86b2e78a..00000000000
--- a/multimedia/gxine/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/05/03 12:47:47 drochner Exp $
-
---- src/globals.h.orig	2006-03-03 03:01:16.000000000 +0100
-+++ src/globals.h
-@@ -37,6 +37,7 @@
- #include <gdk/gdk.h>
- #include <glib.h>
- #include <xine.h>
-+#include <pthread.h>
- 
- #include "script_engine.h"
- #include "info_widgets.h"
diff --git a/multimedia/gxine/patches/patch-ai b/multimedia/gxine/patches/patch-ai
deleted file mode 100644
index 4973c908e37..00000000000
--- a/multimedia/gxine/patches/patch-ai
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2009/04/17 16:51:07 drochner Exp $
-
---- src/key_events.c.orig	2009-03-25 17:41:49.000000000 +0100
-+++ src/key_events.c
-@@ -767,6 +767,7 @@ void kb_edit_show (void)
- 
- static void do_edit_binding (void)
- {
-+  char *title;
-   editkey = *lookup_binding (&catch_key_iter);
-   editdesc = editkey.desc;
-   editkey.desc = getdesc (&editkey);
-@@ -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);
- 
--  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);
- 
-@@ -1110,9 +1111,7 @@ static JSBool js_keypad_show (JSContext 
- 
- /* Xine event mapping data */
- 
--static const kb_xine_event_map_t xine_input = {
--  "INPUT",
--  {
-+static const kb_xine_event_id_t xine_input_ids[] = {
-     { "ANGLE_NEXT", XINE_EVENT_INPUT_ANGLE_NEXT },
-     { "ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
-     { "DOWN", XINE_EVENT_INPUT_DOWN },
-@@ -1153,7 +1152,10 @@ static const kb_xine_event_map_t xine_in
-     { "9", XINE_EVENT_INPUT_NUMBER_9 },
-     { "-", -1 }, /* null event */
-     { "" }
--  }
-+};
-+
-+static const kb_xine_event_map_t xine_input = {
-+  "INPUT", &xine_input_ids
- };
- 
- 
-@@ -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_AUDIO },
-     { "BACK", XINE_EVENT_VDR_BACK },
-     { "BLUE", XINE_EVENT_VDR_BLUE },
-@@ -1239,7 +1239,10 @@ static const kb_xine_event_map_t xine_vd
-     { "VOLPLUS", XINE_EVENT_VDR_VOLPLUS },
-     { "YELLOW", XINE_EVENT_VDR_YELLOW },
-     { "" }
--  }
-+};
-+
-+static const kb_xine_event_map_t xine_vdr = {
-+  "VDR", &xine_vdr_ids
- };
- 
- JSBool js_event_generic (JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
diff --git a/multimedia/gxine/patches/patch-aj b/multimedia/gxine/patches/patch-aj
deleted file mode 100644
index 6ba828774c8..00000000000
--- a/multimedia/gxine/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/04/13 16:39:32 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/key_events.h.orig	Thu Dec 16 00:59:59 2004
-+++ src/key_events.h	Tue Apr 12 12:53:59 2005
-@@ -35,7 +35,7 @@ typedef struct kb_xine_event_id_s kb_xin
- 
- struct kb_xine_event_map_s {
-   char prefix[8];
--  const kb_xine_event_id_t id[];
-+  const kb_xine_event_id_t *id;
- };
- typedef struct kb_xine_event_map_s kb_xine_event_map_t;
- 
diff --git a/multimedia/gxine/patches/patch-ak b/multimedia/gxine/patches/patch-ak
index e0c9cf75737..7108b411eb3 100644
--- a/multimedia/gxine/patches/patch-ak
+++ b/multimedia/gxine/patches/patch-ak
@@ -1,32 +1,49 @@
-$NetBSD: patch-ak,v 1.11 2010/01/19 20:33:26 drochner Exp $
+$NetBSD: patch-ak,v 1.12 2019/06/18 12:38:36 nia Exp $
 
---- configure.orig	2010-01-01 01:02:28.000000000 +0000
+Disable logo demuxer detection, it doesn't work and stops
+us from building. In practice, not having it isn't a problem.
+
+--- configure.orig	2017-12-27 19:53:11.000000000 +0000
 +++ configure
-@@ -11614,7 +11614,7 @@ $as_echo "$ac_cv_always_inline" >&6; }
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define always_inline $always_inline
-+#define gxine_always_inline $always_inline
- _ACEOF
+@@ -19817,39 +19817,8 @@ else
+   withval=auto
+ fi
  
+-LOGO_FORMAT=''
+-logo_sub=''
+-while test "$LOGO_FORMAT" = ''; do
+-  echo "$as_me:$LINENO: trying type=$withval" >&5
+-  if test "$withval" = auto; then
+-    # preferred is last
+-    if test "$HAVE_IMAGE" = yes; then withval=image; fi
+-    if test "$HAVE_MPEG" = yes; then withval=mpeg; fi
+-    # handle missing-demuxer case
+-    if test "$withval" = auto; then
+-      as_fn_error $? "no available demuxer for the logo image - rebuild/reinstall xine-lib?" "$LINENO" 5
+-    fi
+-  fi
+-  case "$withval" in
+-    image)
+-	if test "$HAVE_IMAGE" = no; then
+-	  logo_sub="$withval"
+-	  withval=auto
+-	else
+-	  LOGO_FORMAT=jpg
+-	fi
+-	;;
+-    mpeg)
+-	if test "$HAVE_MPEG" = no; then
+-	  logo_sub="$withval"
+-	  withval=auto
+-	else
+-	  LOGO_FORMAT=mpv
+-	fi
+-	;;
+-  esac
+-done
+-
++LOGO_FORMAT='mpv'
++logo_sub='mpeg'
  
-@@ -16578,14 +16578,14 @@ case $host in
-     LDFLAGS="$LDFLAGS -L/usr/local/lib"
-     ;;
-   *)
--   THREAD_LIBS="-lpthread"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
--$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+   THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+    { $as_echo "$as_me:${as_lineno-$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 :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
+ cat >>confdefs.h <<_ACEOF
+ #define LOGO_FORMAT "$LOGO_FORMAT"
diff --git a/multimedia/gxine/patches/patch-an b/multimedia/gxine/patches/patch-an
deleted file mode 100644
index 985ae60f42c..00000000000
--- a/multimedia/gxine/patches/patch-an
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-an,v 1.2 2012/05/06 23:13:49 dholland Exp $
-
-- fix build with latest glib2
-- threading fix? (?)
-
---- src/main.c.orig	2009-12-19 16:18:41.000000000 +0000
-+++ src/main.c
-@@ -45,7 +45,6 @@
- #include <gdk/gdkx.h>
- #include <gdk/gdkkeysyms.h>
- #include <glib.h>
--#include <glib/gmessages.h>
- 
- #include "desktop_integration.h"
- #include "engine.h"
-@@ -802,9 +801,9 @@ to the extent permitted by law.\n"),
-   if (cmd)
-     se_eval (gse, cmd, NULL, NULL, NULL, "--command");
- 
--  //gdk_threads_enter();
-+  gdk_threads_enter();
-   gtk_main();
--  //gdk_threads_leave();
-+  gdk_threads_leave();
- 
-   return 0;
- }
diff --git a/multimedia/gxine/patches/patch-aq b/multimedia/gxine/patches/patch-aq
index f3c9ac9c2db..c4d92f8322c 100644
--- a/multimedia/gxine/patches/patch-aq
+++ b/multimedia/gxine/patches/patch-aq
@@ -1,4 +1,6 @@
-$NetBSD: patch-aq,v 1.3 2009/04/17 16:51:07 drochner Exp $
+$NetBSD: patch-aq,v 1.4 2019/06/18 12:38:36 nia Exp $
+
+Install config files to the examples directory.
 
 --- misc/Makefile.in.orig	2009-04-01 17:36:49.000000000 +0200
 +++ misc/Makefile.in
diff --git a/multimedia/gxine/patches/patch-ba b/multimedia/gxine/patches/patch-ba
deleted file mode 100644
index c1cda438f25..00000000000
--- a/multimedia/gxine/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2008/09/03 17:47:03 drochner Exp $
-
---- misc/mediamarks.orig	2008-05-15 23:53:40.000000000 +0200
-+++ misc/mediamarks
-@@ -413,7 +413,7 @@
-     </ENTRY>
-     <ENTRY>
-       <TITLE>swr 3</TITLE>
--      <REF HREF="mms://213.200.75.252/swr3$livestream.wma"/>
-+      <REF HREF="http://213.200.97.110:80/swr3live/livestream.mp3"/>
-       <TIME start="135175000"/>
-     </ENTRY>
-     <ENTRY>
diff --git a/multimedia/gxine/patches/patch-bb b/multimedia/gxine/patches/patch-bb
deleted file mode 100644
index 55b87b517fd..00000000000
--- a/multimedia/gxine/patches/patch-bb
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2009/04/17 16:51:07 drochner Exp $
-
---- 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;
diff --git a/multimedia/gxine/patches/patch-src_console_output_h b/multimedia/gxine/patches/patch-src_console_output_h
deleted file mode 100644
index a4e9d1c01c1..00000000000
--- a/multimedia/gxine/patches/patch-src_console_output_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_console_output_h,v 1.1 2012/05/06 23:13:49 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/console_output.h~	2009-12-19 16:18:41.000000000 +0000
-+++ src/console_output.h
-@@ -21,7 +21,7 @@
- #ifndef GXINE_CONSOLE_OUTPUT_H
- #define GXINE_CONSOLE_OUTPUT_H
- 
--#include <glib/gmessages.h>
-+#include <glib.h>
- 
- void console_output_init (void);
- 
diff --git a/multimedia/gxine/patches/patch-src_engine_c b/multimedia/gxine/patches/patch-src_engine_c
deleted file mode 100644
index 099d9638c08..00000000000
--- a/multimedia/gxine/patches/patch-src_engine_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_engine_c,v 1.1 2012/05/06 23:13:49 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/engine.c~	2009-12-19 16:18:41.000000000 +0000
-+++ src/engine.c
-@@ -30,7 +30,7 @@
- #include <errno.h>
- #include <unistd.h>
- 
--#include <glib/gthread.h>
-+#include <glib.h>
- 
- #include "engine.h"
- #include "ui.h"