From ae9d917d5e8a902a2194135b3ed5d5272588c31b Mon Sep 17 00:00:00 2001 From: robxnano <89391914+robxnano@users.noreply.github.com> Date: Tue, 11 Oct 2022 17:27:24 +0100 Subject: [PATCH] Apply NetBSD pkgsrc patches Patches obtained from https://github.com/NetBSD/pkgsrc/blob/trunk/emulators/BasiliskII/ --- BasiliskII/src/Unix/prefs_unix.cpp | 3 +++ BasiliskII/src/Unix/sysdeps.h | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/BasiliskII/src/Unix/prefs_unix.cpp b/BasiliskII/src/Unix/prefs_unix.cpp index 11c52b24..a9daba85 100644 --- a/BasiliskII/src/Unix/prefs_unix.cpp +++ b/BasiliskII/src/Unix/prefs_unix.cpp @@ -278,6 +278,9 @@ void AddPlatformPrefsDefaults(void) { PrefsReplaceString("mixer", "/dev/mixer"); } +#elif defined (__NetBSD__) + PrefsReplaceString("dsp", "/dev/audio"); + PrefsReplaceString("mixer", "/dev/mixer"); #else PrefsReplaceString("dsp", "/dev/dsp"); PrefsReplaceString("mixer", "/dev/mixer"); diff --git a/BasiliskII/src/Unix/sysdeps.h b/BasiliskII/src/Unix/sysdeps.h index d1e25229..a4a7ed97 100644 --- a/BasiliskII/src/Unix/sysdeps.h +++ b/BasiliskII/src/Unix/sysdeps.h @@ -122,11 +122,6 @@ #ifdef HAVE_PTHREADS #define USE_PTHREADS_SERVICES #endif -#if EMULATED_68K -#if defined(__NetBSD__) -#define USE_CPU_EMUL_SERVICES -#endif -#endif #ifdef USE_CPU_EMUL_SERVICES #undef USE_PTHREADS_SERVICES #endif