1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00

[PATCH] ports/emulators/fmsx is outdated, update supplied

Last update of ports/emulators/fmsx occured more than 3
	years ago.  A few version were issued since then, recent
	is 2.7 that is significantly improved. Some of port patches
	are integrated.

- Added patch to use sys/soundcard.h
- Added patch to be able to select the BPP level (BPP32 didn't work
  on my machine, see http://www.msx.org/newspost149.html for info)

PR:		ports/60825
Submitted by:	Eugene Grosbein <eugen@grosbein.pp.ru>
Reviewed by:	edwin@mavetju.org
Approved by:	maintainer timeout
This commit is contained in:
Edwin Groothuis 2004-02-28 00:35:27 +00:00
parent 726ff233bf
commit defbc605c2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=102335
10 changed files with 65 additions and 54 deletions

View File

@ -6,21 +6,42 @@
#
PORTNAME= fmsx
PORTVERSION= 2.2
PORTVERSION= 2.7
CATEGORIES= emulators
MASTER_SITES= http://fms.komkon.org/fMSX/
DISTNAME= fMSX22
DISTNAME= fMSX27
EXTRACT_SUFX= .tar.Z
MAINTAINER= dk@farm.org
COMMENT= The Portable MSX/MSX2/MSX2+ Emulator
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
USE_XLIB= yes
RESTRICTED= Legal status of distributed ROM images unclear
WRKSRC= ${WRKDIR}/MSX
OPTIONS= BPP16 "With BPP16" Off \
BPP24 "With BPP24" Off \
BPP32 "With BPP32 (see pkg-message)" On
.include <bsd.port.pre.mk>
post-patch:
.ifdef(WITH_BPP32)
${REINPLACE_CMD} -e 's/%%BPP%%/BPP32/' ${WRKSRC}/Makefile
.endif
.ifdef(WITH_BPP24)
${REINPLACE_CMD} -e 's/%%BPP%%/BPP24/' ${WRKSRC}/Makefile
.endif
.ifdef(WITH_BPP16)
${REINPLACE_CMD} -e 's/%%BPP%%/BPP16/' ${WRKSRC}/Makefile
.endif
do-install:
${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${PREFIX}/bin
${REINPLACE_CMD} "s,PREFIX,${PREFIX},g" ${PREFIX}/bin/fmsx
${INSTALL_PROGRAM} ${WRKSRC}/fmsx ${PREFIX}/bin/fmsx.bin
${INSTALL_PROGRAM} ${WRKSRC}/rddsk ${PREFIX}/bin/fmsx-rddsk
${INSTALL_PROGRAM} ${WRKSRC}/wrdsk ${PREFIX}/bin/fmsx-wrdsk
@ -31,4 +52,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/fmsx
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1 +1 @@
MD5 (fMSX22.tar.Z) = 15f9e0d4cd28f16d9de81f75cfd63ce4
MD5 (fMSX27.tar.Z) = 419b3b637067f83465d61b32b0b09ab7

View File

@ -1,3 +1,3 @@
#!/bin/sh
exec /usr/local/bin/fmsx.bin -home /usr/local/share/fmsx "$@"
exec PREFIX/bin/fmsx.bin -home PREFIX/share/fmsx "$@"

View File

@ -0,0 +1,11 @@
--- SndUnix.c.orig Sat Feb 28 10:19:49 2004
+++ SndUnix.c Sat Feb 28 10:19:56 2004
@@ -75,7 +75,7 @@
#else /* SUN_AUDIO */
#ifdef __FreeBSD__
-#include <machine/soundcard.h>
+#include <sys/soundcard.h>
#endif
#ifdef __NetBSD__

View File

@ -1,26 +1,26 @@
--- Makefile.orig Fri Aug 4 02:23:33 2000
+++ Makefile Thu Aug 17 04:50:41 2000
@@ -43,11 +43,10 @@
--- Makefile.orig Mon Dec 31 20:01:16 2001
+++ Makefile Sat Feb 28 11:20:12 2004
@@ -51,10 +51,10 @@
# If you are getting linker errors about not found X11 functions,
# change the -L/usr/X11R6/lib to the directory where X11
# libraries libX11.* and libXext.* are located on your system.
-CC = gcc
-DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM \
- -DDISK -DNARROW -DSOUND -DBPP16 -DZLIB
-CFLAGS = -O3 -Wall -I/usr/X11R6/include -L/usr/X11R6/lib ${DEFINES}
+CC ?= gcc
+DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \
-DDISK -DNARROW -DSOUND -DBPP16
-CFLAGS = -O3 -fomit-frame-pointer \
- -I/usr/X11/include -L/usr/X11/lib ${DEFINES}
+CFLAGS += -I${X11BASE}/include ${DEFINES}
OBJECTS = fMSX.o MSX.o Z80.o AY8910.o SCC.o V9938.o Patch.o Debug.o \
Disk.o Unix.o LibUnix.o SndUnix.o MIDI.o
@@ -63,7 +62,7 @@
+ -DDISK -DNARROW -DSOUND -D%%BPP%% -DZLIB
+CFLAGS = -O3 -Wall -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES}
OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Sound.o \
Z80.o I8255.o AY8910.o YM2413.o SCC.o V9938.o I8251.o \
Unix.o LibUnix.o SndUnix.o
@@ -71,7 +71,7 @@
# fMSX Unix/X requires X11 libraries. See note above if you are
# experiencing any problems.
fmsx: ${OBJECTS}
- ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11
+ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -L${X11BASE}/lib
- ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -lz
+ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11 -L${X11BASE}/lib -lz
# Clean up.
clean:

View File

@ -1,21 +0,0 @@
--- Unix.c.orig Thu Aug 3 20:10:32 2000
+++ Unix.c Wed Aug 16 16:14:50 2000
@@ -309,12 +309,16 @@
}
break;
- case XK_F9:
+ case XK_F6:
if(Control) AutoFire=!AutoFire;
break;
- case XK_F10:
+ case XK_F9:
if(Control) UseFont=UseFont? 0:FontBuf? 1:0;
+ break;
+
+ case XK_F10:
+ if(Control) LogSnd=!LogSnd;
break;
case XK_F12: ExitNow=1;break;

