Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jun 2005 07:47:53 -0500 (CDT)
From:      Gunter Wambaugh <gunter@thewambaughs.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Gunter Wambaugh <gunter@thewambaughs.net>
Subject:   ports/82819: New port: emulators/o2em An Odyssey2 / Videopac console emulator 
Message-ID:  <200506301247.j5UClrVC057891@isengard.thewambaughs.net>
Resent-Message-ID: <200506301250.j5UCoJ4p069093@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         82819
>Category:       ports
>Synopsis:       New port: emulators/o2em An Odyssey2 / Videopac console emulator
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 30 12:50:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Gunter Wambaugh
>Release:        FreeBSD 5.4-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD isengard.thewambaughs.net 5.4-RELEASE-p2 FreeBSD 5.4-RELEASE-p2 #0: Fri Jun 10 15:15:52 CDT 2005 root@isengard.thewambaughs.net:/usr/obj/usr/src/sys/ISENGARD i386
>Description:
	An Odyssey2 / Videopac console emulator.
>How-To-Repeat:
>Fix:
--- o2em.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	o2em
#	o2em/pkg-descr
#	o2em/distinfo
#	o2em/pkg-message
#	o2em/pkg-plist
#	o2em/Makefile
#	o2em/files
#	o2em/files/patch-main.c
#	o2em/files/patch-vdc.c
#	o2em/files/patch-Makefile.debug
#	o2em/files/patch-Makefile.freebsd
#	o2em/files/patch-timefunc.c
#	o2em/files/patch-voice.c
#	o2em/files/patch-audio.c
#	o2em/pkg-install
#
echo c - o2em
mkdir -p o2em > /dev/null 2>&1
echo x - o2em/pkg-descr
sed 's/^X//' >o2em/pkg-descr << 'END-of-o2em/pkg-descr'
XOdyssey2 / Videopac+ emulator.
X
XWWW: http://o2em.sourceforge.net/
X
X- Gunter Wambaugh
Xtechgunter@yahoo.com
END-of-o2em/pkg-descr
echo x - o2em/distinfo
sed 's/^X//' >o2em/distinfo << 'END-of-o2em/distinfo'
XMD5 (o2em117src.zip) = 71bcb41480aba8dd5e79149a953b26a0
XSIZE (o2em117src.zip) = 466671
XMD5 (o2mainsamp.zip) = 9910ecb7d87fcd5696dd4dd00c792e33
XSIZE (o2mainsamp.zip) = 679495
END-of-o2em/distinfo
echo x - o2em/pkg-message
sed 's/^X//' >o2em/pkg-message << 'END-of-o2em/pkg-message'
X===============================================================================
X * The Odyessey2 ROM is included in the source, although the documentation says
X   it isn't.
X * The main voice samples are included with this port, but not the sidsamp 
X   which are only used by Sid the Spellbinder.  If you need these, put them in
X   PREFIX/o2em/voice/.
X * No cartridge ROMS are included.  
X * o2em has been patched to better fit with FreeBSD:
X   - don't assume the CWD contains roms/ bios/ voice/
X   - don't restrict the location of ROMS to roms/
X   - use the correct implementation of gettimeticks() for FreeBSD
X   - allow for the use of PREFIX when building
X   - don't set the volume to the MAX at runtime
X   - be compliant with allegro 4.1.12
X
XRead O2EM.txt.
X===============================================================================
END-of-o2em/pkg-message
echo x - o2em/pkg-plist
sed 's/^X//' >o2em/pkg-plist << 'END-of-o2em/pkg-plist'
Xbin/o2em
Xbin/dis48
X%%PORTDOCS%%%%DOCSDIR%%/O2EM.txt
X%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
X%%PORTDOCS%%%%DOCSDIR%%/license.txt
Xo2em/bios/o2rom.bin
Xo2em/voice/E480.WAV
Xo2em/voice/E481.WAV
Xo2em/voice/E482.WAV
Xo2em/voice/E483.WAV
Xo2em/voice/E484.WAV
Xo2em/voice/E485.WAV
Xo2em/voice/E486.WAV
Xo2em/voice/E487.WAV
Xo2em/voice/E488.WAV
Xo2em/voice/E489.WAV
Xo2em/voice/E48A.WAV
Xo2em/voice/E48B.WAV
Xo2em/voice/E48C.WAV
Xo2em/voice/E48D.WAV
Xo2em/voice/E48E.WAV
Xo2em/voice/E48F.WAV
Xo2em/voice/E490.WAV
Xo2em/voice/E491.WAV
Xo2em/voice/E492.WAV
Xo2em/voice/E493.WAV
Xo2em/voice/E494.WAV
Xo2em/voice/E495.WAV
Xo2em/voice/E496.WAV
Xo2em/voice/E497.WAV
Xo2em/voice/E498.WAV
Xo2em/voice/E499.WAV
Xo2em/voice/E49A.WAV
Xo2em/voice/E49B.WAV
Xo2em/voice/E49C.WAV
Xo2em/voice/E49D.WAV
Xo2em/voice/E49E.WAV
Xo2em/voice/E49F.WAV
Xo2em/voice/E4A0.WAV
Xo2em/voice/E4A1.WAV
Xo2em/voice/E4A2.WAV
Xo2em/voice/E4A3.WAV
Xo2em/voice/E4A4.WAV
Xo2em/voice/E4A5.WAV
Xo2em/voice/E4A6.WAV
Xo2em/voice/E4A7.WAV
Xo2em/voice/E4A8.WAV
Xo2em/voice/E4A9.WAV
Xo2em/voice/E4AA.WAV
Xo2em/voice/E4AB.WAV
Xo2em/voice/E4AC.WAV
Xo2em/voice/E4AD.WAV
Xo2em/voice/E4AE.WAV
Xo2em/voice/E4AF.WAV
Xo2em/voice/E4B0.WAV
Xo2em/voice/E4B1.WAV
Xo2em/voice/E4B2.WAV
Xo2em/voice/E4B3.WAV
Xo2em/voice/E4B4.WAV
Xo2em/voice/E4B5.WAV
Xo2em/voice/E4B6.WAV
Xo2em/voice/E4B7.WAV
Xo2em/voice/E4B8.WAV
Xo2em/voice/E4B9.WAV
Xo2em/voice/E4BA.WAV
Xo2em/voice/E4BB.WAV
Xo2em/voice/E4BC.WAV
Xo2em/voice/E4BD.WAV
Xo2em/voice/E4BE.WAV
Xo2em/voice/E4BF.WAV
Xo2em/voice/E4C0.WAV
Xo2em/voice/E4C1.WAV
Xo2em/voice/E4C2.WAV
Xo2em/voice/E4C3.WAV
Xo2em/voice/E4C4.WAV
Xo2em/voice/E4C5.WAV
Xo2em/voice/E4C6.WAV
Xo2em/voice/E4C7.WAV
Xo2em/voice/E4C8.WAV
Xo2em/voice/E4C9.WAV
Xo2em/voice/E4CA.WAV
Xo2em/voice/E4FA.WAV
Xo2em/voice/E4FB.WAV
Xo2em/voice/E880.WAV
Xo2em/voice/E881.WAV
Xo2em/voice/E882.WAV
Xo2em/voice/E883.WAV
Xo2em/voice/E884.WAV
Xo2em/voice/E885.WAV
Xo2em/voice/E886.WAV
Xo2em/voice/E887.WAV
Xo2em/voice/E888.WAV
Xo2em/voice/E889.WAV
Xo2em/voice/E88A.WAV
Xo2em/voice/E88B.WAV
Xo2em/voice/E88C.WAV
Xo2em/voice/E88D.WAV
Xo2em/voice/E88E.WAV
Xo2em/voice/E88F.WAV
Xo2em/voice/E890.WAV
Xo2em/voice/E891.WAV
Xo2em/voice/E892.WAV
Xo2em/voice/E893.WAV
Xo2em/voice/E894.WAV
Xo2em/voice/E895.WAV
Xo2em/voice/E980.WAV
Xo2em/voice/E981.WAV
Xo2em/voice/E982.WAV
Xo2em/voice/E983.WAV
Xo2em/voice/E984.WAV
Xo2em/voice/E985.WAV
Xo2em/voice/E986.WAV
Xo2em/voice/E987.WAV
Xo2em/voice/E988.WAV
Xo2em/voice/E989.WAV
Xo2em/voice/E98A.WAV
Xo2em/voice/E98B.WAV
Xo2em/voice/E98C.WAV
Xo2em/voice/E98D.WAV
Xo2em/voice/E98E.WAV
Xo2em/voice/E98F.WAV
Xo2em/voice/E990.WAV
Xo2em/voice/E991.WAV
Xo2em/voice/E992.WAV
Xo2em/voice/E993.WAV
Xo2em/voice/E994.WAV
Xo2em/voice/E995.WAV
Xo2em/voice/E996.WAV
Xo2em/voice/EA80.WAV
Xo2em/voice/EA81.WAV
Xo2em/voice/EA82.WAV
Xo2em/voice/EA83.WAV
Xo2em/voice/EA84.WAV
Xo2em/voice/EA85.WAV
Xo2em/voice/EA86.WAV
Xo2em/voice/EA87.WAV
Xo2em/voice/EA88.WAV
Xo2em/voice/EA89.WAV
Xo2em/voice/EA8A.WAV
Xo2em/voice/EA8B.WAV
Xo2em/voice/EA8C.WAV
Xo2em/voice/EA8D.WAV
Xo2em/voice/EA8E.WAV
Xo2em/voice/EA8F.WAV
Xo2em/voice/EA90.WAV
Xo2em/voice/EA91.WAV
Xo2em/voice/EA92.WAV
Xo2em/voice/EA93.WAV
Xo2em/voice/EA94.WAV
Xo2em/voice/EA95.WAV
Xo2em/voice/EA96.WAV
Xo2em/voice/EA97.WAV
Xo2em/voice/EA98.WAV
Xo2em/voice/EA99.WAV
Xo2em/voice/EA9A.WAV
Xo2em/voice/EA9B.WAV
Xo2em/voice/EA9C.WAV
Xo2em/voice/EA9D.WAV
Xo2em/voice/EA9E.WAV
Xo2em/voice/EA9F.WAV
Xo2em/voice/EAA0.WAV
Xo2em/voice/EAA1.WAV
Xo2em/voice/EAA2.WAV
Xo2em/voice/EAA3.WAV
Xo2em/voice/EAA4.WAV
Xo2em/voice/EAA5.WAV
Xo2em/voice/EAA6.WAV
Xo2em/voice/EAA7.WAV
X@dirrm o2em/voice
X@dirrm o2em/bios
X@dirrm o2em/roms
X@dirrm o2em
END-of-o2em/pkg-plist
echo x - o2em/Makefile
sed 's/^X//' >o2em/Makefile << 'END-of-o2em/Makefile'
X# New ports collection makefile for:	o2em
X# Date created:				24 June 2005
X# Whom:					Gunter Wambaugh <techgunter@yahoo.com>
X#
X# $FreeBSD$
X#
X
XPORTNAME=		o2em
XPORTVERSION=		1.17
XCATEGORIES=		emulators games
XMASTER_SITES=		${MASTER_SITE_SOURCEFORGE}o2em/:1 \
X			http://o2em.sourceforge.net/files/:2
XDISTFILES=		o2em117src.zip:1 \
X			o2mainsamp.zip:2
X
XMAINTAINER=		techgunter@yahoo.com
XCOMMENT=		An Odyssey2 / Videopac console emulator
X
XLIB_DEPENDS=		alleg.41:${PORTSDIR}/devel/allegro
X
XWRKSRC=			${WRKDIR}/o2em117src
XMAKEFILE=		Makefile.freebsd
XUSE_ZIP=		yes
XUSE_GMAKE=		yes
XUSE_REINPLACE=		yes
X
Xpost-extract:
X	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|h|txt)" -print0 | \
X		${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
X
Xdo-install:
X	${INSTALL_PROGRAM} ${WRKSRC}/src/o2em ${PREFIX}/bin
X	${INSTALL_PROGRAM} ${WRKSRC}/src/dis48 ${PREFIX}/bin
X	@${MKDIR} ${PREFIX}/${PORTNAME}
X	@${MKDIR} ${PREFIX}/${PORTNAME}/bios
X	${INSTALL_DATA} ${WRKSRC}/O2ROM.BIN ${PREFIX}/${PORTNAME}/bios/o2rom.bin
X	@${MKDIR} ${PREFIX}/${PORTNAME}/voice
X	${INSTALL_DATA} ${WRKDIR}/*.WAV ${PREFIX}/${PORTNAME}/voice/
X	@${MKDIR} ${DOCSDIR}
X	${INSTALL_DATA} ${WRKSRC}/docs/O2EM.txt ${DOCSDIR}
X	${INSTALL_DATA} ${WRKSRC}/docs/changelog.txt ${DOCSDIR}
X	${INSTALL_DATA} ${WRKSRC}/docs/license.txt ${DOCSDIR}
X
Xpost-install:
X	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
X	@${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.mk>
END-of-o2em/Makefile
echo c - o2em/files
mkdir -p o2em/files > /dev/null 2>&1
echo x - o2em/files/patch-main.c
sed 's/^X//' >o2em/files/patch-main.c << 'END-of-o2em/files/patch-main.c'
X--- ../o2em117src.old/src/main.c	Sat Jun 25 12:17:20 2005
X+++ ./src/main.c	Sat Jun 25 12:11:50 2005
X@@ -84,7 +84,7 @@
X 	
X 	if (argc < 2) {
X 		printf("Use: o2em <file> [options]\n");
X-		printf("<file> = file to load with extension\n");
X+		printf("<file> = file to load\n");
X 		#ifndef ALLEGRO_DOS
X 		printf("-wsize=n         Window size (1-4)\n");
X 		printf("-fullscreen      Full screen mode\n");
X@@ -148,7 +148,6 @@
X     strcpy(xrom,"");
X 	read_default_config();
X  
X-    strcpy(file,"roms/");
X 	for(i=1; i<argc; i++) {
X 		if (argv[i][0] != '-') 	{
X 			strncat(file,argv[i],MAXC-1);
X@@ -186,20 +185,11 @@
X 	init_audio();
X 	printf("Using Allegro %s\n",allegro_id);
X     
X-    strcpy (xrom, "roms/");
X-    file_name(xrom);
X-
X-    if (contax < 3)
X-                 {
X-                 printf("\nROMs directory empty!\n");
X-                 exit(EXIT_FAILURE);
X-                 }
X-                 
X     app_data.crc = crc32_file(file);
X     crcx = app_data.crc;
X-    suck_roms();
X     
X-    strcpy (xbios, "bios/");
X+    strcpy (xbios, PREFIX);
X+    strcat (xbios, "/o2em/bios/");
X     file_name(xbios);
X     suck_bios();
X 
X@@ -215,7 +205,10 @@
X     if (!strcmp(bios,"g7400")) strcpy(bios,g7400);
X     if (!strcmp(bios,"c52")) strcpy(bios,c52);
X     if (!strcmp(bios,"jopac")) strcpy(bios,jopac);
X-    if ((!strcmp(bios,"")) || (!strcmp(bios,"o2rom"))) strcpy(bios,"bios/o2rom.bin");
X+    if ((!strcmp(bios,"")) || (!strcmp(bios,"o2rom"))){
X+         strcpy(bios, PREFIX); 
X+         strcat(bios,"/o2em/bios/o2rom.bin");
X+    }
X     
X     
X     
X@@ -630,8 +623,8 @@
X     int i;
X     for (i=0; i<contax; ++i)
X         {
X-    
X-                 strcpy(biossux,"bios/");
X+                 strcpy(biossux, PREFIX);
X+                 strcat(biossux,"/o2em/bios/");
X                  strcat(biossux,arkivo[i]);
X   
X                  app_data.crc = crc32_file(biossux);
END-of-o2em/files/patch-main.c
echo x - o2em/files/patch-vdc.c
sed 's/^X//' >o2em/files/patch-vdc.c << 'END-of-o2em/files/patch-vdc.c'
Xdiff -urN ../o2em117src.old/src/vdc.c ./src/vdc.c
X--- ../o2em117src.old/src/vdc.c	Fri Jun 24 16:02:21 2005
X+++ ./src/vdc.c	Fri Jun 24 16:00:34 2005
X@@ -339,8 +339,7 @@
X 			last=t;
X 		}
X 		if (curr) {
X-			text_mode(0);
X-			textprintf(bmp, font, 20 , 4, 7, "FPS: %3d",(int)((200.0*TICKSPERSEC)/curr+0.5));
X+			textprintf_ex(bmp, font, 20, 4, 7, 0, "FPS: %3d",(int)((200.0*TICKSPERSEC)/curr+0.5));
X 		}
X 	}
X 
X@@ -528,9 +527,8 @@
X 
X 
X static void txtmsg(int x, int y, int c, const char *s){
X-	text_mode(-1);
X-	textout_centre(bmp, font, s, x+1 , y+1, 32);
X-	textout_centre(bmp, font, s, x , y, c);
X+	textout_centre_ex(bmp, font, s, x+1 , y+1, 32, -1);
X+	textout_centre_ex(bmp, font, s, x , y, c, -1);
X }
X 
X 
X@@ -604,7 +602,6 @@
X 		init_keyboard();
X 	}
X 
X-	set_window_close_button(TRUE);
X-	set_window_close_hook(window_close_hook);
X+	set_close_button_callback(window_close_hook);
X 
X }
END-of-o2em/files/patch-vdc.c
echo x - o2em/files/patch-Makefile.debug
sed 's/^X//' >o2em/files/patch-Makefile.debug << 'END-of-o2em/files/patch-Makefile.debug'
Xdiff -urN ../o2em117src.old/Makefile.debug ./Makefile.debug
X--- ../o2em117src.old/Makefile.debug	Wed Dec 31 18:00:00 1969
X+++ ./Makefile.debug	Fri Jun 24 16:05:27 2005
X@@ -0,0 +1,64 @@
X+CC = gcc
X+
X+CFLAGS = -g -Wall -I${PREFIX}/include -DFREEBSD -DPREFIX=\"${PREFIX}\"
X+LFLAGS = 
X+LIBALLEG = -L${PREFIX}/lib -lalleg -lalleg_unsharable
X+
X+
X+all: o2em dis48
X+
X+clean:
X+	rm -f src/audio.o src/cpu.o src/cset.o src/keyboard.o src/main.o src/table.o src/vdc.o src/vmachine.o src/debug.o src/timefunc.o src/voice.o src/crc32.o src/vpp_cset.o src/vpp.o src/dis48.o src/o2em src/dis48
X+
X+
X+o2em:	audio.o cpu.o cset.o keyboard.o main.o table.o vdc.o vmachine.o debug.o timefunc.o voice.o crc32.o vpp_cset.o vpp.o
X+	$(CC) $(LFLAGS) src/audio.o src/cpu.o src/cset.o src/keyboard.o src/main.o src/table.o src/vdc.o src/vmachine.o src/debug.o src/timefunc.o src/voice.o src/crc32.o src/vpp_cset.o src/vpp.o -o src/o2em $(LIBALLEG)
X+
X+dis48:	dis48.o table.o
X+	$(CC) $(LFLAGS) src/dis48.o src/table.o -o src/dis48
X+
X+
X+audio.o:	audio.c audio.h cpu.h types.h config.h vmachine.h
X+	$(CC) $(CFLAGS) -c src/audio.c -o src/audio.o
X+
X+cpu.o:	cpu.c cpu.h types.h vmachine.h keyboard.h voice.h vdc.h vpp.h
X+	$(CC) $(CFLAGS) -c src/cpu.c -o src/cpu.o
X+	
X+cset.o:	cset.c cset.h types.h 
X+	$(CC) $(CFLAGS) -c src/cset.c -o src/cset.o
X+	
X+debug.o:	debug.c debug.h cpu.h keyboard.h vmachine.h audio.h vdc.h table.h
X+	$(CC) $(CFLAGS) -c src/debug.c -o src/debug.o
X+	
X+dis48.o:	dis48.c types.h table.h
X+	$(CC) $(CFLAGS) -c src/dis48.c -o src/dis48.o
X+	
X+keyboard.o:	keyboard.c keyboard.h types.h cpu.h vmachine.h vdc.h audio.h voice.h vpp.h
X+	$(CC) $(CFLAGS) -c src/keyboard.c -o src/keyboard.o
X+	
X+main.o:	main.c crc32.h audio.h vmachine.h config.h vdc.h cpu.h debug.h keyboard.h voice.h
X+	$(CC) $(CFLAGS) -c src/main.c -o src/main.o
X+	
X+table.o:	table.c table.h cpu.h
X+	$(CC) $(CFLAGS) -c src/table.c -o src/table.o
X+	
X+vdc.o:	vdc.c vdc.h types.h vmachine.h config.h keyboard.h cset.h timefunc.h cpu.h vpp.h
X+	$(CC) $(CFLAGS) -c src/vdc.c -o src/vdc.o
X+	
X+vmachine.o:	vmachine.c vmachine.h audio.h types.h cpu.h keyboard.h config.h debug.h vdc.h vpp.h timefunc.h voice.h
X+	$(CC) $(CFLAGS) -c src/vmachine.c -o src/vmachine.o
X+
X+timefunc.o: timefunc.c timefunc.h
X+	$(CC) $(CFLAGS) -c src/timefunc.c -o src/timefunc.o
X+
X+voice.o: voice.c voice.h vmachine.h cpu.h
X+	$(CC) $(CFLAGS) -c src/voice.c -o src/voice.o
X+
X+crc32.o: crc32.c crc32.h
X+	$(CC) $(CFLAGS) -c src/crc32.c -o src/crc32.o
X+
X+vpp_cset.o: vpp_cset.c vpp_cset.h
X+	$(CC) $(CFLAGS) -c src/vpp_cset.c -o src/vpp_cset.o
X+
X+vpp.o: vpp.c vpp.h types.h vpp_cset.h vmachine.h vdc.h
X+	$(CC) $(CFLAGS) -c src/vpp.c -o src/vpp.o
END-of-o2em/files/patch-Makefile.debug
echo x - o2em/files/patch-Makefile.freebsd
sed 's/^X//' >o2em/files/patch-Makefile.freebsd << 'END-of-o2em/files/patch-Makefile.freebsd'
Xdiff -urN ../o2em117src.old/Makefile.freebsd ./Makefile.freebsd
X--- ../o2em117src.old/Makefile.freebsd	Wed Dec 31 18:00:00 1969
X+++ ./Makefile.freebsd	Fri Jun 24 16:05:40 2005
X@@ -0,0 +1,65 @@
X+CC = gcc
X+
X+CFLAGS = -O3 -Wall -fomit-frame-pointer -I${PREFIX}/include -DFREEBSD -DPREFIX=\"${PREFIX}\"
X+LFLAGS = -s
X+LIBALLEG = -L${PREFIX}/lib -lalleg -lalleg_unsharable
X+
X+
X+all: o2em dis48
X+
X+clean:
X+	rm -f src/audio.o src/cpu.o src/cset.o src/keyboard.o src/main.o src/table.o src/vdc.o src/vmachine.o src/debug.o src/timefunc.o src/voice.o src/crc32.o src/vpp_cset.o src/vpp.o src/dis48.o src/o2em src/dis48
X+
X+
X+o2em:	audio.o cpu.o cset.o keyboard.o main.o table.o vdc.o vmachine.o debug.o timefunc.o voice.o crc32.o vpp_cset.o vpp.o
X+	$(CC) $(LFLAGS) src/audio.o src/cpu.o src/cset.o src/keyboard.o src/main.o src/table.o src/vdc.o src/vmachine.o src/debug.o src/timefunc.o src/voice.o src/crc32.o src/vpp_cset.o src/vpp.o -o src/o2em $(LIBALLEG)
X+
X+dis48:	dis48.o table.o
X+	$(CC) $(LFLAGS) src/dis48.o src/table.o -o src/dis48
X+
X+
X+audio.o:	audio.c audio.h cpu.h types.h config.h vmachine.h
X+	$(CC) $(CFLAGS) -c src/audio.c -o src/audio.o
X+
X+cpu.o:	cpu.c cpu.h types.h vmachine.h keyboard.h voice.h vdc.h vpp.h
X+	$(CC) $(CFLAGS) -c src/cpu.c -o src/cpu.o
X+	
X+cset.o:	cset.c cset.h types.h 
X+	$(CC) $(CFLAGS) -c src/cset.c -o src/cset.o
X+	
X+debug.o:	debug.c debug.h cpu.h keyboard.h vmachine.h audio.h vdc.h table.h
X+	$(CC) $(CFLAGS) -c src/debug.c -o src/debug.o
X+	
X+dis48.o:	dis48.c types.h table.h
X+	$(CC) $(CFLAGS) -c src/dis48.c -o src/dis48.o
X+	
X+keyboard.o:	keyboard.c keyboard.h types.h cpu.h vmachine.h vdc.h audio.h voice.h vpp.h
X+	$(CC) $(CFLAGS) -c src/keyboard.c -o src/keyboard.o
X+	
X+main.o:	main.c crc32.h audio.h vmachine.h config.h vdc.h cpu.h debug.h keyboard.h voice.h
X+	$(CC) $(CFLAGS) -c src/main.c -o src/main.o
X+	
X+table.o:	table.c table.h cpu.h
X+	$(CC) $(CFLAGS) -c src/table.c -o src/table.o
X+	
X+vdc.o:	vdc.c vdc.h types.h vmachine.h config.h keyboard.h cset.h timefunc.h cpu.h vpp.h
X+	$(CC) $(CFLAGS) -c src/vdc.c -o src/vdc.o
X+	
X+vmachine.o:	vmachine.c vmachine.h audio.h types.h cpu.h keyboard.h config.h debug.h vdc.h vpp.h timefunc.h voice.h
X+	$(CC) $(CFLAGS) -c src/vmachine.c -o src/vmachine.o
X+
X+timefunc.o: timefunc.c timefunc.h
X+	$(CC) $(CFLAGS) -c src/timefunc.c -o src/timefunc.o
X+
X+voice.o: voice.c voice.h vmachine.h cpu.h
X+	$(CC) $(CFLAGS) -c src/voice.c -o src/voice.o
X+
X+crc32.o: crc32.c crc32.h
X+	$(CC) $(CFLAGS) -c src/crc32.c -o src/crc32.o
X+
X+vpp_cset.o: vpp_cset.c vpp_cset.h
X+	$(CC) $(CFLAGS) -c src/vpp_cset.c -o src/vpp_cset.o
X+
X+vpp.o: vpp.c vpp.h types.h vpp_cset.h vmachine.h vdc.h
X+	$(CC) $(CFLAGS) -c src/vpp.c -o src/vpp.o
X+
END-of-o2em/files/patch-Makefile.freebsd
echo x - o2em/files/patch-timefunc.c
sed 's/^X//' >o2em/files/patch-timefunc.c << 'END-of-o2em/files/patch-timefunc.c'
Xdiff -urN ../o2em117src.old/src/timefunc.c ./src/timefunc.c
X--- ../o2em117src.old/src/timefunc.c	Fri Jun 24 16:02:21 2005
X+++ ./src/timefunc.c	Fri Jun 24 16:00:46 2005
X@@ -43,7 +43,7 @@
X 
X #elif defined(ALLEGRO_UNIX) || defined(ALLEGRO_LINUX)
X 
X-#ifdef _BSD_SOURCE
X+#if defined(_BSD_SOURCE) || defined(FREEBSD)
X 
X /* Unix with gettimeofday */
X long gettimeticks(void){
END-of-o2em/files/patch-timefunc.c
echo x - o2em/files/patch-voice.c
sed 's/^X//' >o2em/files/patch-voice.c << 'END-of-o2em/files/patch-voice.c'
X--- ../o2em117src.old/src/voice.c	Sat Jun 25 12:47:22 2005
X+++ src/voice.c	Sat Jun 25 12:47:27 2005
X@@ -21,6 +21,7 @@
X #include "voice.h"
X #include "allegro.h"
X 
X+#define MAXC 1024
X 
X static SAMPLE *voices[9][128];
X static int voice_bank=0;
X@@ -33,7 +34,7 @@
X 
X void load_voice_samples(void){
X 	int bank, sam, i, ld=0;
X-	char name[40];
X+	char name[MAXC];
X 	SAMPLE *sp=NULL;
X 
X 	printf("Loading voice samples...  ");
X@@ -47,12 +48,12 @@
X 			else
X 				bank = 0xE4;
X 
X-			sprintf(name,"voice/%02x%02x.wav",bank,sam+0x80);
X+			sprintf(name,"%s/o2em/voice/%02x%02x.wav",PREFIX,bank,sam+0x80);
X 
X 			voices[i][sam] = load_sample(name);
X 
X 			if (!voices[i][sam]) {
X-				sprintf(name,"voice/%02X%02X.WAV",bank,sam+0x80);
X+				sprintf(name,"%s/o2em/voice/%02X%02X.WAV",PREFIX,bank,sam+0x80);
X 				voices[i][sam] = load_sample(name);
X 			}
X 
END-of-o2em/files/patch-voice.c
echo x - o2em/files/patch-audio.c
sed 's/^X//' >o2em/files/patch-audio.c << 'END-of-o2em/files/patch-audio.c'
X--- ../o2em117src.old/src/audio.c	Sat Jun 25 13:41:39 2005
X+++ ./src/audio.c	Sat Jun 25 13:42:08 2005
X@@ -118,7 +118,7 @@
X 			if (digi_driver->name && (strlen(digi_driver->name)>0)){
X 				printf("  Sound system initialized ok\n");
X 				printf("  Sound driver [%s] detected\n",digi_driver->name);
X-				set_volume(255,255);
X+				set_volume(-1,-1);
X 				init_sound_stream();
X 			} else {
X 				printf("  ERROR: could not initialize sound card\n");
END-of-o2em/files/patch-audio.c
echo x - o2em/pkg-install
sed 's/^X//' >o2em/pkg-install << 'END-of-o2em/pkg-install'
X#!/bin/sh
X
Xif [ "$2" = "POST-INSTALL" ]; then
X    mkdir ${PKG_PREFIX}/o2em/roms
Xfi
X
Xexit 0
END-of-o2em/pkg-install
exit
--- o2em.shar ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506301247.j5UClrVC057891>