[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib normalize time argument to pthread...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91da50c77e1d
branches:  trunk
changeset: 542732:91da50c77e1d
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon May 26 12:35:09 2008 +0000

description:
normalize time argument to pthread_cond_timedwait(), otherwise NetBSD's
libpthread complains (happened if one jumped forth and back in a DVD)
bump PKGREVISION

diffstat:

 multimedia/xine-lib/Makefile         |   4 ++--
 multimedia/xine-lib/distinfo         |   3 ++-
 multimedia/xine-lib/patches/patch-fb |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r ce9efdeacb14 -r 91da50c77e1d multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile      Mon May 26 12:29:24 2008 +0000
+++ b/multimedia/xine-lib/Makefile      Mon May 26 12:35:09 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2008/04/18 14:01:22 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2008/05/26 12:35:09 drochner Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=               Multimedia player library
 
diff -r ce9efdeacb14 -r 91da50c77e1d multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo      Mon May 26 12:29:24 2008 +0000
+++ b/multimedia/xine-lib/distinfo      Mon May 26 12:35:09 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2008/04/18 14:01:22 drochner Exp $
+$NetBSD: distinfo,v 1.56 2008/05/26 12:35:10 drochner Exp $
 
 SHA1 (xine-lib-1.1.12.tar.bz2) = a27872a4292e2ce6c35018a1cbbf7a88eecda8cd
 RMD160 (xine-lib-1.1.12.tar.bz2) = 305c1b3787a4191083b9793281ce3f3043d65fcb
@@ -30,3 +30,4 @@
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
 SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
 SHA1 (patch-fa) = a69fe09588596bfc3d74fad29e5a1aeeeead4dfd
+SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2
diff -r ce9efdeacb14 -r 91da50c77e1d multimedia/xine-lib/patches/patch-fb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-fb      Mon May 26 12:35:09 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-fb,v 1.1 2008/05/26 12:35:10 drochner Exp $
+
+--- ./src/xine-engine/demux.c.orig     2008-05-22 17:14:15.000000000 +0200
++++ ./src/xine-engine/demux.c
+@@ -291,6 +291,10 @@ static void *demux_loop (void *stream_ge
+         gettimeofday(&tv, NULL);
+         ts.tv_sec  = tv.tv_sec;
+         ts.tv_nsec = (tv.tv_usec + 100000) * 1000;
++      if (ts.tv_nsec >= 1000000000) {
++              ts.tv_nsec -= 1000000000;
++              ts.tv_sec += 1;
++      }
+     
+         pthread_cond_timedwait (&stream->demux_resume, &stream->demux_lock, &ts);
+       }