diff options
author | kristerw <kristerw> | 2003-09-21 18:22:14 +0000 |
---|---|---|
committer | kristerw <kristerw> | 2003-09-21 18:22:14 +0000 |
commit | 3b55c6003d6247f0ea58de1c38763060ca790bb4 (patch) | |
tree | 2b7ebac14c6108abdb77972f7895d0d1cbbf3965 | |
parent | 344d21f0d6c8cfebbcde82bef8d567ef0f177b7a (diff) | |
download | pkgsrc-3b55c6003d6247f0ea58de1c38763060ca790bb4.tar.gz |
Make this build with gcc3.3.
From Stefan Kruger in PR 22590.
-rw-r--r-- | emulators/snes9x/distinfo | 6 | ||||
-rw-r--r-- | emulators/snes9x/patches/patch-aa | 9 | ||||
-rw-r--r-- | emulators/snes9x/patches/patch-ag | 36 |
3 files changed, 39 insertions, 12 deletions
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo index e8ce4d236dd..e73e893a7cd 100644 --- a/emulators/snes9x/distinfo +++ b/emulators/snes9x/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.8 2002/12/30 21:40:11 kristerw Exp $ +$NetBSD: distinfo,v 1.9 2003/09/21 18:22:14 kristerw Exp $ SHA1 (s9xs139.zip) = 15acf6d8a31dc51b26a42abf747cec1b72c2aa29 Size (s9xs139.zip) = 666463 bytes -SHA1 (patch-aa) = 20c1d402e26c3e8f49f9d767f02fa3b67cca985c +SHA1 (patch-aa) = 42b0cf5c4a1387ad1c572c1516771b2cd2e979f4 SHA1 (patch-ab) = b99893934074d8693a9609d49e49953ade2b2062 SHA1 (patch-ac) = e54f4fff397dd4ca3be28711fd23c4fbef57ed54 SHA1 (patch-ad) = 72cc9904c74e0668cce450fcada24453aec344e4 SHA1 (patch-ae) = cb2ed8dc3ad409ffb88cb9851b04c6c42c3b2b0e SHA1 (patch-af) = 302967c91a1e0b384c4990687fb11bf236202783 -SHA1 (patch-ag) = 74c74739f4f0f22b76594ba379939df8cfc52188 +SHA1 (patch-ag) = 22959b95af726e773a7386cc43e489fc933e8846 SHA1 (patch-ah) = 60bd35e51faca36fbd8d8d6354487554af17fe7a SHA1 (patch-ai) = 2f522a560577aff89af9efa7a6b129faa99670fd SHA1 (patch-aj) = 71f228195be1381f52b1fe875506abde54fd8396 diff --git a/emulators/snes9x/patches/patch-aa b/emulators/snes9x/patches/patch-aa index 9007069c5d6..73cb35218e0 100644 --- a/emulators/snes9x/patches/patch-aa +++ b/emulators/snes9x/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2002/12/30 21:40:11 kristerw Exp $ +$NetBSD: patch-aa,v 1.10 2003/09/21 18:22:15 kristerw Exp $ --- Makefile.orig Tue Sep 18 08:03:58 2001 -+++ Makefile Mon Dec 30 21:14:12 2002 ++++ Makefile Sun Sep 21 19:48:50 2003 @@ -1,14 +1,14 @@ -ZSNESFX=1 -ZSNESC4=1 @@ -83,10 +83,11 @@ $NetBSD: patch-aa,v 1.9 2002/12/30 21:40:11 kristerw Exp $ -INCLUDES=-I/usr/X11R6/include -I/usr/local/include +INCLUDES=-I${X11BASE}/include +-OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe +ifdef USING_I386 - OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe ++OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pipe +else -+OPTIMISE=-fno-exceptions -Wall -W -pedantic -fomit-frame-pointer ++OPTIMISE=-fno-exceptions -Wall -W -fomit-frame-pointer +endif #OPTIMISE=-g -fno-exceptions diff --git a/emulators/snes9x/patches/patch-ag b/emulators/snes9x/patches/patch-ag index 0d8c77ffe1d..82960c213c9 100644 --- a/emulators/snes9x/patches/patch-ag +++ b/emulators/snes9x/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.4 2002/07/14 07:44:44 kristerw Exp $ ---- unix/unix.cpp.orig Tue Sep 18 08:03:40 2001 -+++ unix/unix.cpp Sun Jul 14 04:09:32 2002 +$NetBSD: patch-ag,v 1.5 2003/09/21 18:22:16 kristerw Exp $ +--- unix/unix.cpp.orig 2001-09-18 06:03:40.000000000 +0000 ++++ unix/unix.cpp 2003-09-21 17:59:18.000000000 +0000 @@ -51,7 +51,7 @@ #include <ctype.h> #include <dirent.h> @@ -140,7 +140,7 @@ $NetBSD: patch-ag,v 1.4 2002/07/14 07:44:44 kristerw Exp $ + size = hid_report_size(rd, hid_input, &report_id); + priv_joy_data[i].offset = (report_id != 0); +#endif -+ if ((priv_joy_data[i].data_buf = malloc(size)) == NULL) ++ if ((priv_joy_data[i].data_buf = (char*)malloc(size)) == NULL) + { + printf("error: couldn't malloc %d bytes\n", size); + hid_dispose_report_desc(rd); @@ -194,7 +194,7 @@ $NetBSD: patch-ag,v 1.4 2002/07/14 07:44:44 kristerw Exp $ + if (interesting_hid) + { + h.next = priv_joy_data[i].hids; -+ priv_joy_data[i].hids = malloc(sizeof *(priv_joy_data[i].hids)); ++ priv_joy_data[i].hids = (struct hid_item *)malloc(sizeof *(priv_joy_data[i].hids)); + if (priv_joy_data[i].hids == NULL) + { + printf("error: Not enough memory for joystick.\n"); @@ -317,6 +317,32 @@ $NetBSD: patch-ag,v 1.4 2002/07/14 07:44:44 kristerw Exp $ #ifdef MMAP_SOUND if (ioctl (so.sound_fd, SNDCTL_DSP_GETCAPS, &J) < 0) +@@ -1485,14 +1719,14 @@ + so.sixteen_bit = TRUE; + + so.stereo = stereo; +- if (ioctl (so.sound_fd, SNDCTL_DSP_STEREO, &so.stereo) < 0) ++ if (ioctl (so.sound_fd, SNDCTL_DSP_STEREO, (void *)&so.stereo) < 0) + { + perror ("ioctl SNDCTL_DSP_STEREO"); + return (FALSE); + } + + so.playback_rate = Rates[mode & 0x07]; +- if (ioctl (so.sound_fd, SNDCTL_DSP_SPEED, &so.playback_rate) < 0) ++ if (ioctl (so.sound_fd, SNDCTL_DSP_SPEED, (void *)&so.playback_rate) < 0) + { + perror ("ioctl SNDCTL_DSP_SPEED"); + return (FALSE); +@@ -1517,7 +1751,7 @@ + perror ("ioctl SNDCTL_DSP_SETFRAGMENT"); + return (FALSE); + } +- ioctl (so.sound_fd, SNDCTL_DSP_GETBLKSIZE, &so.buffer_size); ++ ioctl (so.sound_fd, SNDCTL_DSP_GETBLKSIZE, (void *)&so.buffer_size); + + #ifdef MMAP_SOUND + J = PCM_ENABLE_OUTPUT; @@ -1541,7 +1775,7 @@ } #endif |