update to 0.99.7

changes: better M3U playlist handling, various
UI fixes (including a deadlock fix and a crash fix), use of XScreenSaver,
and two overflow bug fixes

13 files changed, 66 insertions, 162 deletions

diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 1f891385950..fc0757d59fe 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2011/11/01 06:02:16 sbd Exp $
+# $NetBSD: Makefile,v 1.50 2012/08/04 13:47:09 drochner Exp $
 #
 
-DISTNAME=		xine-ui-0.99.6
-PKGREVISION=		4
+DISTNAME=		xine-ui-0.99.7
 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
@@ -14,7 +13,7 @@ COMMENT=		Skinned xlib-based xine GUI
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		msgfmt pkg-config
+USE_TOOLS+=		msgfmt pkg-config gmake
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	yes
@@ -31,6 +30,7 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
@@ -42,5 +42,6 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-ui/PLIST b/multimedia/xine-ui/PLIST
index d88f1d4b411..adefc4d9d7f 100644
--- a/multimedia/xine-ui/PLIST
+++ b/multimedia/xine-ui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2010/05/07 17:46:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/08/04 13:47:09 drochner Exp $
 bin/fbxine
 bin/xine
 bin/xine-bugreport
@@ -8,6 +8,7 @@ man/man1/xine-bugreport.1
 man/man1/xine-check.1
 man/man1/xine-remote.1
 man/man1/xine.1
+share/applications/xine.desktop
 share/doc/xine-ui/README.config_en
 share/doc/xine-ui/README.cs.0.Introduction
 share/doc/xine-ui/README.cs.10.Remote_control
@@ -65,10 +66,9 @@ share/locale/uk/LC_MESSAGES/xine-ui.mo
 share/locale/uk/LC_MESSAGES/xitk.mo
 share/mime/packages/xine-ui.xml
 share/pixmaps/xine.xpm
-share/xine/desktop/xine.desktop
 share/xine/oxine/mainmenu
 share/xine/oxine/mediamarks
-share/xine/skins/xine-ui_logo.mpv
+share/xine/skins/xine-ui_logo.png
 share/xine/skins/xine_splash.png
 share/xine/skins/xinetic/BigArrowDown.png
 share/xine/skins/xinetic/BigArrowLeft.png
@@ -132,4 +132,4 @@ share/xine/skins/xinetic/SliderVPad.png
 share/xine/skins/xinetic/SmallArrowDown.png
 share/xine/skins/xinetic/SmallArrowUp.png
 share/xine/skins/xinetic/skinconfig
-share/xine/visuals/default.avi
+share/xine/visuals/default.mpv
diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo
index 30d5b519592..87846ee2dc4 100644
--- a/multimedia/xine-ui/distinfo
+++ b/multimedia/xine-ui/distinfo
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.21 2011/07/07 11:46:31 obache Exp $
+$NetBSD: distinfo,v 1.22 2012/08/04 13:47:09 drochner Exp $
 
-SHA1 (xine-ui-0.99.6.tar.bz2) = a8d6ab9a9e4cbeb0a5d677d6948e23d11019fc5b
-RMD160 (xine-ui-0.99.6.tar.bz2) = 6cdf639b5ffff54bacfa0a7bef65af1e7ebcacee
-Size (xine-ui-0.99.6.tar.bz2) = 2180633 bytes
+SHA1 (xine-ui-0.99.7.tar.xz) = ca82e09cf8245d038813bc4dbd8384ba79cbf197
+RMD160 (xine-ui-0.99.7.tar.xz) = e2f2311f62a5c5c7b9912b4c8acc059c42406a7c
+Size (xine-ui-0.99.7.tar.xz) = 1752328 bytes
 SHA1 (patch-aa) = f812ef6651d364030bad754f386f4d64c5cd8022
