Attachment 128607 Details for Bug 172470 – bsnes-0.91.patch

[patch] bsnes-0.91.patch

bsnes-0.91.patch (text/plain), 6.94 KB, created by Naram Qashat on 2012-10-08 04:10:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2012-10-08 04:10:10 UTC

Size: 6.94 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/emulators/bsnes/Makefile ./Makefile
>--- /usr/ports/emulators/bsnes/Makefile	2012-10-07 17:07:44.000000000 -0400
>+++ ./Makefile	2012-10-07 23:02:54.000000000 -0400
>@@ -1,12 +1,8 @@
>-# New ports collection makefile for:    bsnes
>-# Date created:                         2009-06-13
>-# Whom:                                 elbarto
>-#
>+# Created by: elbarto
> # $FreeBSD: head/emulators/bsnes/Makefile 300896 2012-07-14 13:54:48Z beat $
> 
> PORTNAME=	bsnes
>-PORTVERSION=	0.88
>-PORTREVISION=	1
>+PORTVERSION=	0.91
> CATEGORIES=	emulators
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}-source
>@@ -17,100 +13,102 @@
> USE_XZ=		yes
> USE_GMAKE=	yes
> USE_GNOME=	gtk20
>-USE_GCC=	4.6
>+USE_GCC=	4.6+
> 
> ONLY_FOR_ARCHS=	i386 amd64
>-MAKE_ENV+=	c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x" profile="performance"
>+MAKE_ENV+=	c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x"
> USE_LDCONFIG=	yes
> 
>-OPTIONS=	GUI_GTK "Build with GTK+ GUI" on \
>-		GUI_QT4 "Build with QT4 GUI" off \
>-		VIDEO_GLX "Build GLX Video Driver" on \
>-		VIDEO_XV "Build Xv Video Driver" on \
>-		VIDEO_SDL "Build SDL Video Driver" on \
>-		SOUND_OPENAL "Build OpenAL Sound Driver" off \
>-		SOUND_OSS "Build OSS Sound Driver" on \
>-		SOUND_PULSE "Build Pulseaudio Sound Driver" off \
>-		SOUND_AO "Build AO Sound Driver" off \
>-		INPUT_X "Build X Input Driver" on \
>-		INPUT_SDL "Build SDL Input Driver" on
>+OPTIONS_SINGLE=	PROFILE GUI
>+OPTIONS_MULTI=	VIDEO SOUND INPUT
>+OPTIONS_SINGLE_PROFILE=	ACCURACY COMPATIBILITY PERFORMANCE
>+OPTIONS_SINGLE_GUI=	GUI_GTK GUI_QT4
>+OPTIONS_MULTI_VIDEO=	VIDEO_GLX VIDEO_XV VIDEO_SDL
>+OPTIONS_MULTI_SOUND=	SOUND_OPENAL SOUND_OSS SOUND_PULSE SOUND_AO
>+OPTIONS_MULTI_INPUT=	INPUT_X INPUT_SDL
>+
>+OPTIONS_DEFAULT=	COMPATIBILITY GUI_GTK VIDEO_GLX VIDEO_XV VIDEO_SDL SOUND_OSS INPUT_X INPUT_SDL
>+
>+ACCURACY_DESC=	Favor accuracy over compatibility
>+COMPATIBILITY_DESC=	Favor compatibility over accuracy
>+PERFORMANCE_DESC=	Favor performance over accuracy
>+GUI_GTK_DESC=	Build with GTK+ GUI
>+GUI_QT4_DESC=	Build with QT4 GUI
>+VIDEO_GLX_DESC=	Build GLX video driver
>+VIDEO_XV_DESC=	Build Xv video driver
>+VIDEO_SDL_DESC=	Build SDL video driver
>+SOUND_OPENAL_DESC=	Build OpenAL sound driver
>+SOUND_OSS_DESC=	Build OSS sound driver
>+SOUND_PULSE_DESC=	Build Pulseaudio sound driver
>+SOUND_AO_DESC=	Build AO sound driver
>+INPUT_X_DESC=	Build X input driver
>+INPUT_SDL_DESC=	Build SDL input driver
> 
> .include <bsd.port.options.mk>
> 
>-.if defined(WITH_GUI_GTK)
>+.if ${PORT_OPTIONS:MACCURACY}
>+MAKE_ENV+=	profile="accuracy"
>+.elif ${PORT_OPTIONS:MCOMPATIBILITY}
>+MAKE_ENV+=	profile="compatibility"
>+.else
>+MAKE_ENV+=	profile="performance"
>+.endif
>+
>+.if ${PORT_OPTIONS:MGUI_GTK}
> MAKE_ENV+=	phoenix="gtk"
> .else
> USE_QT4=	corelib gui
> MAKE_ENV+=	phoenix="qt"
> .endif
> 
>-.if defined(WITH_VIDEO_GLX)
>+.if ${PORT_OPTIONS:MVIDEO_GLX}
> USE_GL+=	gl
> VIDEO_DRIVER+=	video.glx
> .endif
> 
>-.if defined(WITH_VIDEO_XV)
>+.if ${PORT_OPTIONS:MVIDEO_XV}
> USE_XORG+=	xv
> VIDEO_DRIVER+=	video.xv
> .endif
> 
>-.if defined(WITH_VIDEO_SDL)
>+.if ${PORT_OPTIONS:MVIDEO_SDL}
> USE_XORG+=	xv
> USE_SDL+=	sdl
> VIDEO_DRIVER+=	video.sdl
> .endif
> 
>-.if defined(WITH_SOUND_OPENAL)
>+.if ${PORT_OPTIONS:MSOUND_OPENAL}
> USE_OPENAL=	al
> AUDIO_DRIVER+=	audio.openal
> .endif
> 
>-.if defined(WITH_SOUND_OSS)
>+.if ${PORT_OPTIONS:MSOUND_OSS}
> AUDIO_DRIVER+=	audio.oss
> .endif
> 
>-.if defined(WITH_SOUND_PULSE)
>-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
>+.if ${PORT_OPTIONS:MSOUND_PULSE}
>+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
> AUDIO_DRIVER+=	audio.pulseaudio
> .endif
> 
>-.if defined(WITH_SOUND_AO)
>-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
>+.if ${PORT_OPTIONS:MSOUND_AO}
>+LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
> AUDIO_DRIVER+=	audio.ao
> .endif
> 
>-.if defined(WITH_INPUT_X)
>+.if ${PORT_OPTIONS:MINPUT_X}
> INPUT_DRIVER+=	input.x
> .endif
> 
>-.if defined(WITH_INPUT_SDL)
>+.if ${PORT_OPTIONS:MINPUT_SDL}
> USE_SDL+=	sdl
> INPUT_DRIVER+=	input.sdl
> .endif
> 
>-.if !defined(WITH_GUI_GTK) && !defined(WITH_GUI_QT4)
>-IGNORE=	you have to choose a GUI
>-.endif
>-.if defined(WITH_GUI_GTK) && defined(WITH_GUI_QT4)
>-IGNORE=	you may only choose one GUI
>-.endif
>-
>-.if !defined(VIDEO_DRIVER)
>-IGNORE=	you have to choose at least one video driver
>-.endif
>-
>-.if !defined(AUDIO_DRIVER)
>-IGNORE=	you have to choose at least one audio driver
>-.endif
>-
>-.if !defined(INPUT_DRIVER)
>-IGNORE=	you have to choose at least one input driver
>-.endif
>-
> post-patch:
>-	${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|' ${WRKSRC}/bsnes/target-ui/Makefile
>-	${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|' ${WRKSRC}/bsnes/target-ui/Makefile
>-	${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|' ${WRKSRC}/bsnes/target-ui/Makefile
>+	${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|' ${WRKSRC}/bsnes/target-ethos/Makefile
>+	${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|' ${WRKSRC}/bsnes/target-ethos/Makefile
>+	${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|' ${WRKSRC}/bsnes/target-ethos/Makefile
> 
> do-build:
> 	(cd ${WRKSRC}/bsnes && ${GMAKE} ${MAKE_ENV})
>diff -ruN --exclude=CVS /usr/ports/emulators/bsnes/distinfo ./distinfo
>--- /usr/ports/emulators/bsnes/distinfo	2012-10-07 17:07:44.000000000 -0400
>+++ ./distinfo	2012-10-07 22:40:04.000000000 -0400
>@@ -1,2 +1,2 @@
>-SHA256 (bsnes_v088-source.tar.xz) = edf6decf96c6b83c58f6b167951bb84b57c0ca4f3e5e8cad7af6d3485540273b
>-SIZE (bsnes_v088-source.tar.xz) = 993608
>+SHA256 (bsnes_v091-source.tar.xz) = 8c85a18ff44195d23b54cad53549152f034ee338e590907e8c8cbc3eaa7daf9f
>+SIZE (bsnes_v091-source.tar.xz) = 1055048
>diff -ruN --exclude=CVS /usr/ports/emulators/bsnes/files/patch-target-ethos-Makefile ./files/patch-target-ethos-Makefile
>--- /usr/ports/emulators/bsnes/files/patch-target-ethos-Makefile	1969-12-31 19:00:00.000000000 -0500
>+++ ./files/patch-target-ethos-Makefile	2012-10-07 22:46:55.000000000 -0400
>@@ -0,0 +1,15 @@
>+--- bsnes/target-ethos/Makefile.orig	2012-08-09 19:32:19.000000000 -0400
>++++ bsnes/target-ethos/Makefile	2012-10-07 22:43:24.000000000 -0400
>+@@ -15,9 +15,9 @@
>+ 
>+ # platform
>+ ifeq ($(platform),x)
>+-  ruby := video.glx video.xv video.sdl
>+-  ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
>+-  ruby += input.sdl input.x
>++  ruby := VIDEO
>++  ruby += AUDIO
>++  ruby += INPUT
>+ else ifeq ($(platform),osx)
>+   ruby :=
>+   ruby += audio.openal
>diff -ruN --exclude=CVS /usr/ports/emulators/bsnes/files/patch-target-ui-Makefile ./files/patch-target-ui-Makefile
>--- /usr/ports/emulators/bsnes/files/patch-target-ui-Makefile	2012-10-07 17:07:44.000000000 -0400
>+++ ./files/patch-target-ui-Makefile	1969-12-31 19:00:00.000000000 -0500
>@@ -1,15 +0,0 @@
>---- bsnes/target-ui/Makefile.orig	2012-02-05 20:04:19.000000000 -0500
>-+++ bsnes/target-ui/Makefile	2012-04-16 23:28:28.000000000 -0400
>-@@ -10,9 +10,9 @@
>- 
>- # platform
>- ifeq ($(platform),x)
>--  ruby := video.glx video.xv video.sdl
>--  ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
>--  ruby += input.sdl input.x
>-+  ruby := VIDEO
>-+  ruby += AUDIO
>-+  ruby += INPUT
>- else ifeq ($(platform),osx)
>-   ruby :=
>-   ruby += audio.openal

Actions: View | Diff

Attachments on bug 172470: 128607 | 128608