Attachment #135573 for bug #180511

View | Details | Raw Unified | Return to bug 180511
Collapse All | Expand All




MAINTAINER=	ports@FreeBSD.org
COMMENT=	SEGA Genesis emulator

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg

LICENSE=	GPLv2

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
USE_SDL=	sdl
USE_GMAKE=	yes
USE_GNOME=	gtk12
MAKE_JOBS_UNSAFE=	yes

OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL
OPTIONS_DEFINE_i386=	RAZE
RAZE_DESC=	Use RAZE z80 emulation (only for i386)
SDL_DESC=	Use SDL for audio

USE_BZIP2=	yes
USE_GNOME=	gtk12
USE_SDL=	sdl
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
CONFIGURE_ARGS+=--with-gtk
MAKE_JOBS_UNSAFE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib



LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}

.include <bsd.port.options.mk>

.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
CONFIGURE_ARGS+=	--without-gcc
.endif

.if ${PORT_OPTIONS:MRAZE}
BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
CONFIGURE_ARGS+=--with-raze
.else

	@${CAT} ${PKGMESSAGE}
	@${ECHO_CMD}

.include <bsd.port.mk>




--- configure.orig
+++ configure
@@ -3968,10 +3968,6 @@
 #endif
 #endif
 
-int
-main ()
-{
-
 int main(int argc, char *argv[])
 {
   int fd = 0;
@@ -3979,9 +3975,6 @@
   ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
   return 0;
 }
-  ;
-  return 0;
-}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4026,10 +4019,6 @@
 #endif
 #endif
 
-int
-main ()
-{
-
 int main(int argc, char *argv[])
 {
   int fd = 0;
@@ -4037,9 +4026,6 @@
   ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
   return 0;
 }
-  ;
-  return 0;
-}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

Line 0 Link Here

(-)emulators/generator-cbiere/files/patch-main__event.c (+11 lines)
	1	--- main/event.c.orig
	2	+++ main/event.c
	3	@@ -15,7 +15,7 @@
	4
	5	/* time for next event - update vdp_event - return when to call again */
	6
	7	-inline void event_nextevent(void)
	8	+static inline void event_nextevent(void)
	9	{
	10	/* call this when it is time for the next event as dictated by vdp_event,
	11	so we switch on it and update vdp_event at the same time */




--- main/vdp.c.orig
+++ main/vdp.c
@@ -87,7 +87,7 @@ void vdp_describe(void);
 void vdp_eventinit(void);
 void vdp_layer_simple(unsigned int layer, unsigned int priority,
                       uint8 *fielddata, unsigned int lineoffset);
-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
                          uint8 *cellloc, unsigned int lineoffset);
 void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
 int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
      vdp_event_endline); */
 }
 
