[pkgsrc/trunk]: pkgsrc/multimedia/xine-ui Update to 0.99.5:

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/726bcd202b7e
branches:  trunk
changeset: 530943:726bcd202b7e
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sun Jul 15 19:41:28 2007 +0000

description:
Update to 0.99.5:

After long time, a new xine-ui version is now available. There are fixes
for security issues with playlists (upgrade recommended!), fixes for crashes,
memleaks and bugs. Functional enhancements and features are added,
appearance of non-skinned windows is harmonized (with more space for
text), translations are updated.

diffstat:

 multimedia/xine-ui/Makefile         |    9 +-
 multimedia/xine-ui/PLIST            |   24 ++++-
 multimedia/xine-ui/distinfo         |   30 +-----
 multimedia/xine-ui/patches/patch-aa |   14 +-
 multimedia/xine-ui/patches/patch-ah |   23 -----
 multimedia/xine-ui/patches/patch-ai |  149 ------------------------------------
 multimedia/xine-ui/patches/patch-al |   13 ---
 multimedia/xine-ui/patches/patch-am |   13 ---
 multimedia/xine-ui/patches/patch-ao |   22 -----
 multimedia/xine-ui/patches/patch-ap |   43 ----------
 multimedia/xine-ui/patches/patch-aq |   40 ---------
 multimedia/xine-ui/patches/patch-ar |   34 --------
 multimedia/xine-ui/patches/patch-as |   24 -----
 multimedia/xine-ui/patches/patch-at |   16 +-
 multimedia/xine-ui/patches/patch-au |   20 ----
 multimedia/xine-ui/patches/patch-av |   22 -----
 multimedia/xine-ui/patches/patch-aw |   40 ---------
 multimedia/xine-ui/patches/patch-ax |   13 ---
 multimedia/xine-ui/patches/patch-ay |   13 ---
 multimedia/xine-ui/patches/patch-az |   22 -----
 multimedia/xine-ui/patches/patch-ba |   17 ----
 multimedia/xine-ui/patches/patch-bb |   31 -------
 multimedia/xine-ui/patches/patch-bc |   14 ---
 23 files changed, 45 insertions(+), 601 deletions(-)

diffs (truncated from 804 to 300 lines):

diff -r 10f95f1f233b -r 726bcd202b7e multimedia/xine-ui/Makefile
--- a/multimedia/xine-ui/Makefile       Sun Jul 15 19:23:43 2007 +0000
+++ b/multimedia/xine-ui/Makefile       Sun Jul 15 19:41:28 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2007/02/17 22:48:16 salo Exp $
+# $NetBSD: Makefile,v 1.35 2007/07/15 19:41:28 xtraeme Exp $
 #
 
-DISTNAME=              xine-ui-0.99.4
-PKGREVISION=           8
+DISTNAME=              xine-ui-0.99.5
 CATEGORIES=            multimedia
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=xine/}
 
@@ -13,7 +12,7 @@
 BUILDLINK_API_DEPENDS.curl+=   curl>7.10.2
 
 USE_PKGLOCALEDIR=      YES
-USE_TOOLS+=            msgfmt
+USE_TOOLS+=            msgfmt pkg-config
 USE_DIRS+=             xdg-1.1
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
@@ -21,6 +20,8 @@
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
+PTHREAD_AUTO_VARS=     yes
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff -r 10f95f1f233b -r 726bcd202b7e multimedia/xine-ui/PLIST
--- a/multimedia/xine-ui/PLIST  Sun Jul 15 19:23:43 2007 +0000
+++ b/multimedia/xine-ui/PLIST  Sun Jul 15 19:41:28 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/02/11 17:19:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/07/15 19:41:28 xtraeme Exp $
 bin/fbxine
 bin/xine
 bin/xine-bugreport
@@ -32,10 +32,15 @@
 share/doc/xine-ui/README_pl
 share/doc/xine-ui/README_uk
 share/doc/xitk/README
