diff options
author | drochner <drochner@pkgsrc.org> | 2006-06-14 10:30:06 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2006-06-14 10:30:06 +0000 |
commit | 775b0fecf3046679d766b0a4ee209ab4470ce5b2 (patch) | |
tree | b222f99f64bd6c7ad6599c3720626aed4d7e85c0 | |
parent | f6a5cf3bbe87466d28177bc003605bfdc7b2f206 (diff) | |
download | pkgsrc-775b0fecf3046679d766b0a4ee209ab4470ce5b2.tar.gz |
normalize a "struct timeval" before use as timeout in select(2),
suggested by Mihai Chelaru per PM
(affects RTP)
bump PKGREVISIONs
-rw-r--r-- | multimedia/gmplayer/Makefile | 4 | ||||
-rw-r--r-- | multimedia/gmplayer/distinfo | 3 | ||||
-rw-r--r-- | multimedia/mencoder/Makefile | 4 | ||||
-rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
-rw-r--r-- | multimedia/mplayer-share/patches/patch-ak | 15 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile | 4 |
6 files changed, 28 insertions, 5 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 63aefedc62f..e1e1b05361a 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -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 @@ SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/Skin/ \ .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 --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index e8f8ab0b0fd..1402130257f 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -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-aa) = 4b80c0d18f0c9ae3f65d572965222db709a2a6b3 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913 SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307 +SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index d9401fa9f94..b16845a56dc 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -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 @@ COMMENT= Simple movie encoder for MPlayer-playable movies .include "../../multimedia/mplayer-share/Makefile.common" +PKGREVISION= 1 + CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer BUILD_TARGET= mencoder diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 5fd8011c3c7..b483c7d0747 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -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-aa) = 4b80c0d18f0c9ae3f65d572965222db709a2a6b3 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913 SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307 +SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a diff --git a/multimedia/mplayer-share/patches/patch-ak b/multimedia/mplayer-share/patches/patch-ak new file mode 100644 index 00000000000..b7843ce5ed0 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ak @@ -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 --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 0ff1929e95c..df0597e772e 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 @@ COMMENT= Software-only MPEG-1/2/4 video decoder .include "../../multimedia/mplayer-share/Makefile.common" +PKGREVISION= 1 + CONFIGURE_ARGS+= --disable-mencoder CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer |