diff options
| author | dholland <dholland> | 2011-09-12 06:42:12 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-09-12 06:42:12 +0000 |
| commit | 183d1a1142caa2a41da3c97c57e158d3fcc47a69 (patch) | |
| tree | d1e06ac793e01cb9eacd6764f1175cf6cd1e6780 /audio/xcdplayer | |
| parent | 19c114e3bda259529226ee095958c65a41fb714f (diff) | |
| download | pkgsrc-183d1a1142caa2a41da3c97c57e158d3fcc47a69.tar.gz | |
Fix mismatched return statements, which clang dislikes
Diffstat (limited to 'audio/xcdplayer')
| -rw-r--r-- | audio/xcdplayer/distinfo | 4 | ||||
| -rw-r--r-- | audio/xcdplayer/patches/patch-ah | 27 |
2 files changed, 27 insertions, 4 deletions
diff --git a/audio/xcdplayer/distinfo b/audio/xcdplayer/distinfo index e78ab52544f..478b6f5f651 100644 --- a/audio/xcdplayer/distinfo +++ b/audio/xcdplayer/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2011/09/04 22:05:39 dholland Exp $ +$NetBSD: distinfo,v 1.8 2011/09/12 06:50:00 dholland Exp $ SHA1 (xcdplayer-2.2.tar.Z) = e518f2df9fcc5e21e1123fe6f5b1193f232b76ef RMD160 (xcdplayer-2.2.tar.Z) = ba34fe8092aa96d6370320b20fa46b0b0d043176 @@ -10,7 +10,7 @@ SHA1 (patch-ad) = 7a8956993438fe592aa36f6452222b6aa29ca911 SHA1 (patch-ae) = 19d0222e673f41efe2733277062e56991960a9ed SHA1 (patch-af) = 54c96ac87764c222e48e0dcf4267a93cdd966843 SHA1 (patch-ag) = cb787b19c00d8bda99367eb71dc5e234857a4539 -SHA1 (patch-ah) = 1cb1b6cbe95a0b921cd4dc0ac62dadd5d17e0735 +SHA1 (patch-ah) = 51a6170c10456469ba2fc31d4b74993fb053f25a SHA1 (patch-ai) = 1bf094380473d4a88c61378ff6172a90df510541 SHA1 (patch-aj) = da8f0dccc7f0678bf9d2e820008813156ea25182 SHA1 (patch-ak) = 60f93385ab2eb0347a40e5516ec925117ce94b9d diff --git a/audio/xcdplayer/patches/patch-ah b/audio/xcdplayer/patches/patch-ah index 5bbbe22f79f..cbe58e28019 100644 --- a/audio/xcdplayer/patches/patch-ah +++ b/audio/xcdplayer/patches/patch-ah @@ -1,6 +1,11 @@ -$NetBSD: patch-ah,v 1.5 2006/08/12 14:51:39 darcy Exp $ +$NetBSD: patch-ah,v 1.6 2011/09/12 06:50:00 dholland Exp $ ---- internals.c.orig Tue Jan 12 19:59:45 1993 +- support cdrom access on BSDs +- get function decls out of function bodies, which gcc dislikes +- fix mismatched return statements, which clang dislikes +- ...more (?) + +--- internals.c.orig 1993-01-12 18:59:45.000000000 +0000 +++ internals.c @@ -22,6 +22,9 @@ @@ -28,6 +33,24 @@ $NetBSD: patch-ah,v 1.5 2006/08/12 14:51:39 darcy Exp $ int cdrom_get_curtime() { +@@ -46,7 +50,7 @@ cdrom_get_curtime() { + + if (cdrom_open() == -1) { + debug_printf(1, "cdrom_get_curtime: error from cdrom_open\n"); +- return; ++ return 0; + } + + switch (cdrom_status()) { +@@ -54,7 +58,7 @@ cdrom_get_curtime() { + case CDROM_PLAYING: + if (cdrom_get_curmsf(&curmsf) == -1) { + debug_printf(1, "get_curtime: error reading location\n"); +- return; ++ return 0; + } + + if (((curtrack = cdrom_get_curtrack()) == -1) || @@ -76,6 +80,170 @@ cdrom_get_curtime() { } } |