Attachment 139295 Details for Bug 185518 – emulators_generator-cbiere.diff

[patch] emulators_generator-cbiere.diff

emulators_generator-cbiere.diff (text/x-diff), 3.82 KB, created by tkato432 on 2014-02-02 18:18:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-02-02 18:18:04 UTC

Size: 3.82 KB

patch

obsolete

>diff -urN /usr/ports/emulators/generator-cbiere/Makefile emulators/generator-cbiere/Makefile
>--- /usr/ports/emulators/generator-cbiere/Makefile	2014-02-03 02:52:04.000000000 +0900
>+++ emulators/generator-cbiere/Makefile	2014-02-03 00:00:00.000000000 +0900
>@@ -15,48 +15,40 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
>-
>-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL
>-OPTIONS_DEFINE_i386=	RAZE
>-RAZE_DESC=	Use RAZE z80 emulation (only for i386)
>-SDL_DESC=	Use SDL for audio
>+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
> 
> USE_BZIP2=	yes
>+USES=		gmake
> USE_GNOME=	gtk12
> USE_SDL=	sdl
>-USES=		gmake
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
>-CONFIGURE_ARGS+=--with-gtk
>+CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \
>+		--with-gtk
> MAKE_JOBS_UNSAFE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX}-gtk
>+PLIST_FILES=	bin/${UNIQUENAME}-gtk
>+
>+OPTIONS_DEFINE=		OPTIMIZED_CFLAGS SDL
>+OPTIONS_DEFINE_i386=	RAZE
> 
>-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
>+OPTIMIZED_CFLAGS_CONFIGURE_OFF=	--without-gcc
>+RAZE_DESC=		Use RAZE z80 emulation
>+RAZE_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
>+RAZE_CONFIGURE_ON=	--with-raze
>+SDL_DESC=		Use SDL for audio
>+SDL_CONFIGURE_ON=	--with-sdl-audio
> 
> .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
>+.if empty(PORT_OPTIONS:MRAZE)
> CONFIGURE_ARGS+=--with-cmz80
> .endif
> 
>-.if ${PORT_OPTIONS:MSDL}
>-CONFIGURE_ARGS+=--with-sdl-audio
>-.endif
>-
> post-patch:
>-	@${REINPLACE_CMD} -e '/%define %1 @UNDERSCORE@%1 /d' \
>-		${WRKSRC}/raze/raze.asm.in
>+	@${REINPLACE_CMD} -e \
>+		'/%define %1 @UNDERSCORE@%1 /d' ${WRKSRC}/raze/raze.asm.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/emulators/generator-cbiere/files/patch-hdr__registers.h emulators/generator-cbiere/files/patch-hdr__registers.h
>--- /usr/ports/emulators/generator-cbiere/files/patch-hdr__registers.h	1970-01-01 09:00:00.000000000 +0900
>+++ emulators/generator-cbiere/files/patch-hdr__registers.h	2014-02-03 00:00:00.000000000 +0900
>@@ -0,0 +1,23 @@
>+--- hdr/registers.h.orig
>++++ hdr/registers.h
>+@@ -6,17 +6,17 @@
>+    call a C function, then when that C function returns these registers are
>+    still what they were before we made the call. */
>+ 
>+-#ifdef PROCESSOR_ARM
>++#if defined(PROCESSOR_ARM) && !defined(__clang__)
>+      register uint32 reg68k_pc asm ("r7");
>+      register uint32 *reg68k_regs asm ("r8");
>+      register t_sr reg68k_sr asm ("r9");
>+ #else
>+-#  ifdef PROCESSOR_SPARC
>++#  if defined(PROCESSOR_SPARC) && !defined(__clang__)
>+        register uint32 reg68k_pc asm ("5");
>+        register uint32 *reg68k_regs asm ("6");
>+        register t_sr reg68k_sr asm ("7");
>+ #  else
>+-#    ifdef PROCESSOR_INTEL
>++#    if defined(PROCESSOR_INTEL) && !defined(__clang__)
>+          register uint32 reg68k_pc asm ("%ebx");
>+          register uint32 *reg68k_regs asm ("%edi");
>+          register t_sr reg68k_sr asm ("%esi");
>diff -urN /usr/ports/emulators/generator-cbiere/files/patch-main__reg68k.c emulators/generator-cbiere/files/patch-main__reg68k.c
>--- /usr/ports/emulators/generator-cbiere/files/patch-main__reg68k.c	1970-01-01 09:00:00.000000000 +0900
>+++ emulators/generator-cbiere/files/patch-main__reg68k.c	2014-02-03 00:00:00.000000000 +0900
>@@ -0,0 +1,13 @@
>+--- main/reg68k.c.orig
>++++ main/reg68k.c
>+@@ -18,8 +18,8 @@
>+ 
>+ /*** global variables ***/
>+ 
>+-#if (!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
>+-       || defined(PROCESSOR_INTEL)))
>++#if ((!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
>++       || defined(PROCESSOR_INTEL))) || defined(__clang__))
>+ uint32 reg68k_pc;
>+ uint32 *reg68k_regs;
>+ t_sr reg68k_sr;

Actions: View | Diff

Attachments on bug 185518: 139292 | 139293 | 139294 | 139295