Attachment #83690 for bug #119517




#

PORTNAME=	fuse
PORTVERSION=	0.9.0
CATEGORIES=	emulators
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	fuse-emulator

MAINTAINER=	yuri.pankov@gmail.com
COMMENT=	Free Unix (Sinclair ZX-)Spectrum Emulator

LIB_DEPENDS=	spectrum.6:${PORTSDIR}/emulators/libspectrum \
		765.4:${PORTSDIR}/emulators/lib765
		xml2.5:${PORTSDIR}/textproc/libxml2 \
		png.5:${PORTSDIR}/graphics/png

WANT_GNOME=		yes
WANT_SDL=		yes
USE_XLIB=		yes
USE_PERL5_BUILD=	yes
USE_GETOPT_LONG=	yes
GNU_CONFIGURE=		yes
CONFIGURE_ARGS=		--with-plus3-disk-prefix=${LOCALBASE}
CFLAGS+=	 `${LOCALBASE}/bin/libpng-config --I_opts` -I${LOCALBASE}/include

OPTIONS=	SMALLMEM "Low memory compile needed" off \
		GTK      "Use GTK1 user interface" off \
		GTK2	 "Use GTK2 user interface" on \
		SDL	 "Use SDL user interface" on \
		SVGALIB  "Use SVGAlib user interface" off \
		GCRYPT	 "Support digital signing of .RZX files" off

USE_GNOME=	libxml2 glib20 gtk20
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"

MAN1=		fuse.1

OPTIONS=	AO "Use libao for audio output" off \
		GCRYPT "Support digital signing of .RZX files" off \
		SAMPLERATE "Support for better beeper sound quality" on
.if !defined(WITHOUT_GTK)
USE_GNOME=		gtk12
.else
CONFIGURE_ARGS+=	--without-gtk
.endif

.include <bsd.port.pre.mk>
CONFIGURE_ARGS+=	--with-gtk2
USE_GNOME+=		gtk20
.endif

.if defined(WITH_SDL)
CONFIGURE_ARGS+=	--with-sdl
USE_SDL=		yes
.endif

.if defined(WITH_AO)
CONFIGURE_ARGS+=--with-libao
LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
.endif

.if defined(WITH_GCRYPT) || exists(${LOCALBASE}/include/gcrypt.h)
CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
LIB_DEPENDS+=	gcrypt.13:${PORTSDIR}/security/libgcrypt
.endif

.if !defined(WITHOUT_SAMPLERATE)
LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
.else
CONFIGURE_ARGS+=--without-libsamplerate
.endif

.if !defined(NOPORTDOCS)
post-install:

Lines 1-3 Link Here

(-)/usr/ports/emulators/fuse/distinfo (-3 / +3 lines)
1	MD5 (fuse-0.8.0.1.tar.gz) = 34f85578c64d94ebf0cca309f837d502	1	MD5 (fuse-0.9.0.tar.gz) = e6434ae8d5d97613c5ae0c7d42df0e49
2	SHA256 (fuse-0.8.0.1.tar.gz) = 6e00199c7025ec47885002928237fd408444ace399e58146016a1c0b8d11f4b0	2	SHA256 (fuse-0.9.0.tar.gz) = 9db37ce95450d1a6a62d1b177f0a62aaa9866347fb8bb9342a1649584d325ea7
3	SIZE (fuse-0.8.0.1.tar.gz) = 1270551	3	SIZE (fuse-0.9.0.tar.gz) = 1371359

Lines 1-11 Link Here

(-)/usr/ports/emulators/fuse/files/patch-compat.h (-11 lines)
1	--- compat.h.orig Sat Sep 13 16:53:04 2003
2	+++ compat.h Tue Oct 28 12:48:07 2003
3	@@ -45,7 +45,7 @@
4
5	/* Replacement functions */
6	#ifndef HAVE_GETOPT_LONG
7	-#include "compat/getopt.h"
8	+#include "getopt.h"
9	#endif /* #ifndef HAVE_GETOPT_LONG */
10
11	#ifndef HAVE_MKSTEMP