-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
                          uint8 *cellloc, unsigned int lineoffset)
 {
   int y, x;

Line 0 Link Here

(-)emulators/generator-cbiere/files/patch-ym2612__support.h (+11 lines)
	1	--- ym2612/support.h.orig
	2	+++ ym2612/support.h
	3	@@ -3,7 +3,7 @@
	4	#include "config.h"
	5
	6	#define errorlog 0
	7	-#define INLINE inline
	8	+#define INLINE static inline
	9	#define HAS_YM2612 1
	10	#define YM2612UpdateRequest(x)
	11	#define AY8910_set_clock(chip,clock)

Return to bug 180511

Lines 13-35 Link Here

(-)emulators/generator-cbiere/Makefile (-11 / +12 lines)
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= SEGA Genesis emulator	14	COMMENT= SEGA Genesis emulator
15		15
16	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
17
18	LICENSE= GPLv2	16	LICENSE= GPLv2
19		17
20	USE_BZIP2= yes	18	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
21	USE_SDL= sdl
22	USE_GMAKE= yes
23	USE_GNOME= gtk12
24	MAKE_JOBS_UNSAFE= yes
25		19
26	OPTIONS_DEFINE= OPTIMIZED_CFLAGS RAZE SDL	20	OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL
		21	OPTIONS_DEFINE_i386= RAZE
27	RAZE_DESC= Use RAZE z80 emulation (only for i386)	22	RAZE_DESC= Use RAZE z80 emulation (only for i386)
28	SDL_DESC= Use SDL for audio	23	SDL_DESC= Use SDL for audio
29		24
		25	USE_BZIP2= yes
		26	USE_GNOME= gtk12
		27	USE_SDL= sdl
		28	USE_GMAKE= yes
30	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
31	CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/	30	CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
32	CONFIGURE_ARGS+=--with-gtk	31	CONFIGURE_ARGS+=--with-gtk
		32	MAKE_JOBS_UNSAFE= yes
		33
33	CPPFLAGS+= -I${LOCALBASE}/include	34	CPPFLAGS+= -I${LOCALBASE}/include
34	LDFLAGS+= -L${LOCALBASE}/lib	35	LDFLAGS+= -L${LOCALBASE}/lib
35		36
Lines 37-49 Link Here
37		38
38	LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}	39	LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
39		40
40	.include <bsd.port.pre.mk>	41	.include <bsd.port.options.mk>
41		42
42	.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)	43	.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
43	CONFIGURE_ARGS+= --without-gcc	44	CONFIGURE_ARGS+= --without-gcc
44	.endif	45	.endif
45		46
46	.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386"	47	.if ${PORT_OPTIONS:MRAZE}
47	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm	48	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
48	CONFIGURE_ARGS+=--with-raze	49	CONFIGURE_ARGS+=--with-raze
49	.else	50	.else
Lines 63-66 Link Here
63	@${CAT} ${PKGMESSAGE}	64	@${CAT} ${PKGMESSAGE}
64	@${ECHO_CMD}	65	@${ECHO_CMD}
65		66
66	.include <bsd.port.post.mk>	67	.include <bsd.port.mk>

Line 0 Link Here

(-)emulators/generator-cbiere/files/patch-configure (+44 lines)
	1	--- configure.orig
	2	+++ configure
	3	@@ -3968,10 +3968,6 @@
	4	#endif
	5	#endif
	6
	7	-int
	8	-main ()
	9	-{
	10	-
	11	int main(int argc, char *argv[])
	12	{
	13	int fd = 0;
	14	@@ -3979,9 +3975,6 @@
	15	ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
	16	return 0;
	17	}
	18	- ;
	19	- return 0;
	20	-}
	21	_ACEOF
	22	rm -f conftest.$ac_objext conftest$ac_exeext
	23	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
	24	@@ -4026,10 +4019,6 @@
	25	#endif
	26	#endif
	27
	28	-int
	29	-main ()
	30	-{
	31	-
	32	int main(int argc, char *argv[])
	33	{
	34	int fd = 0;
	35	@@ -4037,9 +4026,6 @@
	36	ioctl(fd, SNDCTL_DSP_SETFRAGMENT, (char *)0);
	37	return 0;
	38	}
	39	- ;
	40	- return 0;
	41	-}
	42	_ACEOF
	43	rm -f conftest.$ac_objext conftest$ac_exeext
	44	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

Line 0 Link Here

(-)emulators/generator-cbiere/files/patch-main__vdp.c (+20 lines)
	1	--- main/vdp.c.orig
	2	+++ main/vdp.c
	3	@@ -87,7 +87,7 @@ void vdp_describe(void);
	4	void vdp_eventinit(void);
	5	void vdp_layer_simple(unsigned int layer, unsigned int priority,
	6	uint8 *fielddata, unsigned int lineoffset);
	7	-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
	8	+static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
	9	uint8 *cellloc, unsigned int lineoffset);
	10	void vdp_sprites(unsigned int line, uint8 pridata, uint8 outdata);
	11	int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
	12	@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
	13	vdp_event_endline); */
	14	}
	15
	16	-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
	17	+static inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
	18	uint8 *cellloc, unsigned int lineoffset)
	19	{
	20	int y, x;