New frodo version, with SDL support. Runs at good speed on 24 bits display
now.
This commit is contained in:
espie
parent
6d8b4f799b
commit
1f07dfae2b
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2001/11/13 22:13:23 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2002/03/22 00:23:24 espie Exp $
|
||||
|
||||
COMMENT= "Commodore 64 emulator"
|
||||
|
||||
DISTNAME= FrodoV4_1a.Src
|
||||
PKGNAME= frodo-4.1b
|
||||
DISTFILES= FrodoV4_1a.Src${EXTRACT_SUFX} TkGui.tcl.gz
|
||||
EXTRACT_ONLY= FrodoV4_1a.Src${EXTRACT_SUFX}
|
||||
DISTNAME= FrodoV4_1b.Src
|
||||
PKGNAME= frodo-4.1bp1
|
||||
DISTFILES= FrodoV4_1b.Src${EXTRACT_SUFX}
|
||||
|
||||
CATEGORIES= emulators games
|
||||
NEED_VERSION= 1.496
|
||||
@ -24,6 +23,7 @@ CONFIGURE_STYLE= gnu
|
||||
USE_X11= Yes
|
||||
|
||||
RUN_DEPENDS= ::x11/tk/8.3
|
||||
LIB_DEPENDS= SDL:sdl-*-!no_x11:devel/sdl
|
||||
|
||||
WISH=wish8.3
|
||||
FRODOLIBDIR=${PREFIX}/lib/frodo
|
||||
@ -36,12 +36,9 @@ MAKE_ENV=WISH=${WISH} FRODOLIBDIR=${FRODOLIBDIR}
|
||||
MASTER_SITES= http://iphcip1.physik.uni-mainz.de/~cbauer/ \
|
||||
ftp://sunsite.unc.edu/pub/micro/commodore/crossplatform/emulators/unix/
|
||||
|
||||
WRKDIST=${WRKDIR}/Frodo
|
||||
WRKDIST=${WRKDIR}/Frodo-4.1b
|
||||
WRKSRC=${WRKDIST}/Src
|
||||
|
||||
post-extract:
|
||||
zcat ${FULLDISTDIR}/TkGui.tcl.gz >${WRKDIST}/TkGui.tcl
|
||||
|
||||
post-patch:
|
||||
cp ${FILESDIR}/SID_openbsd.i ${WRKSRC}
|
||||
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-Src_Display_x_i,v 1.2 2001/02/06 22:40:17 espie Exp $
|
||||
--- Src/Display_x.i.orig Wed Aug 6 20:56:26 1997
|
||||
+++ Src/Display_x.i Sun Jan 14 02:20:07 2001
|
||||
$OpenBSD: patch-Src_Display_x_i,v 1.3 2002/03/22 00:23:24 espie Exp $
|
||||
--- Src/Display_x.i.orig Wed Jan 2 22:17:29 2002
|
||||
+++ Src/Display_x.i Thu Mar 14 01:48:46 2002
|
||||
@@ -4,6 +4,7 @@
|
||||
*
|
||||
* Frodo (C) 1994-1997 Christian Bauer
|
||||
* Frodo (C) 1994-1997,2002 Christian Bauer
|
||||
* X11 stuff by Bernd Schmidt/Lutz Vieweg
|
||||
+ * Support for visuals >8 bits by Michael Krause and Marc Espie
|
||||
*/
|
||||
|
||||
#include "CmdPipe.h"
|
||||
@@ -35,7 +36,9 @@ static XImage *img;
|
||||
#include "SAM.h"
|
||||
@@ -34,7 +35,9 @@ static XImage *img;
|
||||
static Visual *vis;
|
||||
static XVisualInfo visualInfo;
|
||||
static int bitdepth;
|
||||
@ -20,23 +20,7 @@ $OpenBSD: patch-Src_Display_x_i,v 1.2 2001/02/06 22:40:17 espie Exp $
|
||||
static int hsize;
|
||||
|
||||
// For LED error blinking
|
||||
@@ -382,13 +385,10 @@ int init_graphics(void)
|
||||
|
||||
screen = XDefaultScreen(display);
|
||||
rootwin = XRootWindow(display, screen);
|
||||
-#if 0
|
||||
if (XMatchVisualInfo(display, screen, 16, TrueColor, &visualInfo)) {
|
||||
+ } else if (XMatchVisualInfo(display, screen, 32, TrueColor, &visualInfo)) {
|
||||
} else if (XMatchVisualInfo(display, screen, 24, TrueColor, &visualInfo)) {
|
||||
- } else
|
||||
-#endif
|
||||
- if (XMatchVisualInfo(display, screen, 8, PseudoColor, &visualInfo)) {
|
||||
- /* for our HP boxes */
|
||||
+ } else if (XMatchVisualInfo(display, screen, 8, PseudoColor, &visualInfo)) {
|
||||
} else if (XMatchVisualInfo(display, screen, 8, GrayScale, &visualInfo)) {
|
||||
} else {
|
||||
fprintf(stderr, "Can't obtain appropriate X visual\n");
|
||||
@@ -398,7 +398,7 @@ int init_graphics(void)
|
||||
@@ -392,7 +395,7 @@ int init_graphics(void)
|
||||
vis = visualInfo.visual;
|
||||
bitdepth = visualInfo.depth;
|
||||
pixbytes = (bitdepth == 24 || bitdepth == 32 ? 4 : bitdepth == 12 || bitdepth == 16 ? 2 : 1);
|
||||
@ -45,7 +29,7 @@ $OpenBSD: patch-Src_Display_x_i,v 1.2 2001/02/06 22:40:17 espie Exp $
|
||||
|
||||
hsize = (DISPLAY_X + 3) & ~3;
|
||||
|
||||
@@ -419,6 +419,10 @@ int init_graphics(void)
|
||||
@@ -413,6 +416,10 @@ int init_graphics(void)
|
||||
img = XCreateImage(display, vis, bitdepth, ZPixmap, 0, bufmem, hsize, DISPLAY_Y, 32, 0);
|
||||
#endif
|
||||
|
||||
@ -56,7 +40,7 @@ $OpenBSD: patch-Src_Display_x_i,v 1.2 2001/02/06 22:40:17 espie Exp $
|
||||
cmap = XCreateColormap(display, rootwin, vis, AllocNone);
|
||||
|
||||
XParseColor(display, cmap, "#000000", &black);
|
||||
@@ -484,6 +488,33 @@ void C64Display::Update(void)
|
||||
@@ -478,6 +485,33 @@ void C64Display::Update(void)
|
||||
{
|
||||
// Update C64 display
|
||||
XSync(display, 0);
|
||||
@ -90,7 +74,7 @@ $OpenBSD: patch-Src_Display_x_i,v 1.2 2001/02/06 22:40:17 espie Exp $
|
||||
#if defined(X_USE_SHM)
|
||||
XShmPutImage(display, mywin, black_gc, img, 0, 0, 0, 0, DISPLAY_X, DISPLAY_Y, 0);
|
||||
#else
|
||||
@@ -566,7 +597,7 @@ void C64Display::Speedometer(int speed)
|
||||
@@ -560,7 +594,7 @@ void C64Display::Speedometer(int speed)
|
||||
|
||||
uint8 *C64Display::BitmapBase(void)
|
||||
{
|
||||
@ -99,7 +83,7 @@ $OpenBSD: patch-Src_Display_x_i,v 1.2 2001/02/06 22:40:17 espie Exp $
|
||||
}
|
||||
|
||||
|
||||
@@ -776,14 +807,32 @@ void C64Display::InitColors(uint8 *color
|
||||
@@ -770,14 +804,32 @@ void C64Display::InitColors(uint8 *color
|
||||
int i;
|
||||
XColor col;
|
||||
char str[20];
|
||||
|
||||
@ -1,22 +1,13 @@
|
||||
$OpenBSD: patch-Src_Makefile_in,v 1.2 2000/07/10 17:08:15 espie Exp $
|
||||
--- Src/Makefile.in.orig Wed Aug 6 20:56:29 1997
|
||||
+++ Src/Makefile.in Mon Jul 10 18:10:26 2000
|
||||
@@ -9,7 +9,8 @@ REVISION = 1
|
||||
CXX = @CXX@
|
||||
CPP = @CPP@
|
||||
LIBRARIES = @LIBRARIES@ @LIBS@
|
||||
-CFLAGS = @CFLAGS@ @X_CFLAGS@ -I./ -DBROKEN_JOYSTICK_H=@BROKEN_JOYSTICK_H@ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@
|
||||
+CFLAGS = @CFLAGS@ @X_CFLAGS@ -I./ -DBROKEN_JOYSTICK_H=@BROKEN_JOYSTICK_H@ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@ \
|
||||
$OpenBSD: patch-Src_Makefile_in,v 1.3 2002/03/22 00:23:24 espie Exp $
|
||||
--- Src/Makefile.in.orig Wed Jan 2 17:44:04 2002
|
||||
+++ Src/Makefile.in Thu Mar 14 01:52:32 2002
|
||||
@@ -8,7 +8,8 @@ REVISION = 1
|
||||
@SET_MAKE@
|
||||
CXX = @CXX@
|
||||
LIBS = @LIBS@
|
||||
-CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@
|
||||
+CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@ \
|
||||
+ -DWISH=\"${WISH}\" -DFRODOLIBDIR=\"${FRODOLIBDIR}\"
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
@@ -89,7 +90,7 @@ CPUC64.o: CPUC64.cpp CPUC64.h CPU_emulli
|
||||
CPU1541.o: CPU1541.cpp CPU1541.h CPU_emulline.i 1541job.h C64.h CIA.h Display.h
|
||||
CPU_common.o: CPU_common.cpp CPU_common.h
|
||||
VIC.o: VIC.cpp VIC.h C64.h CPUC64.h Display.h Prefs.h
|
||||
-SID.o: SID.cpp SID.h Prefs.h
|
||||
+SID.o: SID.cpp SID.h Prefs.h SID_openbsd.i
|
||||
CIA.o: CIA.cpp CIA.h CPUC64.h CPU1541.h VIC.h Prefs.h
|
||||
IEC.o: IEC.cpp IEC.h 1541fs.h 1541d64.h 1541t64.h Prefs.h Display.h
|
||||
1541fs.o: 1541fs.cpp 1541fs.h IEC.h main.h Prefs.h
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-Src_configure,v 1.1.1.1 2000/07/07 14:29:51 espie Exp $
|
||||
--- Src/configure.orig Wed Jul 5 14:45:45 2000
|
||||
+++ Src/configure Wed Jul 5 14:46:20 2000
|
||||
@@ -917,7 +917,7 @@ fi
|
||||
|
||||
$OpenBSD: patch-Src_configure,v 1.2 2002/03/22 00:23:24 espie Exp $
|
||||
--- Src/configure.orig Wed Jan 2 17:44:11 2002
|
||||
+++ Src/configure Thu Mar 14 01:53:49 2002
|
||||
@@ -2283,7 +2283,7 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
if [ x"$GXX" = "xyes" ]; then
|
||||
- CFLAGS="-O3 -g -fomit-frame-pointer -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes"
|
||||
+ CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes"
|
||||
- CFLAGS="-O2 -g -fomit-frame-pointer -Wall -Wno-unused -Wno-format"
|
||||
+ CFLAGS="${CFLAGS} -fomit-frame-pointer -Wall -Wno-unused -Wno-format"
|
||||
fi
|
||||
|
||||
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
||||
|
||||
Loading…
Reference in New Issue
Block a user