--- sound/sdlsound.c.orig	2007-04-27 23:18:27.000000000 +0200
+++ sound/sdlsound.c	2007-07-29 14:54:59.000000000 +0200
@@ -52,6 +52,15 @@
 /* Records sound writer status information */
 static int audio_output_started;
 
+/*
+ * log2() seems to be a Linuxism, define it here as it is absent in libm
+ */
+double
+log2(double x)
+{
+	return log(x)/log(2);
+}
+
 int
 sound_lowlevel_init( const char *device, int *freqptr, int *stereoptr )
 {

Lines 1-18 Link Here

(-)/usr/ports/emulators/fuse/files/patch-osssound.c (-18 lines)
1	--- sound/osssound.c.orig Sat Sep 13 16:53:12 2003
2	+++ sound/osssound.c Tue Oct 28 17:19:06 2003
3	@@ -107,6 +107,7 @@
4	return 1;
5	}
6
7	+#if 0
8	if(*freqptr>8250) frag++;
9	if(*freqptr>16500) frag++;
10	if(*freqptr>33000) frag++;
11	@@ -118,6 +119,7 @@
12	close(soundfd);
13	return 1;
14	}
15	+#endif
16
17	return 0; /* success */
18	}

Lines 1-11 Link Here

(-)/usr/ports/emulators/fuse/files/patch-svgadisplay.c (-11 lines)
1	--- ui/svga/svgadisplay.c.orig 2007-07-29 14:53:05.000000000 +0200
2	+++ ui/svga/svgadisplay.c 2007-07-29 14:53:45.000000000 +0200
3	@@ -258,7 +258,7 @@
4	scaled_x = scale * x; scaled_y = scale * y;
5
6	/* Create scaled image */
7	- scaler_proc16( (libspectrum_byte*)&svgadisplay_image[y][x], display_pitch,
8	+ scaler_proc16( (libspectrum_byte*)&svgadisplay_image[y][x], svgadisplay_pitch,
9	(libspectrum_byte*)&scaled_image[scaled_y][scaled_x],
10	scaled_pitch, w, h );
11




--- ui/svga/svgakeyboard.c.orig	2007-07-29 14:59:10.000000000 +0200
+++ ui/svga/svgakeyboard.c	2007-07-29 15:10:19.000000000 +0200
@@ -75,7 +75,8 @@
   if( fuse_keysym == INPUT_KEY_NONE ) return 0;
 
   fuse_event.type = INPUT_EVENT_KEYPRESS;
-  fuse_event.types.key.key = fuse_keysym;
+  fuse_event.types.key.native_key = fuse_keysym;
+  fuse_event.types.key.spectrum_key = fuse_keysym;
 
   return input_event( &fuse_event );
 }
@@ -91,7 +92,8 @@
   if( fuse_keysym == INPUT_KEY_NONE ) return 0;
 
   fuse_event.type = INPUT_EVENT_KEYRELEASE;
-  fuse_event.types.key.key = fuse_keysym;
+  fuse_event.types.key.native_key = fuse_keysym;
+  fuse_event.types.key.spectrum_key = fuse_keysym;
 
   return input_event( &fuse_event );
 }

Lines 1-11 Link Here

(-)/usr/ports/emulators/fuse/files/patch-svgakeysyms.c (-11 lines)
1	--- ui/svga/keysyms.c.orig 2007-07-29 15:36:40.000000000 +0200
2	+++ ui/svga/keysyms.c 2007-07-29 15:36:48.000000000 +0200
3	@@ -116,7 +116,7 @@
4	{ SCANCODE_CURSORBLOCKLEFT, INPUT_KEY_Left },
5	{ SCANCODE_CURSORBLOCKRIGHT, INPUT_KEY_Right },
6	{ SCANCODE_INSERT, INPUT_KEY_Insert },
7	- { SCANCODE_DELETE, INPUT_KEY_Delete },
8	+ { SCANCODE_REMOVE, INPUT_KEY_Delete },
9	{ SCANCODE_HOME, INPUT_KEY_Home },
10	{ SCANCODE_END, INPUT_KEY_End },
11	{ SCANCODE_PAGEUP, INPUT_KEY_Page_Up },

