From d0896f7e9e5556caca2badfa9fcce0b7ccdcd683 Mon Sep 17 00:00:00 2001 From: rohee Date: Fri, 12 Feb 1999 18:48:07 +0000 Subject: [PATCH] And adding new patches --- emulators/wine/patches/patch-aa | 23 +++++++++++++++++++++++ emulators/wine/patches/patch-ab | 29 +++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 emulators/wine/patches/patch-aa create mode 100644 emulators/wine/patches/patch-ab diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa new file mode 100644 index 00000000000..72a22b024c9 --- /dev/null +++ b/emulators/wine/patches/patch-aa @@ -0,0 +1,23 @@ +Do *NOT* submit this patch to Wine developers +NetBSD did it the wrong way, don't make the same mistakes :-) + +--- multimedia/init.c.orig Thu Feb 11 20:22:06 1999 ++++ multimedia/init.c Thu Feb 11 20:27:27 1999 +@@ -36,7 +36,7 @@ + #ifdef HAVE_OSS + int unixToWindowsDeviceType(int type) + { +-#ifndef __NetBSD__ ++#if !defined(__NetBSD__) && !defined(__OpenBSD__) + /* MOD_MIDIPORT output port + * MOD_SYNTH generic internal synth + * MOD_SQSYNTH square wave internal synth +@@ -70,7 +70,7 @@ + */ + BOOL32 MULTIMEDIA_MidiInit(void) + { +-#if defined(HAVE_OSS) && !defined(__NetBSD__) ++#if defined(HAVE_OSS) && !defined(__NetBSD__) && !defined(__OpenBSD__) + int i, status, numsynthdevs = 255, nummididevs = 255; + struct synth_info sinfo; + struct midi_info minfo; diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab new file mode 100644 index 00000000000..9faf688f8aa --- /dev/null +++ b/emulators/wine/patches/patch-ab @@ -0,0 +1,29 @@ +This patch seems to be needed on machine without MIDI support because +midMessage is used in all cases and was not compiled if SNDCTL_MIDI_INFO +was not defined. + +Regards, + +Bruno Rohée + +--- multimedia/midi.c.orig Thu Feb 11 21:52:46 1999 ++++ multimedia/midi.c Thu Feb 11 21:59:31 1999 +@@ -1574,3 +1574,18 @@ + } + + /*-----------------------------------------------------------------------*/ ++ ++/* needed by OpenBSD 2.4, OpenBSD current has MIDI support */ ++ ++#ifndef SNDCTL_MIDI_INFO ++ ++/************************************************************************** ++ * midMessage [sample driver] ++ */ ++DWORD WINAPI midMessage(WORD wDevID, WORD wMsg, DWORD dwUser, ++ DWORD dwParam1, DWORD dwParam2) ++{ ++ return MMSYSERR_NOTSUPPORTED; ++} ++ ++#endif