From af9676fe4cf063d57aa570d9149efba1e411e6e2 Mon Sep 17 00:00:00 2001 From: kristerw Date: Thu, 3 Jan 2002 00:19:01 +0000 Subject: Update xmess to version 0.56.2. Changes since xmess-0.37b15 include: New System Drivers Supported ---------------------------- * Unipolbrit Komputer 2086 [Krzysztof Strzecha] * ZX Spectrum 48k Psycho (ROM modification) [Krzysztof Strzecha] System Driver Changes: ---------------------- * [TI81] ON/OFF fixed. ROM bank switching added (port 5). NVRAM support added. [Krzysztof Strzecha] * [TI85/TI86] Snapshot loading corrected. [Krzysztof Strzecha] * [TC2048/TS2068] Aspect ratio corrected. [Krzysztof Strzecha] * [TS2068] Support for DOCK cartridges added. Support for Z80 snapshots added. AY sound added. [Krzysztof Strzecha] * [DRAGON/COCO] Improved one bit sound out. Improved support for DMK file format; now supports multiple sector sizes. Fixed double sided disk access in OS-9. Added support for the memory sense switch used to select between 64/32, 16 and 4K. [tim lindner] * [APF Imagination] Cassette loading and saving is working. Disc emulation is wo rking. Added some more key definitions. [Kev Thacker] * [ORIC] Fixed cassette loading and saving. [Kev Thacker, Mathis Rosenhauer] --- emulators/xmess/Makefile | 158 ++++++++++++++++++++++++++------------- emulators/xmess/distinfo | 8 +- emulators/xmess/patches/patch-aa | 74 ++---------------- 3 files changed, 116 insertions(+), 124 deletions(-) (limited to 'emulators') diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index c62781f0b67..b7a753d2f77 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,76 +1,130 @@ -# $NetBSD: Makefile,v 1.14 2001/09/02 23:04:23 kristerw Exp $ +# $NetBSD: Makefile,v 1.15 2002/01/03 00:19:01 kristerw Exp $ # -DISTNAME= xmame-0.37b15.2 -PKGNAME= xmess-0.37b15.2 +DISTNAME= xmame-0.56.2 +PKGNAME= xmess-0.56.2 CATEGORIES= emulators games x11 -MASTER_SITES= http://x.mame.net/download/ +MASTER_SITES= http://roms.mame.dk/emu/ \ + http://x.mame.net/download/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= kristerw@netbsd.org HOMEPAGE= http://x.mame.net/ COMMENT= X11 emulator for old computers and console machines -DEPENDS= unzip>=5.40:../../archivers/unzip - RESTRICTED= "selling is not allowed" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} USE_X11BASE= YES -USE_XPM= YES USE_GMAKE= YES -MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} \ - MAME_CPU=${MAME_CPU} \ - INSTALL_MAN="${INSTALL_MAN}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" \ - NETBSD_DGA="${NETBSD_DGA}" \ - DISPLAY_METHOD="${DISPLAY_METHOD}" MAKEFILE= makefile.unix -DISPLAY_METHOD= x11 - -ROMPATH= ${PREFIX}/share/xmess -SPOOLDIR= /var/games/xmess -.if exists(/usr/include/machine/joystick.h) -NETBSD_JOYSTICK= yes -.else -NETBSD_JOYSTICK= no +TARGET= ${PKGBASE} + +.include "../../mk/bsd.prefs.mk" + +ROMPATH= ${PREFIX}/share/${TARGET} +SPOOLDIR= /var/games/${TARGET} + +MAKE_FLAGS+= TARGET="${TARGET:S/x//}" +MAKE_FLAGS+= CC="${CC}" +MAKE_FLAGS+= LIBS="${LDFLAGS} ${LIBS}" +MAKE_FLAGS+= CFLAGS="${CFLAGS}" +MAKE_FLAGS+= X11INC= X11LIB= + +MAME_DISP_METHOD?= x11 + +# Determine which CPU-specific code to use. +.for MARCH in i386 alpha m68k +MAME_CPU.${MARCH}?= ${MARCH} +.endfor +.if !defined(MAME_CPU.${MACHINE_ARCH}) +# Determine the endianness of the CPU by checking header files. +. if !defined(MACHINE_ENDIAN) +_ENDIAN_H_FILES= /usr/include/sys/endian.h +_ENDIAN_H_FILES+= /usr/include/machine/endian.h +_ENDIAN_H_FILES+= /usr/include/endian.h +_ENDIAN_H_FILES+= /usr/include/sys/byteorder.h +_ENDIAN_H_FILES+= /dev/null +. for FILE in ${_ENDIAN_H_FILES} +. if exists(${FILE}) +_ENDIAN_H?= ${FILE:S/\/usr\/include\///} +. endif +. endfor +MACHINE_ENDIAN!= \ + if ( \ + ${ECHO} "\#include <${_ENDIAN_H}>"; \ + ${ECHO} "\#ifndef BYTE_ORDER"; \ + ${ECHO} "\#ifdef _BIG_ENDIAN"; \ + ${ECHO} "\#define BYTE_ORDER 4321"; \ + ${ECHO} "\#else"; \ + ${ECHO} "\#define BYTE_ORDER 1234"; \ + ${ECHO} "\#endif"; \ + ${ECHO} "\#endif"; \ + ${ECHO} "BYTE_ORDER"; \ + ) | ${CC} -E - | ${GREP} "4321" >/dev/null 2>&1; \ + then \ + ${ECHO} big; \ + else \ + ${ECHO} little; \ + fi +MAKEFLAGS+= MACHINE_ENDIAN="${MACHINE_ENDIAN}" +. endif +_MAME_CPU.big-endian= risc +_MAME_CPU.little-endian= risc_lsb +MAME_CPU.${MACHINE_ARCH}?= ${_MAME_CPU.${MACHINE_ENDIAN}-endian} +.endif + +# Determine which operating system defaults to use. +MAME_ARCH.NetBSD?= netbsd +MAME_ARCH.Linux?= linux +MAME_ARCH.SunOS?= solaris +.if !defined(MAME_ARCH.${OPSYS}) +MAME_ARCH.${OPSYS}?= generic +.endif + +MAKE_FLAGS+= DISPLAY_METHOD="${MAME_DISP_METHOD}" +MAKE_FLAGS+= MY_CPU="${MAME_CPU.${MACHINE_ARCH}}" +MAKE_FLAGS+= ARCH="${MAME_ARCH.${OPSYS}}" + +.if exists({${X11BASE}/include/X11/extensions/xf86dga.h) +MAKE_FLAGS+= X11_DGA=1 .endif -.if exists(${X11BASE}/include/X11/extensions/xf86dga.h) -NETBSD_DGA= yes -.else -NETBSD_DGA= no + +# If supported, add appropriate definitions to build joystick drivers. +.if exists(/usr/include/machine/joystick.h) || \ + exists(/usr/include/linux/joystick.h) +MAKE_FLAGS+= JOY_I386=1 +.endif +.if ${OPSYS} == "NetBSD" +. if exists(/usr/lib/libusb.a) +MAKE_FLAGS+= JOY_USB=1 +. endif .endif -post-patch: - (cd ${WRKSRC}/doc && ${SED} 's|@ROMPATH@|${ROMPATH}|;s|@SPOOLDIR@|${SPOOLDIR}|' \ - xmamerc.dist >xmessrc) +OWN_DIRS= ${SPOOLDIR} + +post-configure: + cd ${WRKSRC}/doc; \ + ${SED} -e "s|@ROMPATH@|${ROMPATH}|g" \ + -e "s|@SPOOLDIR@|${SPOOLDIR}|g" \ + xmamerc.dist > ${TARGET}rc +.if ${MAKE_FLAGS:M*USB*} != "" + ${LN} -fs /usr/include/usb.h ${BUILDLINK_DIR}/include + for FILE in /usr/lib/libusb*; do \ + ${LN} -fs $$FILE ${BUILDLINK_DIR}/lib; \ + done +.endif do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} xmess.${DISPLAY_METHOD} \ - ${PREFIX}/bin/xmess) - (cd ${WRKSRC}/doc && ${INSTALL_MAN} xmess.6 \ - ${PREFIX}/man/man6/xmess.6) + ${INSTALL_PROGRAM} ${WRKSRC}/${TARGET}.${MAME_DISP_METHOD} \ + ${PREFIX}/bin/${TARGET} + ${INSTALL_MAN} ${WRKSRC}/doc/xmame.6 \ + ${PREFIX}/man/man6/${TARGET}.6 ${INSTALL_DATA_DIR} ${ROMPATH} - (cd ${WRKSRC}/doc && ${INSTALL_DATA} xmessrc ${ROMPATH}/xmessrc) - @${ECHO} Remember to set ROMPATH to ${ROMPATH}. + ${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" - -# This has to come after bsd.pkg.mk to make sure we have FILESDIR -.if ${MACHINE_ARCH} == "m68k" -MAME_CPU= m68k -.elif ${MACHINE_ARCH} == "alpha" -MAME_CPU= alpha -.elif ${MACHINE_ARCH} == "i386" -MAME_CPU= i386 -.else -# Rather than enumerating all CPU types, check machine/endian.h -ENDIAN!= ${SH} ${FILESDIR}/endian.sh -.if ${ENDIAN} == "LITTLE_ENDIAN" -MAME_CPU= risc_lsb -.else -MAME_CPU= risc -.endif -.endif diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo index cf01e1ac826..4cc1c31978e 100644 --- a/emulators/xmess/distinfo +++ b/emulators/xmess/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2001/09/02 23:04:23 kristerw Exp $ +$NetBSD: distinfo,v 1.2 2002/01/03 00:19:01 kristerw Exp $ -SHA1 (xmame-0.37b15.2.tar.bz2) = 1221f8d8bfc1d60037043fa05a37c173e6688b99 -Size (xmame-0.37b15.2.tar.bz2) = 6567701 bytes -SHA1 (patch-aa) = f3163c20075092e5f70e488002d5e88154b56d6a +SHA1 (xmame-0.56.2.tar.bz2) = a6fa58be23231d919540f5b3c619a1f2565b03e8 +Size (xmame-0.56.2.tar.bz2) = 7049295 bytes +SHA1 (patch-aa) = be131167296c50e3aea55da46288dfc16bf3ad8e SHA1 (patch-ae) = dfd2f103139dbf1f575cf00d8feda75085db39be diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa index f5059d01272..0fab76f2388 100644 --- a/emulators/xmess/patches/patch-aa +++ b/emulators/xmess/patches/patch-aa @@ -1,82 +1,20 @@ -$NetBSD: patch-aa,v 1.13 2001/09/02 23:04:23 kristerw Exp $ ---- makefile.unix.orig Thu Aug 23 02:48:30 2001 -+++ makefile.unix Sat Sep 1 12:19:39 2001 -@@ -32,7 +32,7 @@ +$NetBSD: patch-aa,v 1.14 2002/01/03 00:19:01 kristerw Exp $ +--- makefile.unix.orig Wed Jan 2 01:32:01 2002 ++++ makefile.unix Wed Jan 2 18:44:08 2002 +@@ -32,7 +32,6 @@ #set TARGET to "mame" (without the ") to compile xmame and to "mess" to #compile xmess. -TARGET = mame -+TARGET = mess ############################################################################## -@@ -189,7 +189,7 @@ +@@ -211,7 +210,7 @@ # *** xmameroot, this is the default rompath, place where the highscores are # stored, global rc location etc. Since most of these are configurable through # the rc-file anyway, there are no longer seperate defines for each. -XMAMEROOT = $(PREFIX)/lib/x$(TARGET) -+XMAMEROOT = $(PREFIX)/share/xmess ++XMAMEROOT = $(PREFIX)/share/x$(TARGET) ############################################################################## -@@ -197,7 +197,7 @@ - ############################################################################## - - ### i386 + gnu-asm --MY_CPU = i386 -+MY_CPU = ${MAME_CPU} - ### i386 no asm - # MY_CPU = i386_noasm - ### ia64 -@@ -218,11 +218,11 @@ - ############################################################################## - - ### Linux --ARCH = linux -+# ARCH = linux - ### FreeBSD - # ARCH = freebsd - ### NetBSD --# ARCH = netbsd -+ARCH = netbsd - ### OpenBSD - # ARCH = openbsd - ### Solaris / SunOS -@@ -255,11 +255,13 @@ - # X Input Extensions based joystick, this is known to not work right now ;| - # JOY_X11 = 1 - # On iX86 based OS's, if supported, you can use standard joystick driver. --# JOY_I386 = 1 -+ifeq (${NETBSD_JOYSTICK},yes) -+JOY_I386 = 1 -+endif - # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati. - # JOY_PAD = 1 - # NetBSD/FreeBSD USB joystick support. --# JOY_USB = 1 -+JOY_USB = 1 - - - ############################################################################## -@@ -307,7 +309,9 @@ - # MIT-Shared Memory X Extensions, comment the - X11_MITSHM = 1 - # XFree86 DGA --# X11_DGA = 1 -+ifeq (${NETBSD_DGA},yes) -+X11_DGA = 1 -+endif - # The XIL library (Solaris 2.5.1 and higher), uncomment - # X11_XIL = 1 - -@@ -316,8 +320,8 @@ - # X11INC = -I/usr/include/X11 - # X11LIB = -L/usr/lib/X11 - # standard location for XFree86 --X11INC = -I/usr/X11R6/include --X11LIB = -L/usr/X11R6/lib -+X11INC = -I${PREFIX}/include -I${X11BASE}/include -+X11LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib - # for Sun systems - # X11INC = -I/usr/openwin/include - # X11LIB = -L/usr/openwin/lib -- cgit v1.2.3