Lines 11-17 Link Here

(-)/usr/ports/emulators/fuse/pkg-plist (-1 / +2 lines)
11	%%DATADIR%%/48.rom	11	%%DATADIR%%/48.rom
12	%%DATADIR%%/cassette.bmp	12	%%DATADIR%%/cassette.bmp
13	%%DATADIR%%/disk_plus3.szx	13	%%DATADIR%%/disk_plus3.szx
14	%%DATADIR%%/fuse.font	14	%%DATADIR%%/gluck.rom
15	%%DATADIR%%/if1-1.rom	15	%%DATADIR%%/if1-1.rom
16	%%DATADIR%%/if1-2.rom	16	%%DATADIR%%/if1-2.rom
17	%%DATADIR%%/keyboard.scr	17	%%DATADIR%%/keyboard.scr
Lines 27-32 Link Here
27	%%DATADIR%%/plus3e-1.rom	27	%%DATADIR%%/plus3e-1.rom
28	%%DATADIR%%/plus3e-2.rom	28	%%DATADIR%%/plus3e-2.rom
29	%%DATADIR%%/plus3e-3.rom	29	%%DATADIR%%/plus3e-3.rom
		30	%%DATADIR%%/plusd.rom
30	%%DATADIR%%/se-0.rom	31	%%DATADIR%%/se-0.rom
31	%%DATADIR%%/se-1.rom	32	%%DATADIR%%/se-1.rom
32	%%DATADIR%%/tape_128.szx	33	%%DATADIR%%/tape_128.szx

Return to bug 119517

Lines 6-77 Link Here

(-)/usr/ports/emulators/fuse/Makefile (-52 / +24 lines)
6	#	6	#
7		7
8	PORTNAME= fuse	8	PORTNAME= fuse
9	PORTVERSION= 0.8.0.1	9	PORTVERSION= 0.9.0
10	CATEGORIES= emulators	10	CATEGORIES= emulators
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= SF
12	MASTER_SITE_SUBDIR= fuse-emulator	12	MASTER_SITE_SUBDIR= fuse-emulator
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= yuri.pankov@gmail.com
15	COMMENT= Free Unix (Sinclair ZX-)Spectrum Emulator	15	COMMENT= Free Unix (Sinclair ZX-)Spectrum Emulator
16		16
17	LIB_DEPENDS= spectrum.5:${PORTSDIR}/emulators/libspectrum \	17	LIB_DEPENDS= spectrum.6:${PORTSDIR}/emulators/libspectrum \
18	765.4:${PORTSDIR}/emulators/lib765 \	18	765.4:${PORTSDIR}/emulators/lib765
19	xml2.5:${PORTSDIR}/textproc/libxml2 \
20	png.5:${PORTSDIR}/graphics/png
21
22	WANT_GNOME= yes
23	WANT_SDL= yes
24	USE_XLIB= yes
25	USE_PERL5_BUILD= yes
26	USE_GETOPT_LONG= yes
27	GNU_CONFIGURE= yes
28	CONFIGURE_ARGS= --with-plus3-disk-prefix=${LOCALBASE}
29	CFLAGS+= `${LOCALBASE}/bin/libpng-config --I_opts` -I${LOCALBASE}/include
30
31	OPTIONS= SMALLMEM "Low memory compile needed" off \
32	GTK "Use GTK1 user interface" off \
33	GTK2 "Use GTK2 user interface" on \
34	SDL "Use SDL user interface" on \
35	SVGALIB "Use SVGAlib user interface" off \
36	GCRYPT "Support digital signing of .RZX files" off
37		19
38	.include <bsd.port.pre.mk>	20	USE_GNOME= libxml2 glib20 gtk20
39		21	GNU_CONFIGURE= yes
40	# adjust location of manual page	22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
41	CONFIGURE_ARGS+= --mandir=${PREFIX}/man	23	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
42		24
43	.if defined(WITH_SMALLMEM)	25	MAN1= fuse.1
44	BROKEN= Does not compile	26
45	CONFIGURE_ARGS+= --enable-smallmem	27	OPTIONS= AO "Use libao for audio output" off \
46	.endif	28	GCRYPT "Support digital signing of .RZX files" off \
47		29	SAMPLERATE "Support for better beeper sound quality" on
48	.if !defined(WITHOUT_GTK)
49	USE_GNOME= gtk12
50	.else
51	CONFIGURE_ARGS+= --without-gtk
52	.endif
53		30
54	.if defined(WITH_GTK2)	31	.include <bsd.port.pre.mk>
55	CONFIGURE_ARGS+= --with-gtk2
56	USE_GNOME+= gtk20
57	.endif
58
59	.if defined(WITH_SDL)
60	CONFIGURE_ARGS+= --with-sdl
61	USE_SDL= yes
62	.endif
63		32
64	.if defined(WITH_SVGALIB)	33	.if defined(WITH_AO)
65	CONFIGURE_ARGS+= --with-svgalib	34	CONFIGURE_ARGS+=--with-libao
66	LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib	35	LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
67	.endif	36	.endif
68		37
69	.if defined(WITH_GCRYPT) \|\| exists(${LOCALBASE}/include/gcrypt.h)	38	.if defined(WITH_GCRYPT) \|\| exists(${LOCALBASE}/include/gcrypt.h)
70	CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
71	LIB_DEPENDS+= gcrypt.13:${PORTSDIR}/security/libgcrypt	39	LIB_DEPENDS+= gcrypt.13:${PORTSDIR}/security/libgcrypt
72	.endif	40	.endif
73		41
74	MAN1= fuse.1	42	.if !defined(WITHOUT_SAMPLERATE)
		43	LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
		44	.else
		45	CONFIGURE_ARGS+=--without-libsamplerate
		46	.endif