+share/icons/hicolor/16x16/apps/xine.png
+share/icons/hicolor/22x22/apps/xine.png
+share/icons/hicolor/32x32/apps/xine.png
+share/icons/hicolor/48x48/apps/xine.png
 share/locale/cs/LC_MESSAGES/xine-ui.mo
 share/locale/cs/LC_MESSAGES/xitk.mo
 share/locale/de/LC_MESSAGES/xine-ui.mo
 share/locale/de/LC_MESSAGES/xitk.mo
+share/locale/eo/LC_MESSAGES/xine-ui.mo
 share/locale/es/LC_MESSAGES/xine-ui.mo
 share/locale/es/LC_MESSAGES/xitk.mo
 share/locale/eu/LC_MESSAGES/xine-ui.mo
@@ -46,6 +51,8 @@
 share/locale/it/LC_MESSAGES/xitk.mo
 share/locale/ja/LC_MESSAGES/xine-ui.mo
 share/locale/ja/LC_MESSAGES/xitk.mo
+share/locale/nb/LC_MESSAGES/xine-ui.mo
+share/locale/nb/LC_MESSAGES/xitk.mo
 share/locale/pl/LC_MESSAGES/xine-ui.mo
 share/locale/pl/LC_MESSAGES/xitk.mo
 share/locale/pt_BR/LC_MESSAGES/xine-ui.mo
@@ -57,10 +64,6 @@
 share/locale/uk/LC_MESSAGES/xine-ui.mo
 share/locale/uk/LC_MESSAGES/xitk.mo
 share/pixmaps/xine.xpm
-share/pixmaps/xine_16x16.png
-share/pixmaps/xine_22x22.png
-share/pixmaps/xine_32x32.png
-share/pixmaps/xine_48x48.png
 share/xine/desktop/xine.desktop
 share/xine/oxine/mainmenu
 share/xine/oxine/mediamarks
@@ -134,6 +137,17 @@
 @dirrm share/xine/skins
 @dirrm share/xine/oxine
 @dirrm share/xine/desktop
+@dirrm share/xine
 @comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/doc/xitk
 @dirrm share/doc/xine-ui
diff -r 10f95f1f233b -r 726bcd202b7e multimedia/xine-ui/distinfo
--- a/multimedia/xine-ui/distinfo       Sun Jul 15 19:23:43 2007 +0000
+++ b/multimedia/xine-ui/distinfo       Sun Jul 15 19:41:28 2007 +0000
@@ -1,27 +1,9 @@
-$NetBSD: distinfo,v 1.14 2007/02/17 22:48:16 salo Exp $
+$NetBSD: distinfo,v 1.15 2007/07/15 19:41:28 xtraeme Exp $
 
-SHA1 (xine-ui-0.99.4.tar.gz) = b982e5697f183559c216f9243b9410d61b9c58aa
-RMD160 (xine-ui-0.99.4.tar.gz) = eeead5c6e566ade5505c8fcb924272c74eb4f49a
-Size (xine-ui-0.99.4.tar.gz) = 2544984 bytes
-SHA1 (patch-aa) = 4221e235da0b2047d218a9123f82a40cce92e15b
+SHA1 (xine-ui-0.99.5.tar.gz) = 4f452516319f31cda01d08ea2779f195933af0bb
+RMD160 (xine-ui-0.99.5.tar.gz) = 64cb69549d88d904d986ea7dd7b36a51d5b91756
+Size (xine-ui-0.99.5.tar.gz) = 2606481 bytes
+SHA1 (patch-aa) = 9a4bc545b2574477aaba82604e9e794617ee4cdc
 SHA1 (patch-ae) = 1d5887168efd340f047dfdb9e135ce12c18e2d5f
 SHA1 (patch-ag) = dddbea5257a5b21e3a7ba21207661f4a47a9fa7e
