[pkgsrc/trunk]: pkgsrc/emulators/ucon64 ucon64: update to 2.2.0.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5aba7a8d337d
branches:  trunk
changeset: 397952:5aba7a8d337d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jul 07 22:47:57 2019 +0000

description:
ucon64: update to 2.2.0.

With much help from upstream to get this compiling nicely on NetBSD.

2.2.0
- added (GB) --gp2bmp convert Game Boy Printer data (produced by --xmccl) to
BMP (by dbjh; based on version of gblnk (by Chris McCormick) improved by
Difegue. Many thanks to Difegue for providing me with Game Boy Printer data.
Thanks to Martin Eyre for documenting his findings about Game Boy Printer
commands)
- added (SNES) --sminis=ID convert *.srm (SRAM) file to SNES/Super Famicom
Classic Mini (hakchi2) format for game with identifier ID (by dbjh)
- added (SNES) --smini2srm convert SNES/Super Famicom Classic Mini (hakchi2)
SRAM data to *.srm (SRAM) file (by dbjh)
- added support for NetBSD (by dbjh; thanks to Thomas Klausner for his help)
- updated support for OpenBSD (64-bit) (by dbjh)
- updated (all) made -o also work for --rrom, --r83 and --rjoliet, just like
the other rename options (--rdat, --rl and --ru) (by dbjh)
- updated (SNES) improved reliability of GDSF communication for PCs with a
parallel port that supports ECP (built-in or PCIe parallel port card). At last.
It is essential to correctly specify ecr_offset for this to work (by dbjh; many
thanks to Mystic_Merlin for testing)
- updated (SNES) improved --ufosd by adding specific support for 10 and 12 Mbit
HiROMs and implementing a generic way to set the SRAM mapping bytes (by dbjh;
thanks to Revenant for the information and Trenton_net for testing)
- added (SNES) --xufosd send ROM to Super UFO Pro 8 SD. Be sure to use a tool
like Zadig to add libusb-0.1 (libusb-win32) support (by dbjh; thanks to
Revenant for the information and Trenton_net and Revenant for testing)
- updated (SNES) added NTSC/PAL fix for Soul Blazer F/G and Super Metroid E (by
dbjh; thanks to Mystic_Merlin)
- added (SNES) work-around for using the Game Doctor SF6 protocol for parallel
ports that do not support reading from the Control register. It is good enough
to at least allow dumping saver data and SRAM. To enable the new functionality
assign a value other than 0 to the variable gd6_send_byte_delay. See the FAQ
question 55 for details (by dbjh; many thanks to NorQue and Mystic_Merlin for
testing)
- updated (SNES) made --gd3 specify a pass-through mapping for LoROM DSP games
(by dbjh)
- updated (SNES) added proper recognition of Pro Fighter headers of LoROM DSP
games with 2, 8 or 32 kB SRAM (by dbjh)
- updated (SNES) added interpretation of remaining part of GD3 header (DRAM and
SRAM mapping) to --dbuh (by dbjh)
- updated (SNES & Genesis) fixed split file detection for formats other than
(M)GD and MGH which I broke in 2.1.0 (by dbjh)
- added (all) --split=N split ROM in parts of N Bytes (including possible
header). This is a generic file splitting option. Use -s, optionally in
combination with --ssize=SIZE to split files for use with a specific console or
backup unit (by dbjh)
- added (SNES) support for Super Magicom/SMC IC2 file format. This format is
used by several ancient backup units, including the Twin Supercom, Future
Supercom Pro.9 and UFO Super Drive PRO 6 HYPER VERSION in order to run HiROM
games up to 16 Mbit. Use --ic2 to convert a file to Super Magicom/SMC IC2
format (by dbjh; thanks to Mystic_Merlin for info and testing)
- updated (SNES) fixed bug in --ufo that caused it to produce incorrect headers
for games that do not use SRAM (by dbjh; thanks to Mystic_Merlin for feedback
and testing)
- updated (SNES) fixed bug in -j for files in UFO format smaller than or equal
to 8 Mbit (by dbjh)