-SHA1 (patch-ab) = 5d9754d3824f66a80bc3a7bd2418870b1fae3b9f
-SHA1 (patch-ac) = e0767ddba59787d9c3f22ae56f29d1c2a975e93f
-SHA1 (patch-ae) = 1d5887168efd340f047dfdb9e135ce12c18e2d5f
-SHA1 (patch-ag) = 0f1686bba57805e2dccf939e5733faf997bc14f7
-SHA1 (patch-ah) = 9beaee5509306e6afa1b06aef4eab24635c2a79e
-SHA1 (patch-ai) = bd73bc709708f8ce9a94d87f4c6142948445affd
+SHA1 (patch-ab) = 53b7754767882581084c64c8f858ea78db27d209
 SHA1 (patch-aj) = 768594b88a1014d2f2f2b56a851b9d13362fa31b
-SHA1 (patch-at) = eab32a39c19b108bd8ea11adeb19ff50020e2b5f
-SHA1 (patch-src_xitk_download.c) = 9678802f57ec780669f4d8b321ea279155f68fe2
+SHA1 (patch-at) = 2ced7674dee7026eb30c33a26c479e8becabded1
+SHA1 (patch-ba) = 1ea9690e993eafd4281bf60487ef21cc9996493e
+SHA1 (patch-bb) = 19be56ee3b69300e1cb6515268fb907207804bda
 SHA1 (patch-zz) = f3b33d65805a9e58daaf812a3b9eb572c86ee7b9
diff --git a/multimedia/xine-ui/patches/patch-ab b/multimedia/xine-ui/patches/patch-ab
index ebbc7f3a616..87214ad7a42 100644
--- a/multimedia/xine-ui/patches/patch-ab
+++ b/multimedia/xine-ui/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2010/05/07 17:46:24 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2012/08/04 13:47:09 drochner Exp $
 
---- configure.orig	2010-03-06 01:34:51.000000000 +0000
+--- configure.orig	2012-06-09 18:14:37.000000000 +0000
 +++ configure
