[pkgsrc/trunk]: pkgsrc/multimedia Call isspace(3) with unsigned char, instead...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0dcd2582882d
branches:  trunk
changeset: 501611:0dcd2582882d
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Oct 24 19:46:05 2005 +0000

description:
Call isspace(3) with unsigned char, instead of char, to handle
non-ASCII characters properly.  Based on patches provided by Kevin Kim

Bump PKGREVISION for mplayer and gmplayer.

diffstat:

 multimedia/gmplayer/Makefile              |   4 +-
 multimedia/mplayer-share/distinfo         |   3 +-
 multimedia/mplayer-share/patches/patch-ah |  35 +++++++++++++++++++++++++++++++
 multimedia/mplayer/Makefile               |   4 +-
 4 files changed, 41 insertions(+), 5 deletions(-)

diffs (87 lines):

diff -r 829e3605e53c -r 0dcd2582882d multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Mon Oct 24 19:32:00 2005 +0000
+++ b/multimedia/gmplayer/Makefile      Mon Oct 24 19:46:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/10/02 11:23:08 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/10/24 19:46:05 minskim Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 SKIN_SITES=    http://www1.mplayerhq.hu/MPlayer/Skin/          \
                ftp://ftp1.mplayerhq.hu/MPlayer/Skin/           \
diff -r 829e3605e53c -r 0dcd2582882d multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Mon Oct 24 19:32:00 2005 +0000
+++ b/multimedia/mplayer-share/distinfo Mon Oct 24 19:46:05 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2005/08/27 06:59:52 dogcow Exp $
+$NetBSD: distinfo,v 1.24 2005/10/24 19:46:05 minskim Exp $
 
 SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
 RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
@@ -19,6 +19,7 @@
 SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
 SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
 SHA1 (patch-ag) = 9bc3466ef24970e3f26fc64601d9f2c27fa394d2
+SHA1 (patch-ah) = 744f073e791257768e5ec7da8e321d2f25d1fb2c
 SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
 SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
 SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
diff -r 829e3605e53c -r 0dcd2582882d multimedia/mplayer-share/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ah Mon Oct 24 19:46:05 2005 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ah,v 1.1 2005/10/24 19:46:05 minskim Exp $
+
+--- subreader.c.orig   2005-02-04 10:31:03.000000000 -0800
++++ subreader.c
+@@ -73,10 +73,10 @@ static int eol(char p) {
+ /* Remove leading and trailing space */
+ static void trail_space(char *s) {
+       int i = 0;
+-      while (isspace(s[i])) ++i;
++      while (isspace((unsigned char)s[i])) ++i;
+       if (i) strcpy(s, s + i);
+       i = strlen(s) - 1;
+-      while (i > 0 && isspace(s[i])) s[i--] = '\0';
++      while (i > 0 && isspace((unsigned char)s[i])) s[i--] = '\0';
+ }
+ 
+ static char *stristr(const char *haystack, const char *needle) {
+@@ -627,7 +627,7 @@ subtitle *sub_read_line_pjs(FILE *fd,sub
+     if (!fgets (line, LINE_LEN, fd))
+       return NULL;
+     /* skip spaces */
+-    for (s=line; *s && isspace(*s); s++);
++    for (s=line; *s && isspace(*(unsigned char*)s); s++);
+     /* allow empty lines at the end of the file */
+     if (*s==0)
+       return NULL;
+@@ -680,7 +680,7 @@ subtitle *sub_read_line_mpsub(FILE *fd, 
+                       else return current;
+               }
+               p=line;
+-              while (isspace(*p)) p++;
++              while (isspace(*(unsigned char*)p)) p++;
+               if (eol(*p) && num > 0) return current;
+               if (eol(*p)) return NULL;
+ 
diff -r 829e3605e53c -r 0dcd2582882d multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Mon Oct 24 19:32:00 2005 +0000
+++ b/multimedia/mplayer/Makefile       Mon Oct 24 19:46:05 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/10/20 03:47:37 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2005/10/24 19:46:05 minskim Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder