[pkgsrc/trunk]: pkgsrc/emulators/sdlmess Fix build on NetBSD-current.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/064acf16efa3
branches:  trunk
changeset: 398519:064acf16efa3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Sep 01 15:45:44 2009 +0000

description:
Fix build on NetBSD-current.

diffstat:

 emulators/sdlmess/distinfo         |   4 ++-
 emulators/sdlmess/patches/patch-ac |  23 +++++++++++++++++
 emulators/sdlmess/patches/patch-ad |  49 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletions(-)

diffs (96 lines):

diff -r b9f5e20dae00 -r 064acf16efa3 emulators/sdlmess/distinfo
--- a/emulators/sdlmess/distinfo        Tue Sep 01 15:27:39 2009 +0000
+++ b/emulators/sdlmess/distinfo        Tue Sep 01 15:45:44 2009 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.6 2009/08/15 17:23:59 wiz Exp $
+$NetBSD: distinfo,v 1.7 2009/09/01 15:45:44 wiz Exp $
 
 SHA1 (sdlmess0133.zip) = dad382e9fc79e1a654e239dadb23b1c06dae685b
 RMD160 (sdlmess0133.zip) = bf06910fc4fd9c4295d5722fcdb2cb1a16034edf
 Size (sdlmess0133.zip) = 32501988 bytes
 SHA1 (patch-aa) = 11e1ae9c7d184d34c90b9f05ecbe8fa2dfd6b181
 SHA1 (patch-ab) = a7471766661974f7f092bede9d37d18a48d8499c
+SHA1 (patch-ac) = 32503c6dcdeb9a0d082375a11f0e23bac53410db
+SHA1 (patch-ad) = b12160915cad1d0a8a0ee784553b1b9f207d069b
 SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38
 SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da
diff -r b9f5e20dae00 -r 064acf16efa3 emulators/sdlmess/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/sdlmess/patches/patch-ac        Tue Sep 01 15:45:44 2009 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2009/09/01 15:45:44 wiz Exp $
+
+--- src/emu/mamecore.h.orig    2009-07-20 12:03:21.000000000 +0000
++++ src/emu/mamecore.h
+@@ -333,6 +333,10 @@ DECL_NORETURN void CLIB_DECL fatalerror_
+     INLINE FUNCTIONS
+ ***************************************************************************/
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++#if !defined(__NetBSD__) || (__NetBSD_Version__ < 599001500)
+ /* population count */
+ INLINE int popcount(UINT32 val)
+ {
+@@ -342,6 +346,7 @@ INLINE int popcount(UINT32 val)
+               val &= val - 1;
+       return count;
+ }
++#endif
+ 
+ 
+ /* convert a series of 32 bits into a float */
diff -r b9f5e20dae00 -r 064acf16efa3 emulators/sdlmess/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/sdlmess/patches/patch-ad        Tue Sep 01 15:45:44 2009 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-ad,v 1.1 2009/09/01 15:45:44 wiz Exp $
+
+--- src/mame/machine/n64.c.orig        2009-07-20 12:03:20.000000000 +0000
++++ src/mame/machine/n64.c
+@@ -1065,7 +1065,7 @@ static UINT8 pif_ram[0x40];
+ static UINT8 pif_cmd[0x40];
+ static UINT32 si_dram_addr = 0;
+ static UINT32 si_pif_addr = 0;
+-static UINT32 si_status = 0;
++static UINT32 mame_si_status = 0;
+ 
+ static UINT8 eeprom[512];
+ static UINT8 mempack[0x8000];
+@@ -1475,7 +1475,7 @@ static void pif_dma(running_machine *mac
+               }
+       }
+ 
+-      si_status |= 0x1000;
++      mame_si_status |= 0x1000;
+       signal_rcp_interrupt(machine, SI_INTERRUPT);
+ }
+ 
+@@ -1487,7 +1487,7 @@ READ32_HANDLER( n64_si_reg_r )
+                       return si_dram_addr;
+ 
+               case 0x18/4:            // SI_STATUS_REG
+-                      return si_status;
++                      return mame_si_status;
+       }
+       return 0;
+ }
+@@ -1514,7 +1514,7 @@ WRITE32_HANDLER( n64_si_reg_w )
+                       break;
+ 
+               case 0x18/4:            // SI_STATUS_REG
+-                      si_status &= ~0x1000;
++                      mame_si_status &= ~0x1000;
+                       clear_rcp_interrupt(space->machine, SI_INTERRUPT);
+                       break;
+ 
+@@ -1624,7 +1624,7 @@ MACHINE_RESET( n64 )
+       memset(pif_cmd, 0, sizeof(pif_cmd));
+       si_dram_addr = 0;
+       si_pif_addr = 0;
+-      si_status = 0;
++      mame_si_status = 0;
+ 
+       memset(eeprom, 0, sizeof(eeprom));
+       memset(mempack, 0, sizeof(mempack));