-SHA1 (patch-ah) = 9d61282de803459e4b9c49814796dcc97658849d
-SHA1 (patch-ai) = 68bd0bdb39ecacd993335707a8843fd696067633
-SHA1 (patch-al) = d00f3ad348450e209d55ba69c1c053fce7d359b3
-SHA1 (patch-am) = 57567b2c1f86ef575ff4abcbfaa5f06e3178a056
-SHA1 (patch-ao) = 09e83615b88dffbdfeb0b0bad07dcdc60024ba67
-SHA1 (patch-ap) = f4f360e5fc8008882f07c649b7ea29ef163c6731
-SHA1 (patch-aq) = 393f889a397c60a9cb1940f197e92efd12cb13bb
-SHA1 (patch-ar) = 50c45ce7c272385100bc562b8d1d668c3d860df7
-SHA1 (patch-as) = 96f680bcab84c7a832f0ea4ae2b6a5b687f79244
-SHA1 (patch-at) = 4d11203d056c45474e24b4e840e031720d840d55
-SHA1 (patch-au) = 1ab308585b3c806931fc0dd60dd82794a46cc4a9
-SHA1 (patch-av) = 0d36d3f7603752e5bfe98215ced4a878d4ec2058
-SHA1 (patch-aw) = 2cbb4e5a17faa79fb8d6607e52a9fa9d965ac884
-SHA1 (patch-ax) = 5388a8cb6fa73bbc001e7b1ad2ed4d25dc2425a8
-SHA1 (patch-ay) = f7252e705e017957238c3be37fbe52aea698785b
-SHA1 (patch-az) = 696c9a25ac25ba7940d976399519caadc4932c4b
-SHA1 (patch-ba) = 02493f55c8c1330a1eae6c109b51a4f5cdbe12d1
-SHA1 (patch-bb) = ebbfcc327d3918b152205a7907fc7c4252b7e1c2
-SHA1 (patch-bc) = 584d14552fd0acaaf32e64a4fa8c2886b4b16b84
+SHA1 (patch-at) = 433c648bbeea1a73189ab4e42c3c9ce4c4610290
diff -r 10f95f1f233b -r 726bcd202b7e multimedia/xine-ui/patches/patch-aa
--- a/multimedia/xine-ui/patches/patch-aa       Sun Jul 15 19:23:43 2007 +0000
+++ b/multimedia/xine-ui/patches/patch-aa       Sun Jul 15 19:41:28 2007 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2006/04/09 07:26:52 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2007/07/15 19:41:28 xtraeme Exp $
 
---- doc/man/Makefile.in.orig   2006-04-08 21:22:54.000000000 +0200
-+++ doc/man/Makefile.in        2006-04-08 21:23:16.000000000 +0200
-@@ -280,7 +280,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
+--- doc/man/Makefile.in.orig   2007-07-15 21:13:56.000000000 +0200
++++ doc/man/Makefile.in        2007-07-15 21:14:08.000000000 +0200
+@@ -246,7 +246,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = fr es en pl de
 +SUBDIRS = en
  all: all-recursive