View File

@ -1,11 +0,0 @@
--- SndUnix.c.orig Mon Oct 13 00:19:55 2003
+++ SndUnix.c Mon Oct 13 00:20:18 2003
@@ -73,7 +73,7 @@
#else /* SUN_AUDIO */
-#ifdef LINUX
+#if defined(LINUX) || defined(__FreeBSD__)
#include <sys/soundcard.h>
#else
#include <machine/soundcard.h>

View File

@ -1,6 +1,6 @@
******* fMSX *******
The Portable MSX/MSX2/MSX2+ Emulator
version 2.2
version 2.7
by Marat Fayzullin <fms@cs.umd.edu>
WWW: http://fms.komkon.org/fMSX/

View File

@ -0,0 +1,10 @@
*******************************************************************
From http://www.msx.org/newspost149.html:
Also a tip for X11 users: if you get 'Opening window... FAILED'
when starting fMSX and you're using -DBPP32, try compiling with
-DBPP24 instead
For FreeBSD users: run "make clean config" and unselect BPP32 and
select BPP16 or BPP24 as options.
*******************************************************************

View File

@ -5,6 +5,7 @@ bin/fmsx-wrdsk
share/fmsx/CMOS.ROM
share/fmsx/CYRILLIC.FNT
share/fmsx/DISK.ROM
share/fmsx/FMPAC.ROM
share/fmsx/ITALIC.FNT
share/fmsx/KANJI.ROM
share/fmsx/MSX.ROM
@ -13,6 +14,6 @@ share/fmsx/MSX2EXT.ROM
share/fmsx/MSX2P.ROM
share/fmsx/MSX2PEXT.ROM
share/fmsx/PAINTER.ROM
@dirrm share/fmsx
share/doc/fmsx/fMSX.html
@dirrm share/doc/fmsx
%%PORTDOCS%%share/doc/fmsx/fMSX.html
%%PORTDOCS%%@dirrm share/fmsx
%%PORTDOCS%%@dirrm share/doc/fmsx