diff options
author | adam <adam> | 2005-11-23 12:17:56 +0000 |
---|---|---|
committer | adam <adam> | 2005-11-23 12:17:56 +0000 |
commit | a7deb9a63c1070f62bff692cd505c869b5171024 (patch) | |
tree | 604891dae4b443597ea3bfa890d592ca87ab05b5 /emulators | |
parent | 463840b437cc66d3fa109f784c8ac10269a91741 (diff) | |
download | pkgsrc-a7deb9a63c1070f62bff692cd505c869b5171024.tar.gz |
Changes 20051122:
* Bug fixes and improvements
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/BasiliskII/Makefile | 10 | ||||
-rw-r--r-- | emulators/BasiliskII/distinfo | 20 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-aa | 8 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ab | 6 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-af | 40 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ag | 16 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ai | 8 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-aj | 10 |
8 files changed, 59 insertions, 59 deletions
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index 8d679912f96..7a2ebb44520 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.24 2005/11/03 21:34:23 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/11/23 12:17:56 adam Exp $ -DISTNAME= BasiliskII_src_22032005 -PKGNAME= BasiliskII-1.0.20050322 +DISTNAME= BasiliskII_src_22112005 +PKGNAME= BasiliskII-1.0.20051122 CATEGORIES= emulators -MASTER_SITES= http://gwenole.beauchesne.online.fr/basilisk2/files/ +MASTER_SITES= http://www.gibix.net/projects/basilisk2/files/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://gwenole.beauchesne.online.fr/basilisk2/ +HOMEPAGE= http://www.gibix.net/projects/basilisk2/ COMMENT= Open Source 68k Macintosh emulator WRKSRC= ${WRKDIR}/BasiliskII-1.0 diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo index 6525e12a317..c9190369594 100644 --- a/emulators/BasiliskII/distinfo +++ b/emulators/BasiliskII/distinfo @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.11 2005/11/17 16:56:39 joerg Exp $ +$NetBSD: distinfo,v 1.12 2005/11/23 12:17:56 adam Exp $ -SHA1 (BasiliskII_src_22032005.tar.bz2) = e6c6efe9dded3e50b204fc641f42d15447819109 -RMD160 (BasiliskII_src_22032005.tar.bz2) = 6fac78005ed8a8794c192a07d36285a68ad1ccfa -Size (BasiliskII_src_22032005.tar.bz2) = 914468 bytes -SHA1 (patch-aa) = d1886fa85a58c2974ad355e6d8eb73cc611316bf -SHA1 (patch-ab) = 462964cfa794f6ad97774fef525a9f210bd99d1b +SHA1 (BasiliskII_src_22112005.tar.bz2) = f3ca02d2d2894bee3fbf056c65da514febe35008 +RMD160 (BasiliskII_src_22112005.tar.bz2) = e33dfa18a6280945d4395ddf093fe5f4900efa60 +Size (BasiliskII_src_22112005.tar.bz2) = 1286256 bytes +SHA1 (patch-aa) = 387f7a3f6edac21b99d81ba88a0eeed4591c75ef +SHA1 (patch-ab) = 8fec4c8e42a1675e4cd79949e023030e6f3b824d SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15 SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6 SHA1 (patch-ae) = dcac9287614535fa72fe9c8b0e3c516575e40887 -SHA1 (patch-af) = 03ec1ba0a7662e3e7f73e1523cba4ee3dd072924 -SHA1 (patch-ag) = db67f8999719402d5cd6bb0f2e72f7b5d276f885 +SHA1 (patch-af) = 18cabe158042803031f50a4a2fcad03abac4148d +SHA1 (patch-ag) = 9570fe9a7103b7eecdf24db1e6a20840851e7258 SHA1 (patch-ah) = 880b59812c983a03d39267e7ba5e9ff1995020b6 -SHA1 (patch-ai) = 9479f2daefbb2b62adc8fa816a65eb1be3cdb71d -SHA1 (patch-aj) = 095ac43cfc8817f4f7c7861fb8422aac4c81b011 +SHA1 (patch-ai) = 965e0d467cd3a5ec14d393191462011f4159be68 +SHA1 (patch-aj) = 2abdbb5d9237f23a09df732e7509c4342af5b648 SHA1 (patch-ak) = 3763edf1a5a9a3c3b5d404214fd918de131e49a0 diff --git a/emulators/BasiliskII/patches/patch-aa b/emulators/BasiliskII/patches/patch-aa index 479beb3aaae..79c920ea81f 100644 --- a/emulators/BasiliskII/patches/patch-aa +++ b/emulators/BasiliskII/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.3 2005/11/03 21:34:23 rillig Exp $ +$NetBSD: patch-aa,v 1.4 2005/11/23 12:17:56 adam Exp $ ---- src/dummy/ether_dummy.cpp.orig 2005-07-01 12:04:04.000000000 +0000 +--- src/dummy/ether_dummy.cpp.orig 2005-05-14 10:10:09.000000000 +0200 +++ src/dummy/ether_dummy.cpp -@@ -173,7 +173,7 @@ void EtherInterrupt(void) - length = recvfrom(fd, packet, 1514, 0, (struct sockaddr *)&from, &from_len); +@@ -174,7 +174,7 @@ void EtherInterrupt(void) + length = recvfrom(fd, Mac2HostAddr(packet), 1514, 0, (struct sockaddr *)&from, &from_len); if (length < 14) break; - ether_udp_read(packet, length, &from); diff --git a/emulators/BasiliskII/patches/patch-ab b/emulators/BasiliskII/patches/patch-ab index d980016344b..dcebb2a61fd 100644 --- a/emulators/BasiliskII/patches/patch-ab +++ b/emulators/BasiliskII/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2005/11/03 21:34:23 rillig Exp $ +$NetBSD: patch-ab,v 1.4 2005/11/23 12:17:56 adam Exp $ ---- src/Unix/video_x.cpp.orig 2005-03-21 23:57:34.000000000 +0000 +--- src/Unix/video_x.cpp.orig 2005-06-11 08:52:22.000000000 +0200 +++ src/Unix/video_x.cpp -@@ -2288,7 +2288,7 @@ static void update_display_dynamic(int t +@@ -2315,7 +2315,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 2d40c0982a1..a23c299a819 100644 --- a/emulators/BasiliskII/patches/patch-af +++ b/emulators/BasiliskII/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $ +$NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $ ---- src/Unix/sys_unix.cpp.orig 2005-11-17 14:25:16.000000000 +0000 +--- src/Unix/sys_unix.cpp.orig 2005-08-01 07:23:02.000000000 +0200 +++ src/Unix/sys_unix.cpp -@@ -52,7 +52,7 @@ static int _llseek(unsigned int fd, unsi - #endif +@@ -37,7 +37,7 @@ + #include <dirent.h> #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $ #include <sys/cdio.h> #endif -@@ -79,7 +79,7 @@ struct file_handle { +@@ -64,7 +64,7 @@ struct file_handle { #if defined(__linux__) int cdrom_cap; // CD-ROM capability flags (only valid if is_cdrom is true) @@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $ struct ioc_capability cdrom_cap; #elif defined(__APPLE__) && defined(__MACH__) char *ioctl_name; // For CDs on OS X - a device for special ioctls -@@ -237,7 +237,7 @@ void SysAddCDROMPrefs(void) +@@ -222,7 +222,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.1 2005/11/17 16:56:39 joerg Exp $ PrefsAddString("cdrom", "/dev/cd0c"); #endif } -@@ -257,7 +257,7 @@ void SysAddSerialPrefs(void) +@@ -242,7 +242,7 @@ void SysAddSerialPrefs(void) PrefsAddString("seriala", "/dev/tts/0"); PrefsAddString("serialb", "/dev/tts/1"); } @@ -38,7 +38,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $ PrefsAddString("seriala", "/dev/cuaa0"); PrefsAddString("serialb", "/dev/cuaa1"); #elif defined(__NetBSD__) -@@ -319,7 +319,7 @@ static bool is_drive_mounted(const char +@@ -304,7 +304,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.1 2005/11/17 16:56:39 joerg Exp $ // SCSI IDE bool is_cdrom = strncmp(name, "/dev/cd", 7) == 0 || strncmp(name, "/dev/acd", 8) == 0; #else -@@ -367,7 +367,7 @@ void *Sys_open(const char *name, bool re +@@ -352,7 +352,7 @@ void *Sys_open(const char *name, bool re } // Open file/device @@ -56,7 +56,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg 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); -@@ -414,7 +414,7 @@ void *Sys_open(const char *name, bool re +@@ -395,7 +395,7 @@ void *Sys_open(const char *name, bool re #else fh->cdrom_cap = 0; #endif @@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $ fh->is_floppy = ((st.st_rdev >> 16) == 2); #ifdef CDIOCCAPABILITY if (is_cdrom) { -@@ -586,7 +586,7 @@ void SysEject(void *arg) +@@ -555,7 +555,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.1 2005/11/17 16:56:39 joerg Exp $ if (fh->is_floppy) { fsync(fh->fd); } else if (fh->is_cdrom) { -@@ -723,7 +723,7 @@ bool SysIsDiskInserted(void *arg) +@@ -692,7 +692,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.1 2005/11/17 16:56:39 joerg Exp $ } else if (fh->is_floppy) { return false; //!! } else if (fh->is_cdrom) { -@@ -831,7 +831,7 @@ bool SysCDReadTOC(void *arg, uint8 *toc) +@@ -800,7 +800,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.1 2005/11/17 16:56:39 joerg Exp $ uint8 *p = toc + 2; // Header -@@ -942,7 +942,7 @@ bool SysCDGetPosition(void *arg, uint8 * +@@ -911,7 +911,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.1 2005/11/17 16:56:39 joerg Exp $ struct ioc_read_subchannel chan; chan.data_format = CD_MSF_FORMAT; chan.address_format = CD_MSF_FORMAT; -@@ -994,7 +994,7 @@ bool SysCDPlay(void *arg, uint8 start_m, +@@ -963,7 +963,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.1 2005/11/17 16:56:39 joerg Exp $ struct ioc_play_msf play; play.start_m = start_m; play.start_s = start_s; -@@ -1024,7 +1024,7 @@ bool SysCDPause(void *arg) +@@ -993,7 +993,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.1 2005/11/17 16:56:39 joerg Exp $ return ioctl(fh->fd, CDIOCPAUSE) == 0; #else return false; -@@ -1047,7 +1047,7 @@ bool SysCDResume(void *arg) +@@ -1016,7 +1016,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.1 2005/11/17 16:56:39 joerg Exp $ return ioctl(fh->fd, CDIOCRESUME) == 0; #else return false; -@@ -1070,7 +1070,7 @@ bool SysCDStop(void *arg, uint8 lead_out +@@ -1039,7 +1039,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.1 2005/11/17 16:56:39 joerg Exp $ return ioctl(fh->fd, CDIOCSTOP) == 0; #else return false; -@@ -1111,7 +1111,7 @@ void SysCDSetVolume(void *arg, uint8 lef +@@ -1080,7 +1080,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.1 2005/11/17 16:56:39 joerg Exp $ struct ioc_vol vol; vol.vol[0] = vol.vol[2] = left; vol.vol[1] = vol.vol[3] = right; -@@ -1138,7 +1138,7 @@ void SysCDGetVolume(void *arg, uint8 &le +@@ -1107,7 +1107,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 8f48de0b941..d247631d9c9 100644 --- a/emulators/BasiliskII/patches/patch-ag +++ b/emulators/BasiliskII/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.1 2005/11/17 16:56:39 joerg Exp $ +$NetBSD: patch-ag,v 1.2 2005/11/23 12:17:56 adam Exp $ ---- src/Unix/sigsegv.cpp.orig 2005-11-17 14:27:36.000000000 +0000 +--- src/Unix/sigsegv.cpp.orig 2005-06-12 23:47:46.000000000 +0200 +++ src/Unix/sigsegv.cpp @@ -226,7 +226,7 @@ static void powerpc_decode_instruction(i @@ -11,16 +11,16 @@ $NetBSD: patch-ag,v 1.1 2005/11/17 16:56:39 joerg Exp $ #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGBUS) #else #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV) -@@ -257,7 +257,7 @@ static void powerpc_decode_instruction(i - #define SIGSEGV_SKIP_INSTRUCTION sparc_skip_instruction +@@ -264,7 +264,7 @@ static void powerpc_decode_instruction(i + #define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction #endif #endif --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) +-#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #if (defined(i386) || defined(__i386__)) #define SIGSEGV_FAULT_INSTRUCTION (((struct sigcontext *)scp)->sc_eip) #define SIGSEGV_REGISTER_FILE ((unsigned long *)&(((struct sigcontext *)scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */ -@@ -444,7 +444,7 @@ static sigsegv_address_t get_fault_addre +@@ -451,7 +451,7 @@ static sigsegv_address_t get_fault_addre #define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV) #endif #endif @@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.1 2005/11/17 16:56:39 joerg 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 -@@ -715,7 +715,7 @@ enum { +@@ -714,7 +714,7 @@ enum { #endif }; #endif diff --git a/emulators/BasiliskII/patches/patch-ai b/emulators/BasiliskII/patches/patch-ai index c2d17e25e50..712162f0f28 100644 --- a/emulators/BasiliskII/patches/patch-ai +++ b/emulators/BasiliskII/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1 2005/11/17 16:56:39 joerg Exp $ +$NetBSD: patch-ai,v 1.2 2005/11/23 12:17:56 adam Exp $ ---- src/Unix/prefs_editor_gtk.cpp.orig 2005-11-17 14:29:15.000000000 +0000 +--- src/Unix/prefs_editor_gtk.cpp.orig 2005-11-22 22:53:24.000000000 +0100 +++ src/Unix/prefs_editor_gtk.cpp -@@ -1109,7 +1109,7 @@ static GList *add_serial_names(void) +@@ -1259,7 +1259,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.1 2005/11/17 16:56:39 joerg 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) { -@@ -1148,7 +1148,7 @@ static GList *add_ether_names(void) +@@ -1298,7 +1298,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 13fe69801d5..e6580a10421 100644 --- a/emulators/BasiliskII/patches/patch-aj +++ b/emulators/BasiliskII/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.1 2005/11/17 16:56:39 joerg Exp $ +$NetBSD: patch-aj,v 1.2 2005/11/23 12:17:56 adam Exp $ ---- src/Unix/ether_unix.cpp.orig 2005-11-17 14:30:02.000000000 +0000 +--- src/Unix/ether_unix.cpp.orig 2005-07-03 10:21:32.000000000 +0200 +++ src/Unix/ether_unix.cpp -@@ -31,7 +31,7 @@ +@@ -33,7 +33,7 @@ #include <stdio.h> #include <map> --#if defined(__FreeBSD__) || defined(sgi) -+#if defined(__FreeBSD__) || defined(sgi) defined(__DragonFly__) +-#if defined(__FreeBSD__) || defined(sgi) || (defined(__APPLE__) && defined(__MACH__)) ++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(sgi) || (defined(__APPLE__) && defined(__MACH__)) #include <net/if.h> #endif |