From daf9d563f709ec721702f94b0f1b5d239b629096 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Tue, 16 Jan 2007 11:42:02 +0000
Subject: Added two patches for Solaris.

---
 emulators/dosbox/distinfo         |  4 +++-
 emulators/dosbox/patches/patch-ab | 14 ++++++++++++++
 emulators/dosbox/patches/patch-ac | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 emulators/dosbox/patches/patch-ab
 create mode 100644 emulators/dosbox/patches/patch-ac

(limited to 'emulators/dosbox')

diff --git a/emulators/dosbox/distinfo b/emulators/dosbox/distinfo
index dc5f474148e..1e78cfafd67 100644
--- a/emulators/dosbox/distinfo
+++ b/emulators/dosbox/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/03/30 18:11:30 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2007/01/16 11:42:02 rillig Exp $
 
 SHA1 (dosbox-0.65.tar.gz) = 4e9b65c9c2091ab30a952e3b7e63b74df605f419
 RMD160 (dosbox-0.65.tar.gz) = 1d05002ae0ddcac74071180d0fa81aba3092e6f1
 Size (dosbox-0.65.tar.gz) = 848989 bytes
 SHA1 (patch-aa) = 3393501f0d438e53a55481dc0e237c2bb2a75d3e
+SHA1 (patch-ab) = c4555ed9e6337380f52f271025d8f55ed7602aa6
+SHA1 (patch-ac) = 84c2a3173a483ccb62917da0b48fd2083963a13b
diff --git a/emulators/dosbox/patches/patch-ab b/emulators/dosbox/patches/patch-ab
new file mode 100644
index 00000000000..c9d7a1ae7ac
--- /dev/null
+++ b/emulators/dosbox/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2007/01/16 11:42:02 rillig Exp $
+
+--- src/hardware/mpu401.cpp.orig	2006-03-19 13:30:46.000000000 +0100
++++ src/hardware/mpu401.cpp	2007-01-10 01:38:43.568613836 +0100
+@@ -26,6 +26,9 @@
+ #include "cpu.h"
+ #include "support.h"
+ 
++#undef OVERFLOW			/* Solaris 10, /usr/include/math.h */
++#undef XXXXXMARK		/* Solaris 10, /usr/include/prof.h */
++
+ void MIDI_RawOutByte(Bit8u data);
+ bool MIDI_Available(void);
+ 
diff --git a/emulators/dosbox/patches/patch-ac b/emulators/dosbox/patches/patch-ac
new file mode 100644
index 00000000000..1735fd7fcfa
--- /dev/null
+++ b/emulators/dosbox/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.1 2007/01/16 11:42:02 rillig Exp $
+
+--- src/ints/xms.cpp.orig	2006-02-09 13:32:57.000000000 +0100
++++ src/ints/xms.cpp	2007-01-10 01:41:09.543795112 +0100
+@@ -75,7 +75,9 @@ struct XMS_Block {
+ 	bool	free;
+ };
+ 
++#if !defined(__SUNPRO_CC)
+ #pragma pack (push,1)
++#endif
+ struct XMS_MemMove{
+ 	Bit32u length;
+ 	Bit16u src_handle;
+@@ -90,7 +92,9 @@ struct XMS_MemMove{
+ 	} dest;
+ 
+ } GCC_ATTRIBUTE(packed);
++#if !defined(__SUNPRO_CC)
+ #pragma pack (pop)
++#endif
+ 
+ Bitu XMS_EnableA20(bool enable)
+ {
-- 
cgit v1.2.3