diff options
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/BasiliskII/Makefile | 7 | ||||
-rw-r--r-- | emulators/BasiliskII/distinfo | 20 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ab | 6 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-af | 34 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ag | 6 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ah | 6 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ai | 8 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-aj | 6 |
8 files changed, 46 insertions, 47 deletions
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index f0c2d3ebe63..b4a0107a64e 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/05/13 20:52:35 adam Exp $ -DISTNAME= BasiliskII_src_22112005 -PKGNAME= BasiliskII-1.0.20051122 -PKGREVISION= 1 +DISTNAME= BasiliskII_src_01052006 +PKGNAME= BasiliskII-1.0.20060501 CATEGORIES= emulators MASTER_SITES= http://www.gibix.net/projects/basilisk2/files/ EXTRACT_SUFX= .tar.bz2 diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo index 347d9d64281..069a0cee376 100644 --- a/emulators/BasiliskII/distinfo +++ b/emulators/BasiliskII/distinfo @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.13 2005/12/15 02:56:58 dogcow Exp $ +$NetBSD: distinfo,v 1.14 2006/05/13 20:52:35 adam Exp $ -SHA1 (BasiliskII_src_22112005.tar.bz2) = f3ca02d2d2894bee3fbf056c65da514febe35008 -RMD160 (BasiliskII_src_22112005.tar.bz2) = e33dfa18a6280945d4395ddf093fe5f4900efa60 -Size (BasiliskII_src_22112005.tar.bz2) = 1286256 bytes +SHA1 (BasiliskII_src_01052006.tar.bz2) = 6373b33adf6caec53c5d1ed46a00adcac89ad3bb +RMD160 (BasiliskII_src_01052006.tar.bz2) = bb1a061c504bd7d28b869e0eec2806cf8a79cf8d +Size (BasiliskII_src_01052006.tar.bz2) = 1310908 bytes SHA1 (patch-aa) = 387f7a3f6edac21b99d81ba88a0eeed4591c75ef -SHA1 (patch-ab) = 8fec4c8e42a1675e4cd79949e023030e6f3b824d +SHA1 (patch-ab) = 4ada93db64772e70e95c58b6a324019c1da6a72d SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15 SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6 SHA1 (patch-ae) = dcac9287614535fa72fe9c8b0e3c516575e40887 -SHA1 (patch-af) = 18cabe158042803031f50a4a2fcad03abac4148d -SHA1 (patch-ag) = 9570fe9a7103b7eecdf24db1e6a20840851e7258 -SHA1 (patch-ah) = 880b59812c983a03d39267e7ba5e9ff1995020b6 -SHA1 (patch-ai) = 965e0d467cd3a5ec14d393191462011f4159be68 -SHA1 (patch-aj) = 2abdbb5d9237f23a09df732e7509c4342af5b648 +SHA1 (patch-af) = 2087a41aeda1fcab49408428decf1e5082fc8896 +SHA1 (patch-ag) = 079a62bc2e193fe4a8de1862c1e5334ee657ecf4 +SHA1 (patch-ah) = 0f67eed6f59e6c381c1a6fbeb98261cad4697760 +SHA1 (patch-ai) = fc527be478576f157bffbd6a91eb1bdc85903fb1 +SHA1 (patch-aj) = c331aa7080b330cf58f58c72456b91b0e5a2156f SHA1 (patch-ak) = 1dad263b22ae3257a6e34b90972ba264ada7b287 diff --git a/emulators/BasiliskII/patches/patch-ab b/emulators/BasiliskII/patches/patch-ab index dcebb2a61fd..e001cf353a5 100644 --- a/emulators/BasiliskII/patches/patch-ab +++ b/emulators/BasiliskII/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2005/11/23 12:17:56 adam Exp $ +$NetBSD: patch-ab,v 1.5 2006/05/13 20:52:35 adam Exp $ ---- src/Unix/video_x.cpp.orig 2005-06-11 08:52:22.000000000 +0200 +--- src/Unix/video_x.cpp.orig 2006-01-03 23:03:27.000000000 +0100 +++ src/Unix/video_x.cpp -@@ -2315,7 +2315,7 @@ static void update_display_dynamic(int t +@@ -2326,7 +2326,7 @@ static void update_display_dynamic(int t static void update_display_static(driver_window *drv) { // Incremental update code diff --git a/emulators/BasiliskII/patches/patch-af b/emulators/BasiliskII/patches/patch-af index a23c299a819..ab3ed4920ec 100644 --- a/emulators/BasiliskII/patches/patch-af +++ b/emulators/BasiliskII/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ +$NetBSD: patch-af,v 1.3 2006/05/13 20:52:35 adam Exp $ ---- src/Unix/sys_unix.cpp.orig 2005-08-01 07:23:02.000000000 +0200 +--- src/Unix/sys_unix.cpp.orig 2005-11-24 18:23:43.000000000 +0100 +++ src/Unix/sys_unix.cpp @@ -37,7 +37,7 @@ #include <dirent.h> @@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ struct ioc_capability cdrom_cap; #elif defined(__APPLE__) && defined(__MACH__) char *ioctl_name; // For CDs on OS X - a device for special ioctls -@@ -222,7 +222,7 @@ void SysAddCDROMPrefs(void) +@@ -220,7 +220,7 @@ void SysAddCDROMPrefs(void) // Until I can convince the other guys that my Darwin code is useful, // we just do nothing (it is safe to have no cdrom device) #endif @@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ PrefsAddString("cdrom", "/dev/cd0c"); #endif } -@@ -242,7 +242,7 @@ void SysAddSerialPrefs(void) +@@ -240,7 +240,7 @@ void SysAddSerialPrefs(void) PrefsAddString("seriala", "/dev/tts/0"); PrefsAddString("serialb", "/dev/tts/1"); } @@ -38,7 +38,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ PrefsAddString("seriala", "/dev/cuaa0"); PrefsAddString("serialb", "/dev/cuaa1"); #elif defined(__NetBSD__) -@@ -304,7 +304,7 @@ static bool is_drive_mounted(const char +@@ -302,7 +302,7 @@ static bool is_drive_mounted(const char void *Sys_open(const char *name, bool read_only) { bool is_file = strncmp(name, "/dev/", 5) != 0; @@ -47,7 +47,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ // SCSI IDE bool is_cdrom = strncmp(name, "/dev/cd", 7) == 0 || strncmp(name, "/dev/acd", 8) == 0; #else -@@ -352,7 +352,7 @@ void *Sys_open(const char *name, bool re +@@ -351,7 +351,7 @@ void *Sys_open(const char *name, bool re } // Open file/device @@ -56,7 +56,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ int fd = open(name, (read_only ? O_RDONLY : O_RDWR) | (is_cdrom ? O_NONBLOCK : 0)); #else int fd = open(name, read_only ? O_RDONLY : O_RDWR); -@@ -395,7 +395,7 @@ void *Sys_open(const char *name, bool re +@@ -394,7 +394,7 @@ void *Sys_open(const char *name, bool re #else fh->cdrom_cap = 0; #endif @@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ fh->is_floppy = ((st.st_rdev >> 16) == 2); #ifdef CDIOCCAPABILITY if (is_cdrom) { -@@ -555,7 +555,7 @@ void SysEject(void *arg) +@@ -557,7 +557,7 @@ void SysEject(void *arg) close(fh->fd); // Close and reopen so the driver will see the media change fh->fd = open(fh->name, O_RDONLY | O_NONBLOCK); } @@ -74,7 +74,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ if (fh->is_floppy) { fsync(fh->fd); } else if (fh->is_cdrom) { -@@ -692,7 +692,7 @@ bool SysIsDiskInserted(void *arg) +@@ -697,7 +697,7 @@ bool SysIsDiskInserted(void *arg) #endif cdrom_tochdr header; return ioctl(fh->fd, CDROMREADTOCHDR, &header) == 0; @@ -83,7 +83,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ } else if (fh->is_floppy) { return false; //!! } else if (fh->is_cdrom) { -@@ -800,7 +800,7 @@ bool SysCDReadTOC(void *arg, uint8 *toc) +@@ -805,7 +805,7 @@ bool SysCDReadTOC(void *arg, uint8 *toc) extern bool DarwinCDReadTOC(char *name, uint8 *toc); return DarwinCDReadTOC(fh->name, toc); @@ -92,7 +92,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ uint8 *p = toc + 2; // Header -@@ -911,7 +911,7 @@ bool SysCDGetPosition(void *arg, uint8 * +@@ -916,7 +916,7 @@ bool SysCDGetPosition(void *arg, uint8 * *pos++ = chan.cdsc_reladdr.msf.second; *pos++ = chan.cdsc_reladdr.msf.frame; return true; @@ -101,7 +101,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ struct ioc_read_subchannel chan; chan.data_format = CD_MSF_FORMAT; chan.address_format = CD_MSF_FORMAT; -@@ -963,7 +963,7 @@ bool SysCDPlay(void *arg, uint8 start_m, +@@ -968,7 +968,7 @@ bool SysCDPlay(void *arg, uint8 start_m, play.cdmsf_sec1 = end_s; play.cdmsf_frame1 = end_f; return ioctl(fh->fd, CDROMPLAYMSF, &play) == 0; @@ -110,7 +110,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ struct ioc_play_msf play; play.start_m = start_m; play.start_s = start_s; -@@ -993,7 +993,7 @@ bool SysCDPause(void *arg) +@@ -998,7 +998,7 @@ bool SysCDPause(void *arg) if (fh->is_cdrom) { #if defined(__linux__) return ioctl(fh->fd, CDROMPAUSE) == 0; @@ -119,7 +119,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ return ioctl(fh->fd, CDIOCPAUSE) == 0; #else return false; -@@ -1016,7 +1016,7 @@ bool SysCDResume(void *arg) +@@ -1021,7 +1021,7 @@ bool SysCDResume(void *arg) if (fh->is_cdrom) { #if defined(__linux__) return ioctl(fh->fd, CDROMRESUME) == 0; @@ -128,7 +128,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ return ioctl(fh->fd, CDIOCRESUME) == 0; #else return false; -@@ -1039,7 +1039,7 @@ bool SysCDStop(void *arg, uint8 lead_out +@@ -1044,7 +1044,7 @@ bool SysCDStop(void *arg, uint8 lead_out if (fh->is_cdrom) { #if defined(__linux__) return ioctl(fh->fd, CDROMSTOP) == 0; @@ -137,7 +137,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ return ioctl(fh->fd, CDIOCSTOP) == 0; #else return false; -@@ -1080,7 +1080,7 @@ void SysCDSetVolume(void *arg, uint8 lef +@@ -1085,7 +1085,7 @@ void SysCDSetVolume(void *arg, uint8 lef vol.channel0 = vol.channel2 = left; vol.channel1 = vol.channel3 = right; ioctl(fh->fd, CDROMVOLCTRL, &vol); @@ -146,7 +146,7 @@ $NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ struct ioc_vol vol; vol.vol[0] = vol.vol[2] = left; vol.vol[1] = vol.vol[3] = right; -@@ -1107,7 +1107,7 @@ void SysCDGetVolume(void *arg, uint8 &le +@@ -1112,7 +1112,7 @@ void SysCDGetVolume(void *arg, uint8 &le ioctl(fh->fd, CDROMVOLREAD, &vol); left = vol.channel0; right = vol.channel1; diff --git a/emulators/BasiliskII/patches/patch-ag b/emulators/BasiliskII/patches/patch-ag index d247631d9c9..36c2992430d 100644 --- a/emulators/BasiliskII/patches/patch-ag +++ b/emulators/BasiliskII/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.2 2005/11/23 12:17:56 adam Exp $ +$NetBSD: patch-ag,v 1.3 2006/05/13 20:52:35 adam Exp $ ---- src/Unix/sigsegv.cpp.orig 2005-06-12 23:47:46.000000000 +0200 +--- src/Unix/sigsegv.cpp.orig 2006-03-31 00:45:49.000000000 +0200 +++ src/Unix/sigsegv.cpp @@ -226,7 +226,7 @@ static void powerpc_decode_instruction(i @@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.2 2005/11/23 12:17:56 adam Exp $ #if (defined(i386) || defined(__i386__)) #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGBUS) #define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp, char *addr -@@ -714,7 +714,7 @@ enum { +@@ -721,7 +721,7 @@ enum { #endif }; #endif diff --git a/emulators/BasiliskII/patches/patch-ah b/emulators/BasiliskII/patches/patch-ah index 6fd49dcc538..7187523367d 100644 --- a/emulators/BasiliskII/patches/patch-ah +++ b/emulators/BasiliskII/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2005/11/17 16:56:39 joerg Exp $ +$NetBSD: patch-ah,v 1.2 2006/05/13 20:52:35 adam Exp $ ---- src/Unix/serial_unix.cpp.orig 2005-11-17 14:28:47.000000000 +0000 +--- src/Unix/serial_unix.cpp.orig 2005-12-04 16:03:11.000000000 +0100 +++ src/Unix/serial_unix.cpp -@@ -201,7 +201,7 @@ int16 XSERDPort::open(uint16 config) +@@ -212,7 +212,7 @@ int16 XSERDPort::open(uint16 config) if (fstat(fd, &st) == 0) if (S_ISCHR(st.st_mode)) protocol = ((MAJOR(st.st_rdev) == LP_MAJOR) ? parallel : serial); diff --git a/emulators/BasiliskII/patches/patch-ai b/emulators/BasiliskII/patches/patch-ai index 712162f0f28..4906191bddb 100644 --- a/emulators/BasiliskII/patches/patch-ai +++ b/emulators/BasiliskII/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.2 2005/11/23 12:17:56 adam Exp $ +$NetBSD: patch-ai,v 1.3 2006/05/13 20:52:35 adam Exp $ ---- src/Unix/prefs_editor_gtk.cpp.orig 2005-11-22 22:53:24.000000000 +0100 +--- src/Unix/prefs_editor_gtk.cpp.orig 2006-04-30 23:16:48.000000000 +0200 +++ src/Unix/prefs_editor_gtk.cpp -@@ -1259,7 +1259,7 @@ static GList *add_serial_names(void) +@@ -1283,7 +1283,7 @@ static GList *add_serial_names(void) while ((de = readdir(d)) != NULL) { #if defined(__linux__) if (strncmp(de->d_name, "ttyS", 4) == 0 || strncmp(de->d_name, "lp", 2) == 0) { @@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.2 2005/11/23 12:17:56 adam Exp $ if (strncmp(de->d_name, "cuaa", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { #elif defined(__NetBSD__) if (strncmp(de->d_name, "tty0", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { -@@ -1298,7 +1298,7 @@ static GList *add_ether_names(void) +@@ -1322,7 +1322,7 @@ static GList *add_ether_names(void) struct ifreq req, *ifr = ifc.ifc_req; for (int i=0; i<ifc.ifc_len; i+=sizeof(ifreq), ifr++) { req = *ifr; diff --git a/emulators/BasiliskII/patches/patch-aj b/emulators/BasiliskII/patches/patch-aj index e6580a10421..e6c8a47136f 100644 --- a/emulators/BasiliskII/patches/patch-aj +++ b/emulators/BasiliskII/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2005/11/23 12:17:56 adam Exp $ +$NetBSD: patch-aj,v 1.3 2006/05/13 20:52:35 adam Exp $ ---- src/Unix/ether_unix.cpp.orig 2005-07-03 10:21:32.000000000 +0200 +--- src/Unix/ether_unix.cpp.orig 2006-04-02 23:06:50.000000000 +0200 +++ src/Unix/ether_unix.cpp -@@ -33,7 +33,7 @@ +@@ -49,7 +49,7 @@ #include <stdio.h> #include <map> |