diffstat:

 emulators/ucon64/Makefile                                |   16 +-
 emulators/ucon64/PLIST                                   |    6 +-
 emulators/ucon64/distinfo                                |   27 +-
 emulators/ucon64/options.mk                              |    5 +-
 emulators/ucon64/patches/patch-Makefile                  |   81 ----
 emulators/ucon64/patches/patch-backup_libcd64_Makefile   |   58 +-
 emulators/ucon64/patches/patch-backup_libcd64_cd64io.c   |  252 +++++++++++++-
 emulators/ucon64/patches/patch-backup_libcd64_cd64io.h   |   80 ++++-
 emulators/ucon64/patches/patch-config.mak.in             |   13 -
 emulators/ucon64/patches/patch-configure                 |   29 +-
 emulators/ucon64/patches/patch-configure.in              |   32 +-
 emulators/ucon64/patches/patch-libdiscmage_libdiscmage.h |   28 -
 emulators/ucon64/patches/patch-libdiscmage_misc__z.h     |   23 +
 emulators/ucon64/patches/patch-misc_archive.h            |   23 +
 emulators/ucon64/patches/patch-misc_parallel.c           |   54 ---
 emulators/ucon64/patches/patch-misc_unzip.h              |   18 -
 16 files changed, 402 insertions(+), 343 deletions(-)

diffs (truncated from 904 to 300 lines):

diff -r d97a7d9fecbb -r 5aba7a8d337d emulators/ucon64/Makefile
--- a/emulators/ucon64/Makefile Sun Jul 07 21:37:17 2019 +0000
+++ b/emulators/ucon64/Makefile Sun Jul 07 22:47:57 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2018/03/07 12:34:55 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/07/07 22:47:57 wiz Exp $
 
-DISTNAME=              ucon64-2.1.0-src
+DISTNAME=              ucon64-2.2.0-src
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           1
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ucon64/}
 