75		47
76	.if !defined(NOPORTDOCS)	48	.if !defined(NOPORTDOCS)
77	post-install:	49	post-install:

Lines 1-18 Link Here

(-)/usr/ports/emulators/fuse/files/patch-log2.c (-18 lines)
1	--- sound/sdlsound.c.orig 2007-04-27 23:18:27.000000000 +0200
2	+++ sound/sdlsound.c 2007-07-29 14:54:59.000000000 +0200
3	@@ -52,6 +52,15 @@
4	/* Records sound writer status information */
5	static int audio_output_started;
6
7	+/*
8	+ * log2() seems to be a Linuxism, define it here as it is absent in libm
9	+ */
10	+double
11	+log2(double x)
12	+{
13	+ return log(x)/log(2);
14	+}
15	+
16	int
17	sound_lowlevel_init( const char device, int freqptr, int *stereoptr )
18	{

Lines 1-22 Link Here

(-)/usr/ports/emulators/fuse/files/patch-svgakeyboard.c (-22 lines)
1	--- ui/svga/svgakeyboard.c.orig 2007-07-29 14:59:10.000000000 +0200
2	+++ ui/svga/svgakeyboard.c 2007-07-29 15:10:19.000000000 +0200
3	@@ -75,7 +75,8 @@
4	if( fuse_keysym == INPUT_KEY_NONE ) return 0;
5
6	fuse_event.type = INPUT_EVENT_KEYPRESS;
7	- fuse_event.types.key.key = fuse_keysym;
8	+ fuse_event.types.key.native_key = fuse_keysym;
9	+ fuse_event.types.key.spectrum_key = fuse_keysym;
10
11	return input_event( &fuse_event );
12	}
13	@@ -91,7 +92,8 @@
14	if( fuse_keysym == INPUT_KEY_NONE ) return 0;
15
16	fuse_event.type = INPUT_EVENT_KEYRELEASE;
17	- fuse_event.types.key.key = fuse_keysym;
18	+ fuse_event.types.key.native_key = fuse_keysym;
19	+ fuse_event.types.key.spectrum_key = fuse_keysym;
20
21	return input_event( &fuse_event );
22	}