pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/ucon64 ucon64: update to 2.2.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/de0754d03d17
branches: trunk
changeset: 443018:de0754d03d17
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Dec 05 13:16:36 2020 +0000
description:
ucon64: update to 2.2.1.
2.2.1
- updated (SNES) fixed checksum calculation of SNES/Super Famicom Classic Mini
SRAM data of special chip games like Super Mario RPG, Super Mario World 2 -
Yoshi's Island, Hoshi no Kirby Super Deluxe and Star Fox 2 (by dbjh)
- added (SNES) --range=OFFSET1:OFFSET2 specify range for calculating checksum of
SNES/Super Famicom Classic Mini (hakchi2) SRAM data. Can be used in
combination with --sminis for special chip games (by dbjh)
- added (SNES) --xic2 send ROM to SMC IC2 compatible backup unit (by dbjh;
thanks to Mystic_Merlin for finding this out and for testing)
- removed (PSX/N64) --xdex, because the underlying code had nothing to do with
the DexDrive (by dbjh)
- added full MinGW-w64, 64-bit Visual C++ (2015 & 2019) and 64-bit Cygwin
build support (including libdiscmage and libcd64); improved 64-bit support in
general (by dbjh)
- libdiscmage support is no longer enabled by default. Use the configure option
--with-libdiscmage to enable support (by dbjh)
diffstat:
emulators/ucon64/Makefile | 7 +-
emulators/ucon64/PLIST | 3 +-
emulators/ucon64/distinfo | 19 +-
emulators/ucon64/patches/patch-backup_libcd64_Makefile | 48 ---
emulators/ucon64/patches/patch-backup_libcd64_cd64io.c | 227 -----------------
emulators/ucon64/patches/patch-backup_libcd64_cd64io.h | 77 -----
emulators/ucon64/patches/patch-configure | 15 -
emulators/ucon64/patches/patch-configure.in | 15 -
emulators/ucon64/patches/patch-libdiscmage_ioapi.h | 19 +
emulators/ucon64/patches/patch-libdiscmage_misc__z.h | 23 -
emulators/ucon64/patches/patch-misc_archive.h | 23 -
emulators/ucon64/patches/patch-misc_ioapi.h | 19 +
12 files changed, 50 insertions(+), 445 deletions(-)
diffs (truncated from 569 to 300 lines):
diff -r 7517010c0962 -r de0754d03d17 emulators/ucon64/Makefile
--- a/emulators/ucon64/Makefile Sat Dec 05 13:15:58 2020 +0000
+++ b/emulators/ucon64/Makefile Sat Dec 05 13:16:36 2020 +0000
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.16 2020/03/20 11:57:36 nia Exp $
+# $NetBSD: Makefile,v 1.17 2020/12/05 13:16:36 wiz Exp $
-DISTNAME= ucon64-2.2.0-src
+DISTNAME= ucon64-2.2.1-src
PKGNAME= ${DISTNAME:S/-src//}
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ucon64/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://ucon64.sourceforge.net/
+HOMEPAGE= https://ucon64.sourceforge.io/
COMMENT= Emulator ROM and disk image converter and inspector
LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${DISTNAME}/src
CONFIGURE_ARGS+= --with-libcd64
+CONFIGURE_ARGS+= --with-libdiscmage
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
CHECK_PORTABILITY_SKIP+= install_beos.sh
diff -r 7517010c0962 -r de0754d03d17 emulators/ucon64/PLIST
--- a/emulators/ucon64/PLIST Sat Dec 05 13:15:58 2020 +0000
+++ b/emulators/ucon64/PLIST Sat Dec 05 13:16:36 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/07/07 22:47:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/12/05 13:16:36 wiz Exp $
bin/ucon64
lib/discmage.so
share/doc/ucon64/changes.html
@@ -9,7 +9,6 @@
share/doc/ucon64/images/cameralink.png
share/doc/ucon64/images/cd64.png
share/doc/ucon64/images/cd_rw.png
-share/doc/ucon64/images/dexdrive.png
share/doc/ucon64/images/f2a.png
share/doc/ucon64/images/fal.png
share/doc/ucon64/images/fig.png
diff -r 7517010c0962 -r de0754d03d17 emulators/ucon64/distinfo
--- a/emulators/ucon64/distinfo Sat Dec 05 13:15:58 2020 +0000
+++ b/emulators/ucon64/distinfo Sat Dec 05 13:16:36 2020 +0000
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.10 2019/07/07 22:47:57 wiz Exp $
+$NetBSD: distinfo,v 1.11 2020/12/05 13:16:36 wiz Exp $
-SHA1 (ucon64-2.2.0-src.tar.gz) = e92167c4537c9b74c879242b785d108f0f91e641
-RMD160 (ucon64-2.2.0-src.tar.gz) = 4bd6e17fbe970800f1f4e563263ccc86794eddf7
-SHA512 (ucon64-2.2.0-src.tar.gz) = 1f21083585d9e3a32546139e2b0786ff37d32e070b21ecc39a1d179e39be3e786d5d07b06c1dce8b3f43e14800974159f54a9a469e59070b2b50c4cbb85136dc
-Size (ucon64-2.2.0-src.tar.gz) = 1488002 bytes
-SHA1 (patch-backup_libcd64_Makefile) = c6d659c96ea2389266b6480f2d3afe79a647685d
-SHA1 (patch-backup_libcd64_cd64io.c) = ab1d2b9ad9c3258114f946b13c28520b40eb60b2
-SHA1 (patch-backup_libcd64_cd64io.h) = c4f915436c3867ea77ddc95942a074a8266a5c03
-SHA1 (patch-configure) = 2f56081b1ea8b0fcabc1979866fddc144241bc62
-SHA1 (patch-configure.in) = 069ffe610faec56696b71b42f2abafa53488a5ff
-SHA1 (patch-libdiscmage_misc__z.h) = 3456714ff4ea4328a7d6b3cd785e76abbca2423a
-SHA1 (patch-misc_archive.h) = 3ed6b8a6464e0fcb2992e0065b1e84ac0572f670
+SHA1 (ucon64-2.2.1-src.tar.gz) = bfc6fad1b82cb0d5ffe734f46d088567e8d93126
+RMD160 (ucon64-2.2.1-src.tar.gz) = ca363e350be23fa2f083deb598efab307066b231
+SHA512 (ucon64-2.2.1-src.tar.gz) = 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
+Size (ucon64-2.2.1-src.tar.gz) = 1476080 bytes
+SHA1 (patch-libdiscmage_ioapi.h) = a5857b1623a3180d09e19815e261f23491aaad96
+SHA1 (patch-misc_ioapi.h) = dc2939f8f404e25a7dcb841555024551f2962984
diff -r 7517010c0962 -r de0754d03d17 emulators/ucon64/patches/patch-backup_libcd64_Makefile
--- a/emulators/ucon64/patches/patch-backup_libcd64_Makefile Sat Dec 05 13:15:58 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-backup_libcd64_Makefile,v 1.2 2019/07/07 22:47:57 wiz Exp $
-
-Patch from upstream to improve build on NetBSD.
-
---- backup/libcd64/Makefile.orig 2019-05-21 00:13:14.000000000 +0000
-+++ backup/libcd64/Makefile
-@@ -80,19 +80,10 @@ RAWIO=1
- endif
-
- ifeq ($(OSTYPE),OpenBSD)
--# i386_iopl() is located in libi386.a (note the .a)
--#LIBS+=/usr/lib/libi386.a
--#LDFLAGS+=-li386
--LIBS+=/usr/lib/libamd64.a
--LDFLAGS+=-lamd64
- RAWIO=1
- endif
-
- ifeq ($(OSTYPE),NetBSD)
--#LIBS+=/usr/lib/libi386.a
--#LDFLAGS+=-li386
--LIBS+=/usr/lib/libx86_64.a
--LDFLAGS+=-lx86_64
- RAWIO=1
- endif
-
-@@ -131,6 +122,21 @@ endif
-
- ifdef RAWIO
- CFLAGS+=-DCD64_USE_RAWIO
-+
-+ifeq ($(OSTYPE),OpenBSD)
-+# i386_iopl() is located in libi386.a (note the .a)
-+#LIBS+=/usr/lib/libi386.a
-+#LDFLAGS+=-li386
-+LIBS+=/usr/lib/libamd64.a
-+LDFLAGS+=-lamd64
-+endif
-+
-+ifeq ($(OSTYPE),NetBSD)
-+#LIBS+=/usr/lib/libi386.a
-+#LDFLAGS+=-li386
-+LIBS+=/usr/lib/libx86_64.a
-+LDFLAGS+=-lx86_64
-+endif
- endif
-
- default: all
diff -r 7517010c0962 -r de0754d03d17 emulators/ucon64/patches/patch-backup_libcd64_cd64io.c
--- a/emulators/ucon64/patches/patch-backup_libcd64_cd64io.c Sat Dec 05 13:15:58 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-$NetBSD: patch-backup_libcd64_cd64io.c,v 1.2 2019/07/07 22:47:57 wiz Exp $
-
-Patch from upstream to improve build on NetBSD.
-
---- backup/libcd64/cd64io.c.orig 2019-05-06 06:48:17.000000000 +0000
-+++ backup/libcd64/cd64io.c
-@@ -41,7 +41,20 @@
-
- #ifdef CD64_USE_RAWIO
-
-+static INLINE uint8_t inb2(uint16_t);
-+static INLINE void outb2(uint8_t, uint16_t);
-+
- #if defined _WIN32 || defined __CYGWIN__
-+#ifdef _MSC_VER
-+#pragma warning(push)
-+#pragma warning(disable: 4255) /* 'function' : no function prototype given: converting '()' to '(void)' */
-+#pragma warning(disable: 4668) /* 'symbol' is not defined as a preprocessor macro, replacing with '0' for 'directives' */
-+#pragma warning(disable: 4820) /* 'bytes' bytes padding added after construct 'member_name' */
-+#endif
-+#include <windows.h> /* defines _WIN32 (checks for */
-+#ifdef _MSC_VER /* __CYGWIN__ must come first) */
-+#pragma warning(pop)
-+#endif
- #ifdef __CYGWIN__
- #include <dlfcn.h>
-
-@@ -73,10 +86,8 @@ static short int (WINAPI *IsDriverInstal
- static unsigned char (__stdcall *DlPortReadPortUchar)(unsigned short) = NULL;
- static void (__stdcall *DlPortWritePortUchar)(unsigned short, unsigned char) = NULL;
-
--static INLINE uint8_t inb(uint16_t);
--static INLINE void outb(uint8_t, uint16_t);
--static uint8_t (*input_byte)(uint16_t) = inb;
--static void (*output_byte)(uint8_t, uint16_t) = outb;
-+static uint8_t (*input_byte)(uint16_t) = inb2;
-+static void (*output_byte)(uint8_t, uint16_t) = outb2;
- #endif
-
- #ifdef __BEOS__
-@@ -774,9 +785,8 @@ static LONG new_exception_filter(LPEXCEP
- #endif
- #endif /* _WIN32 || __CYGWIN__ */
-
--#if ((defined _WIN32 || defined __CYGWIN__ || defined __BEOS__) && \
-- (defined __i386__ || defined __x86_64__)) || defined _MSC_VER
--static INLINE uint8_t inb(uint16_t port) {
-+#if defined __i386__ || defined __x86_64__ || defined _MSC_VER
-+static INLINE uint8_t inb2(uint16_t port) {
-
- #ifdef __BEOS__
- st_ioport_t temp;
-@@ -785,27 +795,30 @@ static INLINE uint8_t inb(uint16_t port)
- ioctl(io_portfd, 'r', &temp, 0);
-
- return temp.data8;
--#else /* Win32 */
-+#elif defined _WIN32 || defined __CYGWIN__
- if (io_driver_found) return input_byte(port);
-- else {
-+ else
- #ifdef _MSC_VER
- #ifdef _M_IX86
-- return (unsigned char) _inp(port);
-+ return (uint8_t) _inp(port);
- #endif
--#else
-- unsigned char byte;
-+#endif
-+#endif /* _WIN32 || __CYGWIN__ */
-+#if defined __MINGW32__ || defined __CYGWIN__ || \
-+ ((defined __i386__ || defined __x86_64__) && !defined __BEOS__)
-+ {
-+ uint8_t byte;
- __asm__ __volatile__
- ("inb %1, %0"
- : "=a" (byte)
- : "d" (port)
- );
- return byte;
--#endif
- }
- #endif
- }
-
--static INLINE void outb(uint8_t byte, uint16_t port) {
-+static INLINE void outb2(uint8_t byte, uint16_t port) {
-
- #ifdef __BEOS__
- st_ioport_t temp;
-@@ -813,24 +826,27 @@ static INLINE void outb(uint8_t byte, ui
- temp.port = port;
- temp.data8 = byte;
- ioctl(io_portfd, 'w', &temp, 0);
--#else /* Win32 */
-+#elif defined _WIN32 || defined __CYGWIN__
- if (io_driver_found) output_byte(byte, port);
-- else {
-+ else
- #ifdef _MSC_VER
- #ifdef _M_IX86
- _outp(port, byte);
- #endif
--#else
-+#endif
-+#endif /* _WIN32 || __CYGWIN__ */
-+#if defined __MINGW32__ || defined __CYGWIN__ || \
-+ ((defined __i386__ || defined __x86_64__) && !defined __BEOS__)
-+ {
- __asm__ __volatile__
- ("outb %1, %0"
- :
- : "d" (port), "a" (byte)
- );
--#endif
- }
- #endif
- }
--#endif /* inb/outb defs */
-+#endif /* inb2/outb2 defs */
-
- int cd64_open_rawio(struct cd64_t *cd64) {
-
-@@ -1112,8 +1128,8 @@ int cd64_close_rawio(struct cd64_t *cd64
- close_module(io_driver, cd64);
- io_driver = NULL;
- io_driver_found = 0;
-- input_byte = inb;
-- output_byte = outb;
-+ input_byte = inb2;
-+ output_byte = outb2;
- #endif
-
- return 1;
-@@ -1127,7 +1143,7 @@ static INLINE int cd64_wait_rawio(struct
- i = 0;
-
- if (cd64->using_ppa) {
-- status = inb((uint16_t) (cd64->port+1));
-+ status = inb2((uint16_t) (cd64->port+1));
-
- while (status & 0x80) {
- i++;
-@@ -1136,15 +1152,15 @@ static INLINE int cd64_wait_rawio(struct
- * Try to knock some sense into it. */
- uint8_t dir = 1;
- status = 0x06 | (dir << 5);
-- outb(status, (uint16_t) (cd64->port+2));
-+ outb2(status, (uint16_t) (cd64->port+2));
-
- dir = 0;
- status = 0x04 | (dir << 5);
-- outb(status, (uint16_t) (cd64->port+2));
-+ outb2(status, (uint16_t) (cd64->port+2));
- status = 0x05 | (dir << 5);
-- outb(status, (uint16_t) (cd64->port+2));
-+ outb2(status, (uint16_t) (cd64->port+2));
- status = 0x04 | (dir << 5);
-- outb(status, (uint16_t) (cd64->port+2));
-+ outb2(status, (uint16_t) (cd64->port+2));
-
- reset_tries++;
- i = 0;
-@@ -1155,14 +1171,14 @@ static INLINE int cd64_wait_rawio(struct
- break;
- }
-
-- status = inb((uint16_t) (cd64->port+1));
-+ status = inb2((uint16_t) (cd64->port+1));
- }
- }
- else { /* Comms link */
-- status = inb((uint16_t) (cd64->port+2));
-+ status = inb2((uint16_t) (cd64->port+2));
- while (status & 1) {
- /* Do we need to handle a stuck situation here? */
-- status = inb((uint16_t) (cd64->port+2));
Home |
Main Index |
Thread Index |
Old Index