@@ -13,23 +12,16 @@
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 
-CONFIGURE_ARGS+=       --disable-dload
-CPPFLAGS+=             -D__unix__
+CONFIGURE_ARGS+=       --with-libcd64
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake
 CHECK_PORTABILITY_SKIP+=install_beos.sh
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == NetBSD
-MAKE_ENV+=             OSTYPE=netbsd
-.endif
-
 INSTALLATION_DIRS=     bin lib share/examples/ucon64 share/doc/ucon64/images
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/ucon64 ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_LIB} ${WRKSRC}/libdiscmage/libdiscmage.so ${DESTDIR}${PREFIX}/lib
+       ${INSTALL_LIB} ${WRKSRC}/libdiscmage/discmage.so ${DESTDIR}${PREFIX}/lib
        ${INSTALL_DATA} ${WRKSRC}/[a-z]*.txt \
                ${DESTDIR}${PREFIX}/share/examples/ucon64
        ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/*.html \
diff -r d97a7d9fecbb -r 5aba7a8d337d emulators/ucon64/PLIST
--- a/emulators/ucon64/PLIST    Sun Jul 07 21:37:17 2019 +0000
+++ b/emulators/ucon64/PLIST    Sun Jul 07 22:47:57 2019 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2018/03/07 12:34:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/07/07 22:47:57 wiz Exp $
 bin/ucon64
-lib/libdiscmage.so
+lib/discmage.so
 share/doc/ucon64/changes.html
 share/doc/ucon64/developers.html
 share/doc/ucon64/faq.html
@@ -20,6 +20,7 @@
 share/doc/ucon64/images/mdpro.png
 share/doc/ucon64/images/msg.png
 share/doc/ucon64/images/pcepro.png
+share/doc/ucon64/images/pl.png
 share/doc/ucon64/images/qd16.png
 share/doc/ucon64/images/sc.png
 share/doc/ucon64/images/sf3.png
@@ -29,6 +30,7 @@
 share/doc/ucon64/images/smspro.png
 share/doc/ucon64/images/snesppak.png
 share/doc/ucon64/images/swc.png
+share/doc/ucon64/images/ufosd.png
 share/doc/ucon64/images/v64.png
 share/doc/ucon64/images/v64jr.png
 share/doc/ucon64/install.html
diff -r d97a7d9fecbb -r 5aba7a8d337d emulators/ucon64/distinfo
--- a/emulators/ucon64/distinfo Sun Jul 07 21:37:17 2019 +0000
+++ b/emulators/ucon64/distinfo Sun Jul 07 22:47:57 2019 +0000
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.9 2018/03/07 12:34:55 wiz Exp $
+$NetBSD: distinfo,v 1.10 2019/07/07 22:47:57 wiz Exp $
 
-SHA1 (ucon64-2.1.0-src.tar.gz) = 83506c965ba4ab6fa7122c9dcebbabe6c553cbc3
-RMD160 (ucon64-2.1.0-src.tar.gz) = b3b6b95a44cb50ac7e3634d07b1b50960fb971f8
-SHA512 (ucon64-2.1.0-src.tar.gz) = da2dbe8a573e7dc779f69859f4d3508d4818dcfd99b6b397a7b23a2038a1d8c85835fae9e237a1639ec6179e8ceabb95fd0d65f95f963de99bc61024f686580e
-Size (ucon64-2.1.0-src.tar.gz) = 1348408 bytes
-SHA1 (patch-Makefile) = 9cfc3c474562d5073099286a9659e4e5d4cf5d2f
-SHA1 (patch-backup_libcd64_Makefile) = b46127daa77cd9516954365897247c8f33088883
-SHA1 (patch-backup_libcd64_cd64io.c) = b47d14bb41708caa5a582444d5f4ef35cda973ea
-SHA1 (patch-backup_libcd64_cd64io.h) = 026c79ecc577e701b27113d369e6c8d977f01d53
-SHA1 (patch-config.mak.in) = 87db3e62bbd5fa94fa83878b227e3ed3ff8920e1
-SHA1 (patch-configure) = a4b89f6885abe731b75f6277bc563ec992f8d0c9
-SHA1 (patch-configure.in) = 3d5a3ecad1b50499b001eda39ec0100d0ed8ee16
-SHA1 (patch-libdiscmage_libdiscmage.h) = 7a5ced96ae619fd843d3b1acdcd28788937cc79a
-SHA1 (patch-misc_parallel.c) = 164137f352049698a2ff4758bd3dda72ab4dadec
-SHA1 (patch-misc_unzip.h) = 3a065530cd80c74985a997459ee67847b8f75864
+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
diff -r d97a7d9fecbb -r 5aba7a8d337d emulators/ucon64/options.mk
--- a/emulators/ucon64/options.mk       Sun Jul 07 21:37:17 2019 +0000
+++ b/emulators/ucon64/options.mk       Sun Jul 07 22:47:57 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/02/10 13:53:48 khorben Exp $
+# $NetBSD: options.mk,v 1.3 2019/07/07 22:47:57 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucon64
 PKG_SUPPORTED_OPTIONS= libusb
@@ -10,8 +10,5 @@
 ###
 .if !empty(PKG_OPTIONS:Mlibusb)
 CONFIGURE_ARGS+=       --with-libusb
-CPPFLAGS+=             -I${BUILDLINK_PREFIX.libusb}/include
-LDFLAGS+=              -L${BUILDLINK_PREFIX.libusb}/lib
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libusb}/lib
 .  include "../../mk/libusb.buildlink3.mk"
 .endif
diff -r d97a7d9fecbb -r 5aba7a8d337d emulators/ucon64/patches/patch-Makefile
--- a/emulators/ucon64/patches/patch-Makefile   Sun Jul 07 21:37:17 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2018/03/07 12:34:55 wiz Exp $
-
-Patch from upstream to improve build on NetBSD.
-
---- Makefile.orig      2017-08-05 23:02:35.000000000 +0000
-+++ Makefile
-@@ -2,7 +2,7 @@
- 
- CC=gcc
- CFLAGS0:=$(CFLAGS)
--CFLAGS+=-I. -Wall -W -O3
-+CFLAGS+=-I. -Wall -W
- LDFLAGS0:=$(LDFLAGS)
- ifeq ($(findstring darwin,$(OSTYPE)),) # false if OSTYPE contains "darwin"
- # On Mac OS X using -s gives the following warning:
-@@ -54,9 +54,14 @@ endif
- 
- else                                    # UNIX, BeOS or Mac OS X (Darwin)
- 
-+ifdef USE_PARALLEL
- ifeq ($(findstring openbsd,$(OSTYPE)),openbsd) # for example "openbsd3.4"
--# i386_iopl() is located in libi386.a
--LDFLAGS+=$(LIBI386)
-+# i386_iopl() is located in libi386.a. Use -lamd64 for amd64_iopl().
-+LDFLAGS+=$(LIBIOPL_OPENBSD)
-+endif
-+ifeq ($(findstring netbsd,$(OSTYPE)),netbsd)
-+LDFLAGS+=$(LIBIOPL_NETBSD)
-+endif
- endif
- 
- ifdef USE_DISCMAGE
-@@ -72,10 +77,12 @@ ifdef DLOPEN
- ifneq ($(OSTYPE),beos)
- ifeq ($(findstring freebsd,$(OSTYPE)),) # false if OSTYPE contains "freebsd"
- ifeq ($(findstring openbsd,$(OSTYPE)),) # false if OSTYPE contains "openbsd"
-+ifeq ($(findstring netbsd,$(OSTYPE)),)  # false if OSTYPE contains "netbsd"
- LDFLAGS+=-ldl
- endif
- endif
- endif
-+endif
- 
- else                                    # DLOPEN
- ifdef USE_DISCMAGE                      # GNU specific: "simply expanded variable"
-@@ -231,7 +238,7 @@ ifdef USE_DISCMAGE
- .PHONY: libdiscmage/$(FULLLIBNAME_DM)
- libdiscmage/$(FULLLIBNAME_DM):
- ifeq ($(GCC_WIN),1)
--      cd libdiscmage && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+      cd libdiscmage && CFLAGS="$(CFLAGS0)" LDFLAGS="$(LDFLAGS0)" $(MAKE)
- else
- ifdef DJGPP
-       cd libdiscmage
-@@ -240,7 +247,7 @@ ifdef DJGPP
-       $(MAKE)
-       cd ..
- else
--      cd libdiscmage && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+      cd libdiscmage && CFLAGS="$(CFLAGS0)" LDFLAGS="$(LDFLAGS0)" $(MAKE)
- endif                                   # DJGPP
- endif                                   # GCC_WIN
- endif                                   # USE_DISCMAGE
-@@ -250,7 +257,7 @@ ifdef USE_LIBCD64
- #.PHONY: backup/libcd64/libcd64.a  Do not force linking an executable.
- backup/libcd64/libcd64.a:
- ifeq ($(GCC_WIN),1)
--      cd backup/libcd64 && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+      cd backup/libcd64 && CFLAGS="$(CFLAGS0)" LDFLAGS="$(LDFLAGS0)" $(MAKE)
- else
- ifdef DJGPP
-       cd backup/libcd64
-@@ -259,7 +266,7 @@ ifdef DJGPP
-       $(MAKE)
-       cd ../..
- else
--      cd backup/libcd64 && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+      cd backup/libcd64 && CFLAGS="$(CFLAGS0)" LDFLAGS="$(LDFLAGS0)" $(MAKE)
- endif                                   # DJGPP
- endif                                   # GCC_WIN
- endif                                   # USE_LIBCD64
diff -r d97a7d9fecbb -r 5aba7a8d337d emulators/ucon64/patches/patch-backup_libcd64_Makefile
--- a/emulators/ucon64/patches/patch-backup_libcd64_Makefile    Sun Jul 07 21:37:17 2019 +0000
+++ b/emulators/ucon64/patches/patch-backup_libcd64_Makefile    Sun Jul 07 22:47:57 2019 +0000
@@ -1,54 +1,48 @@
-$NetBSD: patch-backup_libcd64_Makefile,v 1.1 2018/03/07 12:34:55 wiz Exp $
+$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       2016-02-11 00:32:59.000000000 +0000
+--- backup/libcd64/Makefile.orig       2019-05-21 00:13:14.000000000 +0000
 +++ backup/libcd64/Makefile
-@@ -2,9 +2,9 @@ CC=gcc
- 
- ifdef DEBUG
- # I think we only use gnu99 instead of c99 due to va_args extensions.
--CFLAGS+=-I. -Wall -W -pg -g -pedantic -ansi -DDEBUG
-+CFLAGS+=-I. -Wall -W -std=gnu99 -pg -g -pedantic -ansi -DDEBUG
- else
--CFLAGS+=-I. -Wall -W -O6 -funroll-loops -fexpensive-optimizations
-+CFLAGS+=-I. -Wall -W -std=gnu99 -O6 -funroll-loops -fexpensive-optimizations
+@@ -80,19 +80,10 @@ RAWIO=1
  endif
  
- ifndef DJGPP
-@@ -40,14 +40,6 @@ LDFLAGS+=-Wl,--out-implib,libcd64dll.a
- 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
  
--# The next check is not really specific to FreeBSD or OpenBSD -- the version of
--#  gcc I use is just old.
--ifeq ($(findstring FreeBSD,$(OSTYPE)),)
--ifeq ($(findstring OpenBSD,$(OSTYPE)),)
--CFLAGS+=-std=gnu99
--endif
--endif
--
+ ifeq ($(OSTYPE),NetBSD)
+-#LIBS+=/usr/lib/libi386.a
+-#LDFLAGS+=-li386
+-LIBS+=/usr/lib/libx86_64.a
+-LDFLAGS+=-lx86_64
+ RAWIO=1
+ endif
  
- DEFAULT_BUILD=1
- 
-@@ -90,8 +82,18 @@ endif
+@@ -131,6 +122,21 @@ endif
  
- ifeq ($(findstring OpenBSD,$(OSTYPE)),OpenBSD)
- # i386_iopl() is located in libi386.a (note the .a)
--LIBS+=/usr/lib/libi386.a
--LDFLAGS+=-L/usr/lib -li386
+ 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
-+RAWIO=1
 +endif
 +
-+ifeq ($(findstring NetBSD,$(OSTYPE)),NetBSD)
++ifeq ($(OSTYPE),NetBSD)
 +#LIBS+=/usr/lib/libi386.a
 +#LDFLAGS+=-li386
 +LIBS+=/usr/lib/libx86_64.a
 +LDFLAGS+=-lx86_64
- RAWIO=1
++endif
  endif
  
+ default: all
diff -r d97a7d9fecbb -r 5aba7a8d337d emulators/ucon64/patches/patch-backup_libcd64_cd64io.c
--- a/emulators/ucon64/patches/patch-backup_libcd64_cd64io.c    Sun Jul 07 21:37:17 2019 +0000
+++ b/emulators/ucon64/patches/patch-backup_libcd64_cd64io.c    Sun Jul 07 22:47:57 2019 +0000
@@ -1,39 +1,227 @@
-$NetBSD: patch-backup_libcd64_cd64io.c,v 1.1 2018/03/07 12:34:55 wiz Exp $
+$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       2017-07-29 05:55:48.000000000 +0000
+--- backup/libcd64/cd64io.c.orig       2019-05-06 06:48:17.000000000 +0000
 +++ backup/libcd64/cd64io.c
-@@ -827,14 +827,29 @@ int cd64_open_rawio(struct cd64_t *cd64)