diff options
| author | tron <tron> | 2012-06-06 11:47:53 +0000 |
|---|---|---|
| committer | tron <tron> | 2012-06-06 11:47:53 +0000 |
| commit | 51993fef7fd09b20933c6d9abd95750b94cc5dc4 (patch) | |
| tree | cd06002656a8e2f4572980f3d518ba49d1b0e687 | |
| parent | 86cc413396e614d2d2aeed9f5fb2b1d9560888fd (diff) | |
| download | pkgsrc-51993fef7fd09b20933c6d9abd95750b94cc5dc4.tar.gz | |
Pullup ticket #3821 - requested by tron
audio/xcdplayer: build fix
Revisions pulled up:
- audio/xcdplayer/distinfo 1.9
- audio/xcdplayer/patches/patch-al 1.6
---
Module Name: pkgsrc
Committed By: dholland
Date: Sat Jun 2 20:00:50 UTC 2012
Modified Files:
pkgsrc/audio/xcdplayer: distinfo
pkgsrc/audio/xcdplayer/patches: patch-al
Log Message:
Call time() correctly; fixes netbsd-5 build.
| -rw-r--r-- | audio/xcdplayer/distinfo | 4 | ||||
| -rw-r--r-- | audio/xcdplayer/patches/patch-al | 30 |
2 files changed, 24 insertions, 10 deletions
diff --git a/audio/xcdplayer/distinfo b/audio/xcdplayer/distinfo index 478b6f5f651..993bb65275a 100644 --- a/audio/xcdplayer/distinfo +++ b/audio/xcdplayer/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2011/09/12 06:50:00 dholland Exp $ +$NetBSD: distinfo,v 1.8.6.1 2012/06/06 11:47:53 tron Exp $ SHA1 (xcdplayer-2.2.tar.Z) = e518f2df9fcc5e21e1123fe6f5b1193f232b76ef RMD160 (xcdplayer-2.2.tar.Z) = ba34fe8092aa96d6370320b20fa46b0b0d043176 @@ -14,7 +14,7 @@ SHA1 (patch-ah) = 51a6170c10456469ba2fc31d4b74993fb053f25a SHA1 (patch-ai) = 1bf094380473d4a88c61378ff6172a90df510541 SHA1 (patch-aj) = da8f0dccc7f0678bf9d2e820008813156ea25182 SHA1 (patch-ak) = 60f93385ab2eb0347a40e5516ec925117ce94b9d -SHA1 (patch-al) = 822369ea9ca9b0ff9a92ebd303dc976570395bde +SHA1 (patch-al) = 1a05b5669ef64f4363ccfa877b0c350d374144e9 SHA1 (patch-am) = 16347fa0157de6ecca0c8c6c946cbb3a1c406ecb SHA1 (patch-cdrom__sgi_c) = bb958cc315bc3ad822da54ffdd00975037f46ef0 SHA1 (patch-cdrom__sun_c) = 23149cbe48011a53219f90098de1eb4d487a3ab0 diff --git a/audio/xcdplayer/patches/patch-al b/audio/xcdplayer/patches/patch-al index fe6cbb2797c..6b2def2d532 100644 --- a/audio/xcdplayer/patches/patch-al +++ b/audio/xcdplayer/patches/patch-al @@ -1,10 +1,12 @@ -$NetBSD: patch-al,v 1.5 2011/09/04 22:05:39 dholland Exp $ +$NetBSD: patch-al,v 1.5.6.1 2012/06/06 11:47:54 tron Exp $ - needs stdlib.h - needs time.h -- use malloc properly - support BSD cdrom interface - use the right debug on/off flag +- don't use own declarations of standard functions +- use malloc() properly +- call time() correctly --- shuffle.c.orig 1993-01-12 18:59:38.000000000 +0000 +++ shuffle.c @@ -23,7 +25,7 @@ $NetBSD: patch-al,v 1.5 2011/09/04 22:05:39 dholland Exp $ #ifdef sun # include "cdrom_sun.h" #endif -@@ -29,9 +34,10 @@ +@@ -29,15 +34,10 @@ static unsigned char *random_tracks; @@ -32,10 +34,16 @@ $NetBSD: patch-al,v 1.5 2011/09/04 22:05:39 dholland Exp $ void shuffle_setup() { - extern char *malloc(); - #ifdef sgi - extern time_t time(time_t *); - #else -@@ -63,7 +69,7 @@ shuffle_setup() { +-#ifdef sgi +- extern time_t time(time_t *); +-#else +- extern long time(); +-#endif +- extern long random(); + unsigned long seed, now; + char state[128]; + int try; +@@ -63,12 +63,12 @@ shuffle_setup() { random_tracks = NULL; } @@ -44,7 +52,13 @@ $NetBSD: patch-al,v 1.5 2011/09/04 22:05:39 dholland Exp $ perror("malloc"); exit(1); } -@@ -97,7 +103,7 @@ shuffle_setup() { + +- now = time((long *) 0); ++ now = time(NULL); + seed = now & 0xfff; + + initstate(seed, state, sizeof(state)); +@@ -97,7 +97,7 @@ shuffle_setup() { random_tracks[i] = try; } |