-@@ -7759,13 +7759,13 @@ case "$host" in
+@@ -8371,13 +8371,13 @@ case "$host" in
      ;;
  
    *)
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.4 2010/05/07 17:46:24 drochner Exp $
 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 +    { $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 :
+ if ${ac_cv_lib_pthread_pthread_create+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,12 +19,12 @@ $NetBSD: patch-ab,v 1.4 2010/05/07 17:46:24 drochner Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -7796,7 +7796,7 @@ fi
+@@ -8408,7 +8408,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
  $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
+ if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
 -  THREAD_LIBS="-lpthread"
 +  THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  else
-   as_fn_error "pthread needed" "$LINENO" 5
+   as_fn_error $? "pthread needed" "$LINENO" 5
  fi
diff --git a/multimedia/xine-ui/patches/patch-ac b/multimedia/xine-ui/patches/patch-ac
deleted file mode 100644
index 6b4d806aaa0..00000000000
--- a/multimedia/xine-ui/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2011/01/24 15:12:59 wiz Exp $
-
-Fix build with png-1.5.
-https://bugs.xine-project.org/show_bug.cgi?id=404
-
---- src/xitk/Imlib-light/load.c.orig	2010-03-01 17:02:05.000000000 +0000
-+++ src/xitk/Imlib-light/load.c
-@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id, 
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/multimedia/xine-ui/patches/patch-ae b/multimedia/xine-ui/patches/patch-ae
deleted file mode 100644
index d6f420b3e73..00000000000
--- a/multimedia/xine-ui/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/04/09 07:26:52 xtraeme Exp $
-
---- src/xitk/event.c.orig	2006-04-08 21:32:08.000000000 +0200
-+++ src/xitk/event.c	2006-04-08 21:32:59.000000000 +0200
-@@ -1301,7 +1301,9 @@
-   if(!XInitThreads()) {
-     printf (_("\nXInitThreads failed - looks like you don't have a "
- 	    "thread-safe xlib.\n"));
-+ #ifndef _PTH_PTHREAD_H_
-     exit(1);
-+ #endif
-   } 
-   
-   if((gGui->display = XOpenDisplay((getenv("DISPLAY")))) == NULL) {
diff --git a/multimedia/xine-ui/patches/patch-ag b/multimedia/xine-ui/patches/patch-ag
deleted file mode 100644
index 143422d8b13..00000000000
--- a/multimedia/xine-ui/patches/patch-ag
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2010/05/07 17:46:24 drochner Exp $
-
---- src/xitk/common.h.orig	2009-12-19 00:34:22.000000000 +0000
-+++ src/xitk/common.h
-@@ -82,6 +82,14 @@
- #include <lirc/lirc_client.h>
- #endif
- 
-+#if !defined(TRUE)
-+#define TRUE 1
-+#endif
-+
-+#if !defined(FALSE)
-+#define FALSE 0
-+#endif
-+
- /*
-  * config related constants
-  */
-@@ -375,8 +383,10 @@ typedef struct {
- 
-   void                     (*nongui_error_msg)(char *text);
- 
-+#if 0
-   FILE                      *stdout; /* Channel to original stdout at startup */
-                                      /* before an evtl. later redirection     */
-+#endif
- } gGui_t;
- 
- extern gGui_t *gGui;
diff --git a/multimedia/xine-ui/patches/patch-ah b/multimedia/xine-ui/patches/patch-ah
deleted file mode 100644
index 146a4bddfc2..00000000000
--- a/multimedia/xine-ui/patches/patch-ah
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2010/05/07 17:46:25 drochner Exp $
-
---- src/xitk/main.c.orig	2010-03-11 09:33:24.000000000 +0000
-+++ src/xitk/main.c
-@@ -1425,7 +1425,9 @@ int main(int argc, char *argv[]) {
-   gGui->no_mouse               = 0;
-   gGui->wid                    = 0;
-   gGui->nongui_error_msg       = NULL;
-+#if 0
-   gGui->stdout                 = stdout;
-+#endif
-   
-   window_attribute.x     = window_attribute.y      = -8192;
-   window_attribute.width = window_attribute.height = -1;
-@@ -1912,6 +1914,7 @@ int main(int argc, char *argv[]) {
-     int   guiout_fd, stdout_fd;
-     FILE *guiout_fp;
-     
-+#if 0
-     if((guiout_fd = dup(STDOUT_FILENO)) < 0)
-       fprintf(stderr, "cannot dup STDOUT_FILENO: %s.\n", strerror(errno));
-     else if((guiout_fp = fdopen(guiout_fd, "w")) == NULL)
-@@ -1925,6 +1928,7 @@ int main(int argc, char *argv[]) {
-       setlinebuf(gGui->stdout);
-       close(stdout_fd); /* stdout_fd was intermediate, not needed any longer */
-     }
-+#endif
-   }
- #endif
- 
-@@ -2240,10 +2244,12 @@ int main(int argc, char *argv[]) {
-   pthread_mutex_destroy(&gGui->download_mutex);
-   pthread_mutex_destroy(&gGui->logo_mutex);
- 
-+#if 0
-   if(gGui->report != stdout)
-     fclose(gGui->report);
-   if(gGui->stdout != stdout)
-     fclose(gGui->stdout);
-+#endif
- 
-   free_command_line_args(&_argv, _argc);
- 
diff --git a/multimedia/xine-ui/patches/patch-ai b/multimedia/xine-ui/patches/patch-ai
deleted file mode 100644
index d1801c453a2..00000000000
--- a/multimedia/xine-ui/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2010/05/07 17:46:25 drochner Exp $
-
---- src/xitk/stdctl.c.orig	2010-03-11 09:36:27.000000000 +0000
-+++ src/xitk/stdctl.c
-@@ -170,7 +170,7 @@ void stdctl_start(void) {
-   int err;
- 
-   stdctl.fd = STDIN_FILENO;
--  stdctl.fbk = gGui->stdout;
-+  stdctl.fbk = STDOUT_FILENO;
-   
-   if((err = pthread_create(&(stdctl.thread), NULL, xine_stdctl_loop, NULL)) != 0) {
-     fprintf(stderr, _("%s(): can't create new thread (%s)\n"), __XINE_FUNCTION__, strerror(err));
diff --git a/multimedia/xine-ui/patches/patch-at b/multimedia/xine-ui/patches/patch-at
index 1a86174645c..9116306433b 100644
--- a/multimedia/xine-ui/patches/patch-at
+++ b/multimedia/xine-ui/patches/patch-at
@@ -1,11 +1,11 @@
-$NetBSD: patch-at,v 1.3 2010/05/07 17:46:25 drochner Exp $
+$NetBSD: patch-at,v 1.4 2012/08/04 13:47:10 drochner Exp $
 
---- doc/man/en/Makefile.in.orig	2010-03-06 01:34:49.000000000 +0000
+--- doc/man/en/Makefile.in.orig	2012-06-09 18:14:35.000000000 +0000
 +++ doc/man/en/Makefile.in
-@@ -253,7 +253,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -283,7 +283,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ GNU_VERBOSITY := $(if $(findstring GNU,$(shell $(MAKE) -v)),0,1)
 -manfiles = xine.1 aaxine.1 xine-check.1 xine-remote.1
 +manfiles = xine.1 xine-check.1 xine-remote.1
  man_MANS = $(manfiles) xine-bugreport.1
diff --git a/multimedia/xine-ui/patches/patch-ba b/multimedia/xine-ui/patches/patch-ba
new file mode 100644
index 00000000000..d0e7ee8dc20
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.3 2012/08/04 13:47:10 drochner Exp $
+
+--- src/xitk/main.c.orig	2012-01-19 11:04:00.000000000 +0000
++++ src/xitk/main.c
+@@ -21,7 +21,7 @@
+  *
+  */
+ /* required for getsubopt(); the __sun test gives us strncasecmp() on solaris */
+-#if !defined(__sun) && ! defined(__FreeBSD__)
++#if !defined(__sun) && ! defined(__FreeBSD__) && ! defined(__NetBSD__)
+ #define _XOPEN_SOURCE 500
+ #endif
+ /* required for strncasecmp() */
diff --git a/multimedia/xine-ui/patches/patch-bb b/multimedia/xine-ui/patches/patch-bb
new file mode 100644
index 00000000000..a930673c890
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-bb
@@ -0,0 +1,24 @@
+$NetBSD: patch-bb,v 1.3 2012/08/04 13:47:10 drochner Exp $
+
+--- src/xitk/network.c.orig	2011-11-08 20:49:07.000000000 +0000
++++ src/xitk/network.c
+@@ -24,7 +24,7 @@
+ /* required for getsubopt(); the __sun test avoids compilation problems on 
+     solaris. On FreeBSD defining this disable BSD functions to be visible
+     and remove INADDR_NONE */
+-#if ! defined (__sun__) && ! defined (__OpenBSD__)  && ! defined(__FreeBSD__) && ! defined(__APPLE__)
++#if ! defined (__sun__) && ! defined (__OpenBSD__)  && ! defined(__FreeBSD__) && ! defined(__NetBSD__) && ! defined(__APPLE__)
+ #define _XOPEN_SOURCE 500
+ #endif
+ /* required for strncasecmp() */
+@@ -64,8 +64,8 @@
+ #include <netdb.h>
+ #include <pthread.h>
+ 
+-#include <readline.h>
+-#include <history.h>
++#include <readline/readline.h>
++#include <readline/history.h>
+ 
+ #include "common.h"
+ 
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_download.c b/multimedia/xine-ui/patches/patch-src_xitk_download.c
deleted file mode 100644
index 41a58eca2bf..00000000000
--- a/multimedia/xine-ui/patches/patch-src_xitk_download.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_xitk_download.c,v 1.1 2011/07/07 11:46:31 obache Exp $
-
-* not to include deprecated header file of curl.
-
---- src/xitk/download.c.orig	2009-12-19 00:34:22.000000000 +0000
-+++ src/xitk/download.c
-@@ -28,7 +28,6 @@
- 
- #ifdef HAVE_CURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
-