diff -r 10f95f1f233b -r 726bcd202b7e multimedia/xine-ui/patches/patch-ah
--- a/multimedia/xine-ui/patches/patch-ah       Sun Jul 15 19:23:43 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/03/28 21:11:35 mycroft Exp $
-
---- src/common/utils.c.orig    2003-12-18 00:30:11.000000000 +0000
-+++ src/common/utils.c 2004-03-28 20:55:10.000000000 +0000
-@@ -34,7 +34,6 @@
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <sys/utsname.h>
--#include <alloca.h>
- 
- #ifdef HAVE_X11
- #include <X11/Xlib.h>
-@@ -47,6 +46,10 @@
- #include <X11/Xutil.h>
- #endif /* !HAVE_X11 */
- 
-+#ifdef HAVE_ALLOCA_H
-+#include <alloca.h>
-+#endif
-+
- #include <xine/xineutils.h>
- 
- #include "utils.h"
diff -r 10f95f1f233b -r 726bcd202b7e multimedia/xine-ui/patches/patch-ai
--- a/multimedia/xine-ui/patches/patch-ai       Sun Jul 15 19:23:43 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2007/02/17 22:48:16 salo Exp $
-
---- src/xitk/xine-remote.c.orig        2005-07-16 21:05:32.000000000 +0200
-+++ src/xitk/xine-remote.c     2007-02-17 22:24:26.000000000 +0100
-@@ -30,6 +30,7 @@
- #endif
- /* required for strncasecmp() */
- #define _BSD_SOURCE 1
-+#define _NETBSD_SOURCE
- /* required to enable POSIX variant of getpwuid_r on solaris */
- #define _POSIX_PTHREAD_SEMANTICS 1
- 
-@@ -58,7 +59,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -66,8 +67,8 @@
- #include <netdb.h>
- #include <pthread.h>
- 
--#include <readline.h>
--#include <history.h>
-+#include <readline/readline.h>
-+#include <readline/history.h>
- 
- #include "common.h"
- 
-@@ -638,7 +639,7 @@ static int write_to_console(session_t *s
-   va_end(args);
-   
-   pthread_mutex_lock(&session->console_mutex);
--  err = write_to_console_unlocked(session, buf);
-+  err = write_to_console_unlocked(session, "%s", buf);
-   pthread_mutex_unlock(&session->console_mutex);
- 
-   return err;
-@@ -998,7 +999,7 @@ static void *select_thread(void *data) {
-                 write_to_console_unlocked_nocr(session, "\b \b");
-                 pos--;
-               }
--              write_to_console_unlocked(session, obuffer);
-+              write_to_console_unlocked(session, "%s", obuffer);
- 
-               rl_crlf();
-               rl_forced_update_display();
-@@ -1082,7 +1083,7 @@ static void client_handle_command(sessio
-         
-         *pp = '\0';
-         
--        if((sock_write(session->socket, buf)) == -1) {
-+        if((sock_write(session->socket, "%s", buf)) == -1) {
-           session->running = 0;
-         }
-       }
-@@ -1094,7 +1095,7 @@ static void client_handle_command(sessio
-   
-   /* Perhaps a ';' separated commands, so send anyway to server */
-   if(found == 0) {
--    sock_write(session->socket, (char *)command);
-+    sock_write(session->socket, "%s", (char *)command);
-   }
-   
-   if((!strncasecmp(cmd, "exit", strlen(cmd))) || (!strncasecmp(cmd, "halt", strlen(cmd)))) {
-@@ -1714,7 +1715,7 @@ static void do_commands(commands_t *cmd,
-     i++;
-   }
-   sprintf(buf, "%s.\n", buf);
--  sock_write(client_info->socket, buf);
-+  sock_write(client_info->socket, "%s", buf);
- }
- 
- static void do_help(commands_t *cmd, client_info_t *client_info) {
-@@ -1760,7 +1761,7 @@ static void do_help(commands_t *cmd, cli
-     }
-     
-     sprintf(buf, "%s\n", buf);
--    sock_write(client_info->socket, buf);
-+    sock_write(client_info->socket, "%s", buf);
-   }
-   else {
-     int i;
-@@ -2096,7 +2097,7 @@ static void do_get(commands_t *cmd, clie
-         sprintf(buf, "%s%s", buf, "*UNKNOWN*");
-       
-       sprintf(buf, "%s%c", buf, '\n');
--      sock_write(client_info->socket, buf);
-+      sock_write(client_info->socket, "%s", buf);
-       }
-       else if(is_arg_contain(client_info, 1, "speed")) {
-       char buf[64];
-@@ -2116,7 +2117,7 @@ static void do_get(commands_t *cmd, clie
-         sprintf(buf, "%s%s", buf, "*UNKNOWN*");
-       
-       sprintf(buf, "%s%c", buf, '\n');
--      sock_write(client_info->socket, buf);
-+      sock_write(client_info->socket, "%s", buf);
-       }
-       else if(is_arg_contain(client_info, 1, "position")) {
-       char buf[64];
-@@ -2128,7 +2129,7 @@ static void do_get(commands_t *cmd, clie
-                           &pos_time,
-                           &length_time);
-       snprintf(buf, sizeof(buf), "%s: %d\n", "Current position", pos_time);
--      sock_write(client_info->socket, buf);
-+      sock_write(client_info->socket, "%s", buf);
-       }
-       else if(is_arg_contain(client_info, 1, "length")) {
-       char buf[64];
-@@ -2140,7 +2141,7 @@ static void do_get(commands_t *cmd, clie
-                           &pos_time,