diff options
| author | drochner <drochner@pkgsrc.org> | 2008-05-26 12:35:09 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2008-05-26 12:35:09 +0000 |
| commit | 22e291cc8822e63de131c5eb2e8d5d69065fda91 (patch) | |
| tree | ae27d5cc1fb2d4219328f0f941bb5e48973eb1bc | |
| parent | eff6f440a26d971923066296f2e30baeb4e48114 (diff) | |
| download | pkgsrc-22e291cc8822e63de131c5eb2e8d5d69065fda91.tar.gz | |
normalize time argument to pthread_cond_timedwait(), otherwise NetBSD's
libpthread complains (happened if one jumped forth and back in a DVD)
bump PKGREVISION
| -rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xine-lib/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-fb | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index a9adfd5cb89..912b35e113a 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -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 --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index fb9e6558d36..5cd070ec6a4 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -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-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 SHA1 (patch-fa) = a69fe09588596bfc3d74fad29e5a1aeeeead4dfd +SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2 diff --git a/multimedia/xine-lib/patches/patch-fb b/multimedia/xine-lib/patches/patch-fb new file mode 100644 index 00000000000..79c294610ac --- /dev/null +++ b/multimedia/xine-lib/patches/patch-fb @@ -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); + } |