[pkgsrc/trunk]: pkgsrc/multimedia normalize a "struct timeval" before use as ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6517285b2372
branches:  trunk
changeset: 514561:6517285b2372
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Jun 14 10:30:06 2006 +0000

description:
normalize a "struct timeval" before use as timeout in select(2),
suggested by Mihai Chelaru per PM
(affects RTP)
bump PKGREVISIONs

diffstat:

 multimedia/gmplayer/Makefile              |   4 +++-
 multimedia/gmplayer/distinfo              |   3 ++-
 multimedia/mencoder/Makefile              |   4 +++-
 multimedia/mplayer-share/distinfo         |   3 ++-
 multimedia/mplayer-share/patches/patch-ak |  15 +++++++++++++++
 multimedia/mplayer/Makefile               |   4 +++-
 6 files changed, 28 insertions(+), 5 deletions(-)

diffs (101 lines):

diff -r b3f0e6bdf769 -r 6517285b2372 multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Wed Jun 14 10:26:42 2006 +0000
+++ b/multimedia/gmplayer/Makefile      Wed Jun 14 10:30:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/06/13 17:25:00 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2006/06/14 10:30:06 drochner Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -19,6 +19,8 @@
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
+PKGREVISION=   1
+
 COMMENT=       Software only MPEG-1/2/4 video decoder with a GTK+ interface
 
 SKINS +=       AlienMind-1.2${EXTRACT_SUFX}                    \
diff -r b3f0e6bdf769 -r 6517285b2372 multimedia/gmplayer/distinfo
--- a/multimedia/gmplayer/distinfo      Wed Jun 14 10:26:42 2006 +0000
+++ b/multimedia/gmplayer/distinfo      Wed Jun 14 10:30:06 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2006/06/13 17:25:00 drochner Exp $
+$NetBSD: distinfo,v 1.36 2006/06/14 10:30:06 drochner Exp $
 
 SHA1 (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
 RMD160 (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
@@ -67,3 +67,4 @@
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307
+SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a
diff -r b3f0e6bdf769 -r 6517285b2372 multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Wed Jun 14 10:26:42 2006 +0000
+++ b/multimedia/mencoder/Makefile      Wed Jun 14 10:30:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/06/13 17:25:00 drochner Exp $
+# $NetBSD: Makefile,v 1.27 2006/06/14 10:30:06 drochner Exp $
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
 
@@ -6,6 +6,8 @@
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
+PKGREVISION=   1
+
 CONFIGURE_ARGS+=       --confdir=${PREFIX}/share/mplayer
 
 BUILD_TARGET=  mencoder
diff -r b3f0e6bdf769 -r 6517285b2372 multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Wed Jun 14 10:26:42 2006 +0000
+++ b/multimedia/mplayer-share/distinfo Wed Jun 14 10:30:06 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2006/06/13 17:25:00 drochner Exp $
+$NetBSD: distinfo,v 1.29 2006/06/14 10:30:06 drochner Exp $
 
 SHA1 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
 RMD160 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307
+SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a
diff -r b3f0e6bdf769 -r 6517285b2372 multimedia/mplayer-share/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ak Wed Jun 14 10:30:06 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2006/06/14 10:30:06 drochner Exp $
+
+--- libmpdemux/rtp.c.orig      2006-06-14 10:41:54.000000000 +0200
++++ libmpdemux/rtp.c
+@@ -137,8 +137,8 @@ static int rtp_open_socket( URL_t *url )
+               }
+       }
+ 
+-      tv.tv_sec = 0;
+-      tv.tv_usec = (1 * 1000000);     // 1 second timeout
++      tv.tv_sec = 1;
++      tv.tv_usec = 0; // 1 second timeout
+       FD_ZERO( &set );
+       FD_SET( socket_server_fd, &set );
+       err = select(socket_server_fd+1, &set, NULL, NULL, &tv);
diff -r b3f0e6bdf769 -r 6517285b2372 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Wed Jun 14 10:26:42 2006 +0000
+++ b/multimedia/mplayer/Makefile       Wed Jun 14 10:30:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/06/13 17:25:00 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2006/06/14 10:30:06 drochner Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
 
@@ -6,6 +6,8 @@
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
+PKGREVISION=   1
+
 CONFIGURE_ARGS+=       --disable-mencoder
 CONFIGURE_ARGS+=       --confdir=${PREFIX}/share/mplayer