CVS commit: pkgsrc/emulators/BasiliskII

["Nathanial Sloss" <nat%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nat
Date:           Thu Jan 14 02:47:39 UTC 2021

Modified Files:
        pkgsrc/emulators/BasiliskII: Makefile distinfo
Added Files:
        pkgsrc/emulators/BasiliskII/patches:
            patch-src_CrossPlatform_vm__alloc.cpp
            patch-src_Unix_prefs__unix.cpp patch-src_Unix_sysdeps.h

Log Message:
Fix package for NetBSD.

Use the correct memory/timer options to make this package work on NetBSD.
Use the correct defaults for NetBSD audio devices.

Bump PKG_REVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/emulators/BasiliskII/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/BasiliskII/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/BasiliskII/patches/patch-src_CrossPlatform_vm__alloc.cpp \
    pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_prefs__unix.cpp \
    pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_sysdeps.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/BasiliskII/Makefile
diff -u pkgsrc/emulators/BasiliskII/Makefile:1.47 pkgsrc/emulators/BasiliskII/Makefile:1.48
--- pkgsrc/emulators/BasiliskII/Makefile:1.47   Mon Aug 17 20:18:37 2020
+++ pkgsrc/emulators/BasiliskII/Makefile        Thu Jan 14 02:47:39 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2020/08/17 20:18:37 leot Exp $
+# $NetBSD: Makefile,v 1.48 2021/01/14 02:47:39 nat Exp $
 
 DISTNAME=      BasiliskII-20190405
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=cebix/}
 GITHUB_PROJECT=        macemu

Index: pkgsrc/emulators/BasiliskII/distinfo
diff -u pkgsrc/emulators/BasiliskII/distinfo:1.20 pkgsrc/emulators/BasiliskII/distinfo:1.21
--- pkgsrc/emulators/BasiliskII/distinfo:1.20   Tue Jul 30 08:08:22 2019
+++ pkgsrc/emulators/BasiliskII/distinfo        Thu Jan 14 02:47:39 2021
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.20 2019/07/30 08:08:22 nia Exp $
+$NetBSD: distinfo,v 1.21 2021/01/14 02:47:39 nat Exp $
 
 SHA1 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = b83f76e9b37318b6bc4e43e73db0d2ed00fc2981
 RMD160 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 1c16c477fd1e2980ceb4e172d896fb2da4d9580b
 SHA512 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 
82a7720c369489d8a27f175550973a72fa77c76553e38734fb2efef6ecf29a2a1c195797d4d487b1e6cca0f21f778a640d69c2686af6ae1687e3e8234dbf7245
 Size (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 2198906 bytes
 SHA1 (patch-ad) = 1d8bc61f6386855c6d83ff4e5a13f55d5e22325a
+SHA1 (patch-src_CrossPlatform_vm__alloc.cpp) = 78482a371a7fbbd4d20b800a361688c4f44d78df
+SHA1 (patch-src_Unix_prefs__unix.cpp) = a47e0889b23a2a574a0a90f23b6e4b2016f4fc90
+SHA1 (patch-src_Unix_sysdeps.h) = ea1e175ee81b1fd4f67163e9008088568de263f5

Added files:

Index: pkgsrc/emulators/BasiliskII/patches/patch-src_CrossPlatform_vm__alloc.cpp
diff -u /dev/null pkgsrc/emulators/BasiliskII/patches/patch-src_CrossPlatform_vm__alloc.cpp:1.1
--- /dev/null   Thu Jan 14 02:47:39 2021
+++ pkgsrc/emulators/BasiliskII/patches/patch-src_CrossPlatform_vm__alloc.cpp   Thu Jan 14 02:47:39 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_CrossPlatform_vm__alloc.cpp,v 1.1 2021/01/14 02:47:39 nat Exp $
+
+Fix "Not enough memory" error on startup on NetBSD.
+
+--- src/CrossPlatform/vm_alloc.cpp.orig        2019-04-05 05:12:49.000000000 +0000
++++ src/CrossPlatform/vm_alloc.cpp
+@@ -86,7 +86,7 @@ typedef unsigned long vm_uintptr_t;
+ #define MAP_EXTRA_FLAGS (MAP_32BIT)
+ 
+ #ifdef HAVE_MMAP_VM
+-#if (defined(__linux__) && defined(__i386__)) || defined(__FreeBSD__) || HAVE_LINKER_SCRIPT
++#if (defined(__linux__) && defined(__i386__)) || defined(__NetBSD__) || defined(__FreeBSD__) || HAVE_LINKER_SCRIPT
+ /* Force a reasonnable address below 0x80000000 on x86 so that we
+    don't get addresses above when the program is run on AMD64.
+    NOTE: this is empirically determined on Linux/x86.  */
Index: pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_prefs__unix.cpp
diff -u /dev/null pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_prefs__unix.cpp:1.1
--- /dev/null   Thu Jan 14 02:47:39 2021
+++ pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_prefs__unix.cpp  Thu Jan 14 02:47:39 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Unix_prefs__unix.cpp,v 1.1 2021/01/14 02:47:39 nat Exp $
+
+Use correct audio device on NetBSD.
+--- src/Unix/prefs_unix.cpp.orig       2019-04-05 05:12:49.000000000 +0000
++++ src/Unix/prefs_unix.cpp
+@@ -131,6 +131,9 @@ void AddPlatformPrefsDefaults(void)
+       } else {
+               PrefsReplaceString("mixer", "/dev/mixer");
+       }
++#elif defined (__NetBSD__)
++      PrefsReplaceString("dsp", "/dev/audio");
++      PrefsReplaceString("mixer", "/dev/mixer");
+ #else
+       PrefsReplaceString("dsp", "/dev/dsp");
+       PrefsReplaceString("mixer", "/dev/mixer");
Index: pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_sysdeps.h
diff -u /dev/null pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_sysdeps.h:1.1
--- /dev/null   Thu Jan 14 02:47:39 2021
+++ pkgsrc/emulators/BasiliskII/patches/patch-src_Unix_sysdeps.h        Thu Jan 14 02:47:39 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_Unix_sysdeps.h,v 1.1 2021/01/14 02:47:39 nat Exp $
+
+This makes the idlewait option when NetBSD is emulating a 68k work again.
+
+--- src/Unix/sysdeps.h.orig    2019-04-05 05:12:49.000000000 +0000
++++ src/Unix/sysdeps.h
+@@ -117,11 +117,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