diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-05 14:46:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-05 14:46:46 +0000 |
| commit | 28f5da637526244582e096224a864547f6135c21 (patch) | |
| tree | f1d90d4a0e75c312d773ceee88ca6a3bbb5ec321 /audio/xmms-sid | |
| parent | 178ec4820f1c8245484f58345fd172facd5d23af (diff) | |
| download | pkgsrc-28f5da637526244582e096224a864547f6135c21.tar.gz | |
Fix GCC 3.4+: AFormat is a typedef, use it directly with out enum.
Include stddef.h first, at least on DragonFly a C style (void *)0
definition of NULL is pulled in from somewhere otherwise and that
conflicts with the stricter C++ type conversion rules.
Diffstat (limited to 'audio/xmms-sid')
| -rw-r--r-- | audio/xmms-sid/distinfo | 4 | ||||
| -rw-r--r-- | audio/xmms-sid/patches/patch-ab | 12 | ||||
| -rw-r--r-- | audio/xmms-sid/patches/patch-ac | 22 |
3 files changed, 37 insertions, 1 deletions
diff --git a/audio/xmms-sid/distinfo b/audio/xmms-sid/distinfo index 3e7fc8f6221..378b6b84a74 100644 --- a/audio/xmms-sid/distinfo +++ b/audio/xmms-sid/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 20:39:56 agc Exp $ +$NetBSD: distinfo,v 1.7 2006/01/05 14:46:46 joerg Exp $ SHA1 (xmms-sid-0.7.4.tar.gz) = 9ccf412e7c9759ae69ca78dee0895bdb724df9e8 RMD160 (xmms-sid-0.7.4.tar.gz) = e359daf6fd3a7f3d9a40ae9ca8daa2c27ddb6f63 Size (xmms-sid-0.7.4.tar.gz) = 226916 bytes SHA1 (patch-aa) = fb0558110b61f54eab42cd805f9ffb2cdfa2617a +SHA1 (patch-ab) = 772dc1e50401516de9b5a6844dc7c93c2f1fbc2b +SHA1 (patch-ac) = b8cea4e8bf7742dec63143f30141cb48ee946260 diff --git a/audio/xmms-sid/patches/patch-ab b/audio/xmms-sid/patches/patch-ab new file mode 100644 index 00000000000..942a40b3cb1 --- /dev/null +++ b/audio/xmms-sid/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.3 2006/01/05 14:46:46 joerg Exp $ + +--- src/xs_fileinfo.cc.orig 2001-11-18 12:51:25.000000000 +0000 ++++ src/xs_fileinfo.cc +@@ -21,6 +21,7 @@ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <stddef.h> + + #include "xmms-sid.h" + #include <gtk/gtk.h> diff --git a/audio/xmms-sid/patches/patch-ac b/audio/xmms-sid/patches/patch-ac new file mode 100644 index 00000000000..4cae303613c --- /dev/null +++ b/audio/xmms-sid/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2006/01/05 14:46:46 joerg Exp $ + +--- src/xmms-sid.cc.orig 2006-01-05 14:28:57.000000000 +0000 ++++ src/xmms-sid.cc +@@ -21,6 +21,8 @@ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <stddef.h> ++ + #include "xmms-sid.h" + #include <sidplay/player.h> + #include <sidplay/myendian.h> +@@ -196,7 +198,7 @@ static void * xs_play_loop(void *arg) + int fxlen, tn; + struct sidTuneInfo sidInf; + char *name; +- enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8; ++ AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8; + gint chn = xs_emuConf.channels; + + tune->getInfo(sidInf); |