diff options
-rw-r--r-- | emulators/BasiliskII/Makefile | 16 | ||||
-rw-r--r-- | emulators/BasiliskII/distinfo | 8 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-aa | 14 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ab | 13 |
4 files changed, 39 insertions, 12 deletions
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index e6b817090f8..42591ce34a4 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,20 +1,21 @@ -# $NetBSD: Makefile,v 1.9 2003/06/13 20:56:48 tron Exp $ +# $NetBSD: Makefile,v 1.10 2003/06/14 06:49:04 tron Exp $ -DISTNAME= BasiliskII_src_15012002 -PKGNAME= BasiliskII-1.0 +DISTNAME= BasiliskII_src_14032003 +PKGNAME= BasiliskII-1.0.20030314 WRKSRC= ${WRKDIR}/BasiliskII-1.0/src/Unix CATEGORIES= emulators -MASTER_SITES= http://iphcip1.physik.uni-mainz.de/~cbauer/ +MASTER_SITES= http://gwenole.beauchesne.online.fr/basilisk2/files/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg@netbsd.org -HOMEPAGE= http://www.uni-mainz.de/~bauec002/B2Main.html +HOMEPAGE= http://gwenole.beauchesne.online.fr/basilisk2/ COMMENT= Open Source 68k Macintosh emulator USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_X11= yes -PTHREAD_OPTS+= require +CONFIGURE_ARGS+=--without-gtk --without-esd --disable-fbdev-dga --without-mon post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII @@ -22,7 +23,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/../../TECH ${PREFIX}/share/doc/BasiliskII/ ${INSTALL_DATA} ${WRKSRC}/../../TODO ${PREFIX}/share/doc/BasiliskII/ -.include "../../audio/esound/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo index f2bdf405ee4..d980671f574 100644 --- a/emulators/BasiliskII/distinfo +++ b/emulators/BasiliskII/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.2 2003/06/13 20:56:48 tron Exp $ +$NetBSD: distinfo,v 1.3 2003/06/14 06:49:04 tron Exp $ -SHA1 (BasiliskII_src_15012002.tar.gz) = 5a28bb37a48f7ae5c24cb5ad5eceb282147cebe4 -Size (BasiliskII_src_15012002.tar.gz) = 494773 bytes +SHA1 (BasiliskII_src_14032003.tar.bz2) = 935e00e1401fc5dfaad7ac7d54184265bab0aeb8 +Size (BasiliskII_src_14032003.tar.bz2) = 649594 bytes +SHA1 (patch-aa) = e41d9a3a932bb312e2ea35372c4e46a45f0fcae9 +SHA1 (patch-ab) = 17c94164ece847bd5695e8fb79ff5132c3c53859 diff --git a/emulators/BasiliskII/patches/patch-aa b/emulators/BasiliskII/patches/patch-aa new file mode 100644 index 00000000000..d404a6f97a1 --- /dev/null +++ b/emulators/BasiliskII/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1 2003/06/14 06:49:05 tron Exp $ + +--- main_unix.cpp.orig Thu Jun 12 22:53:57 2003 ++++ main_unix.cpp +@@ -615,7 +615,9 @@ int main(int argc, char **argv) + + // Start 60Hz timer + sigemptyset(&timer_sa.sa_mask); // Block virtual 68k interrupts during SIGARLM handling ++#if !EMULATED_68K + sigaddset(&timer_sa.sa_mask, SIG_IRQ); ++#endif + timer_sa.sa_handler = one_tick; + timer_sa.sa_flags = SA_ONSTACK | SA_RESTART; + if (sigaction(SIGALRM, &timer_sa, NULL) < 0) { diff --git a/emulators/BasiliskII/patches/patch-ab b/emulators/BasiliskII/patches/patch-ab new file mode 100644 index 00000000000..6ef710154d3 --- /dev/null +++ b/emulators/BasiliskII/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/06/14 06:49:05 tron Exp $ + +--- video_x.cpp.orig Thu Jun 12 23:38:31 2003 ++++ video_x.cpp +@@ -2226,7 +2226,7 @@ static void update_display_dynamic(int t + static void update_display_static(driver_window *drv) + { + // Incremental update code +- unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j; ++ int wide = 0, high = 0, x1, x2, y1, y2, i, j; + const video_mode &mode = drv->monitor.get_current_mode(); + int bytes_per_row = mode.bytes_per_row; + int bytes_per_pixel = mode.bytes_per_row / mode.x; |