Attachment 173826 Details for Bug 211855 – higan-101.patch

[patch] higan-101.patch

higan-101.patch (text/plain), 16.96 KB, created by Naram Qashat on 2016-08-18 15:59:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2016-08-18 15:59:41 UTC

Size: 16.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 420299)
>+++ Makefile	(working copy)
>@@ -2,37 +2,34 @@
> # $FreeBSD$
> 
> PORTNAME=	higan
>-PORTVERSION=	0.94
>-PORTREVISION=	4
>+PORTVERSION=	101
> CATEGORIES=	emulators
>-MASTER_SITES=	http://byuu.org/files/ \
>+MASTER_SITES=	http://download.byuu.org/ \
> 		http://www.cyberbotx.com/higan/
>-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}-source
>+DISTNAME=	${PORTNAME}_v${PORTVERSION}-source
> 
> MAINTAINER=	cyberbotx@cyberbotx.com
> COMMENT=	Nintendo multi-system emulator
> 
>-USES=		compiler:c++11-lib gmake pkgconfig tar:xz
>+USES=		7z:p7zip compiler:c++14-lang gmake pkgconfig
> USE_LDCONFIG=	yes
>+USE_XORG=	x11 xext
> 
>+BROKEN_FreeBSD_9=	no C++14 support
> ONLY_FOR_ARCHS=	i386 amd64
> MAKE_ENV+=	compiler="${CXX}" cflags="-x c -std=c99 ${CFLAGS}" \
>-		cppflags="-x c++ -std=c++11 ${CXXFLAGS}"
>+		cppflags="-x c++ -std=c++14 ${CXXFLAGS}"
> 
> OPTIONS_DEFINE=		DEBUG
>-OPTIONS_SINGLE=		PROFILE GUI
>-OPTIONS_SINGLE_PROFILE=	ACCURACY BALANCED PERFORMANCE
>+OPTIONS_SINGLE=		GUI
> OPTIONS_SINGLE_GUI=	GTK2 QT4
> OPTIONS_MULTI=		VIDEO SOUND INPUT
> OPTIONS_MULTI_VIDEO=	GLX SDL XSHM XV
> OPTIONS_MULTI_SOUND=	AO OPENAL OSS PULSEAUDIO
> OPTIONS_MULTI_INPUT=	INPUT_SDL INPUT_X
>-OPTIONS_DEFAULT=	BALANCED GTK2 GLX XSHM XV SDL \
>+OPTIONS_DEFAULT=	GTK2 GLX XSHM XV SDL \
> 			OSS INPUT_SDL INPUT_X
> 
>-ACCURACY_DESC=		Use accuracy profile
>-BALANCED_DESC=		Use balanced profile
>-PERFORMANCE_DESC=	Use performance profile
> GTK2_DESC=		Build with GTK+2 GUI
> QT4_DESC=		Build with QT4 GUI
> GLX_DESC=		Build GLX video driver
>@@ -46,16 +43,15 @@
> INPUT_SDL_DESC=		Build SDL input driver
> INPUT_X_DESC=		Build X input driver
> 
>-ACCURACY_MAKE_ENV=	profile="accuracy"
>-BALANCED_MAKE_ENV=	profile="balanced"
>-PERFORMANCE_MAKE_ENV=	profile="performance"
>+GTK2_USE=	GNOME=cairo,gdkpixbuf2,gtk20,gtksourceview2
>+GTK2_USES=	gettext
>+GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+			libfreetype.so:print/freetype2
>+GTK2_MAKE_ENV=	hiro="gtk"
> 
>-GTK2_USE=	GNOME=gtk20
>-GTK2_MAKE_ENV=	phoenix="gtk"
>+QT4_USE=	QT4=corelib,gui,moc_build
>+QT4_MAKE_ENV=	hiro="qt"
> 
>-QT4_USE=	QT4=gui,moc_build
>-QT4_MAKE_ENV=	phoenix="qt"
>-
> GLX_USE=	GL=gl
> GLX_VARS=	VIDEO_DRIVER+=video.glx
> 
>@@ -89,33 +85,27 @@
> 		-e 's|%%VIDEO%%|${VIDEO_DRIVER}|' \
> 		-e 's|%%AUDIO%%|${AUDIO_DRIVER}|' \
> 		-e 's|%%INPUT%%|${INPUT_DRIVER}|' \
>-		${WRKSRC}/target-ethos/Makefile
>+		${WRKSRC}/higan/target-tomoko/GNUmakefile
> 	${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \
>-		${WRKSRC}/nall/string/platform.hpp
>+		${WRKSRC}/nall/path.hpp
> 
> post-patch-DEBUG-on:
> 	${REINPLACE_CMD} -e 's|-O3|-g|g' \
>-		${WRKSRC}/ananke/Makefile \
>-		${WRKSRC}/Makefile
>-	${REINPLACE_CMD} -e 's|:= -s|:= #|g' \
>-		${WRKSRC}/Makefile
>+		${WRKSRC}/higan/GNUmakefile \
>+		${WRKSRC}/icarus/GNUmakefile
> 
>-pre-build-QT4-on:
>-	(cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp)
>-
> do-build:
>-.for d in . ananke
>+.for d in higan icarus
> 	(cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV})
> .endfor
> 
> do-install:
>-	${INSTALL_LIB} ${WRKSRC}/ananke/libananke.so ${STAGEDIR}${PREFIX}/lib/libananke.so.1
>-	${LN} -sf libananke.so.1 ${STAGEDIR}${PREFIX}/lib/libananke.so
>-	${INSTALL_PROGRAM} ${WRKSRC}/out/higan ${STAGEDIR}${PREFIX}/bin/
>-	${INSTALL_DATA} ${WRKSRC}/data/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/
>-	${INSTALL_DATA} ${WRKSRC}/data/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/
>-	${MKDIR} ${STAGEDIR}${DATADIR}/shaders
>-	(cd ${WRKSRC}/profile && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/)
>-	(cd ${WRKSRC}/shaders && ${COPYTREE_SHARE} \*.shader ${STAGEDIR}${DATADIR}/shaders/)
>+	${INSTALL_PROGRAM} ${WRKSRC}/higan/out/higan ${STAGEDIR}${PREFIX}/bin/
>+	${INSTALL_PROGRAM} ${WRKSRC}/icarus/out/icarus ${STAGEDIR}${PREFIX}/bin/
>+	${INSTALL_DATA} ${WRKSRC}/higan/data/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/
>+	${INSTALL_DATA} ${WRKSRC}/higan/data/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/
>+	${MKDIR} ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/higan/data/cheats.bml ${STAGEDIR}${DATADIR}/
>+	(cd ${WRKSRC}/higan/systems && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/)
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 420299)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (higan_v094-source.tar.xz) = 5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b
>-SIZE (higan_v094-source.tar.xz) = 882732
>+TIMESTAMP = 1471534845
>+SHA256 (higan_v101-source.7z) = c82f2128eb8c6f4728e4c1e2579666f723b02b0666a786f0c19c8d05ae1b7913
>+SIZE (higan_v101-source.7z) = 1198228
>Index: files/patch-higan_audio_audio.cpp
>===================================================================
>--- files/patch-higan_audio_audio.cpp	(nonexistent)
>+++ files/patch-higan_audio_audio.cpp	(working copy)
>@@ -0,0 +1,14 @@
>+--- higan/audio/audio.cpp.orig	2016-07-08 05:29:02 UTC
>++++ higan/audio/audio.cpp
>+@@ -54,7 +54,10 @@ auto Audio::process() -> void {
>+       if(!stream->pending()) return;
>+     }
>+ 
>+-    double samples[channels] = {0.0};
>++    double samples[channels];
>++    for(auto c : range(channels)) {
>++      samples[c] = 0.0;
>++    }
>+     for(auto& stream : streams) {
>+       double buffer[16];
>+       uint length = stream->read(buffer), offset = 0;
>
>Property changes on: files/patch-higan_audio_audio.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-higan_target-tomoko_GNUmakefile
>===================================================================
>--- files/patch-higan_target-tomoko_GNUmakefile	(nonexistent)
>+++ files/patch-higan_target-tomoko_GNUmakefile	(working copy)
>@@ -0,0 +1,15 @@
>+--- higan/target-tomoko/GNUmakefile.orig	2016-01-14 03:20:56 UTC
>++++ higan/target-tomoko/GNUmakefile
>+@@ -27,9 +27,9 @@ else ifeq ($(platform),linux)
>+   ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
>+   ruby += input.udev input.sdl input.xlib
>+ else ifeq ($(platform),bsd)
>+-  ruby += video.glx video.xv video.xshm video.sdl
>+-  ruby += audio.openal audio.oss
>+-  ruby += input.sdl input.xlib
>++  ruby += %%VIDEO%%
>++  ruby += %%AUDIO%%
>++  ruby += %%INPUT%%
>+ endif
>+ 
>+ # ruby
>
>Property changes on: files/patch-higan_target-tomoko_GNUmakefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-higan_target-tomoko_presentation_presentation.cpp
>===================================================================
>--- files/patch-higan_target-tomoko_presentation_presentation.cpp	(nonexistent)
>+++ files/patch-higan_target-tomoko_presentation_presentation.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- higan/target-tomoko/presentation/presentation.cpp.orig	2016-05-25 07:47:23 UTC
>++++ higan/target-tomoko/presentation/presentation.cpp
>+@@ -273,7 +273,7 @@ auto Presentation::drawSplashScreen() ->
>+ }
>+ 
>+ auto Presentation::loadShaders() -> void {
>+-  auto pathname = locate("Video Shaders/");
>++  auto pathname = locate("shaders/");
>+ 
>+   if(settings["Video/Driver"].text() == "OpenGL") {
>+     for(auto shader : directory::folders(pathname, "*.shader")) {
>
>Property changes on: files/patch-higan_target-tomoko_presentation_presentation.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-higan_target-tomoko_tomoko.cpp
>===================================================================
>--- files/patch-higan_target-tomoko_tomoko.cpp	(nonexistent)
>+++ files/patch-higan_target-tomoko_tomoko.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- higan/target-tomoko/tomoko.cpp.orig	2016-07-01 08:21:27 UTC
>++++ higan/target-tomoko/tomoko.cpp
>+@@ -8,6 +8,9 @@ auto locate(string name) -> string {
>+   string location = {Path::program(), name};
>+   if(inode::exists(location)) return location;
>+ 
>++  location = {Path::shared(), "higan/", name};
>++  if(inode::exists(location)) return location;
>++
>+   location = {Path::config(), "higan/", name};
>+   if(inode::exists(location)) return location;
>+ 
>
>Property changes on: files/patch-higan_target-tomoko_tomoko.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-hiro_GNUmakefile
>===================================================================
>--- files/patch-hiro_GNUmakefile	(nonexistent)
>+++ files/patch-hiro_GNUmakefile	(working copy)
>@@ -0,0 +1,16 @@
>+--- hiro/GNUmakefile.orig	2016-01-04 00:16:08 UTC
>++++ hiro/GNUmakefile
>+@@ -37,11 +37,11 @@ ifneq ($(filter $(platform),linux bsd),)
>+ 
>+   ifeq ($(hiro),gtk)
>+     hiroflags = $(cppflags) $(flags) -DHIRO_GTK $(shell pkg-config --cflags gtk+-2.0 gtksourceview-2.0)
>+-    hirolink = -lX11 $(shell pkg-config --libs gtk+-2.0 gtksourceview-2.0)
>++    hirolink = $(shell pkg-config --libs x11 gtk+-2.0 gtksourceview-2.0)
>+   endif
>+ 
>+   ifeq ($(hiro),qt)
>+     hiroflags = $(cppflags) $(flags) -DHIRO_QT $(shell pkg-config --cflags QtCore QtGui)
>+-    hirolink = -lX11 $(shell pkg-config --libs QtCore QtGui)
>++    hirolink = $(shell pkg-config --libs x11 QtCore QtGui)
>+   endif
>+ endif
>
>Property changes on: files/patch-hiro_GNUmakefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-nall-platform.hpp
>===================================================================
>--- files/patch-nall-platform.hpp	(revision 420299)
>+++ files/patch-nall-platform.hpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- nall/platform.hpp.orig	2014-01-20 06:37:12 UTC
>-+++ nall/platform.hpp
>-@@ -41,7 +41,7 @@ namespace Math {
>-   #undef interface
>-   #define dllexport __declspec(dllexport)
>- #else
>--  #include <endian.h>
>-+  #include <sys/endian.h>
>-   #include <unistd.h>
>-   #include <pwd.h>
>-   #define dllexport
>
>Property changes on: files/patch-nall-platform.hpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-ruby__video__glx.cpp
>===================================================================
>--- files/patch-ruby__video__glx.cpp	(revision 420299)
>+++ files/patch-ruby__video__glx.cpp	(nonexistent)
>@@ -1,31 +0,0 @@
>---- ruby/video/glx.cpp.orig	2014-01-20 06:37:14 UTC
>-+++ ruby/video/glx.cpp
>-@@ -128,6 +128,28 @@ struct pVideoGLX : OpenGL {
>-     //require GLX 1.2+ API
>-     if(glx.version_major < 1 || (glx.version_major == 1 && glx.version_minor < 2)) return false;
>- 
>-+    int major, minor;
>-+    const char *version = (const char *) glGetString (GL_VERSION);
>-+    const char *dot = version == NULL ? NULL : strchr (version, '.');
>-+    const char *major_start = dot;
>-+
>-+    /* Sanity check */
>-+    if (dot == NULL || dot == version || *(dot + 1) == '\0') {
>-+        major = 0;
>-+        minor = 0;
>-+    } else {
>-+    /* Find the start of the major version in the string */
>-+    while (major_start > version && *major_start != ' ')
>-+           --major_start;
>-+        major = strtol (major_start, NULL, 10);
>-+        minor = strtol (dot + 1, NULL, 0);
>-+    }
>-+
>-+    if(major < 3 || (major == 3 && minor < 2)) {
>-+        printf("Error: OpenGL 3.2 is not available. Select another video driver on the Advanced Configuration tab and restart higan.\n");
>-+        return false;
>-+    }
>-+
>-     XWindowAttributes window_attributes;
>-     XGetWindowAttributes(display, settings.handle, &window_attributes);
>- 
>
>Property changes on: files/patch-ruby__video__glx.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-target-ethos-Makefile
>===================================================================
>--- files/patch-target-ethos-Makefile	(revision 420299)
>+++ files/patch-target-ethos-Makefile	(nonexistent)
>@@ -1,15 +0,0 @@
>---- target-ethos/Makefile.orig	2014-01-13 05:26:29 UTC
>-+++ target-ethos/Makefile
>-@@ -27,9 +27,9 @@ else ifeq ($(platform),linux)
>-   ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
>-   ruby += input.udev input.sdl input.x
>- else ifeq ($(platform),bsd)
>--  ruby := video.glx
>--  ruby += audio.openal audio.oss
>--  ruby += input.x
>-+  ruby := %%VIDEO%%
>-+  ruby += %%AUDIO%%
>-+  ruby += %%INPUT%%
>- endif
>- 
>- # phoenix
>
>Property changes on: files/patch-target-ethos-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-target-ethos_general_presentation.cpp
>===================================================================
>--- files/patch-target-ethos_general_presentation.cpp	(revision 420299)
>+++ files/patch-target-ethos_general_presentation.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- target-ethos/general/presentation.cpp.orig	2013-12-06 20:19:40 UTC
>-+++ target-ethos/general/presentation.cpp
>-@@ -235,7 +235,7 @@ void Presentation::bootstrap() {
>- void Presentation::loadShaders() {
>-   //only the OpenGL driver has video shader support
>-   if(config->video.driver == "OpenGL") {
>--    string pathname = program->path("Video Shaders/");
>-+    string pathname = program->path("shaders/");
>-     lstring shaders = directory::folders(pathname, "*.shader");
>-     for(auto& name : shaders) {
>-       auto shader = new RadioItem;
>
>Property changes on: files/patch-target-ethos_general_presentation.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-target-ethos_utility_utility.cpp
>===================================================================
>--- files/patch-target-ethos_utility_utility.cpp	(revision 420299)
>+++ files/patch-target-ethos_utility_utility.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- target-ethos/utility/utility.cpp.orig	2013-12-21 07:00:03 UTC
>-+++ target-ethos/utility/utility.cpp
>-@@ -203,7 +203,7 @@ void Utility::updateShader() {
>-     video.set(Video::Filter, Video::FilterLinear);
>-   } else if(config->video.shader == "Display Emulation") {
>-     if(program->active) {
>--      string pathname = program->path("Video Shaders/");
>-+      string pathname = program->path("shaders/");
>-       pathname.append("Display Emulation/");
>-       pathname.append(presentation->systemName, ".shader/");
>-       if(directory::exists(pathname)) {
>
>Property changes on: files/patch-target-ethos_utility_utility.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 420299)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,5 @@
>+bin/icarus
> bin/higan
>-lib/libananke.so.1
>-lib/libananke.so
> share/applications/higan.desktop
> %%DATADIR%%/Famicom.sys/manifest.bml
> %%DATADIR%%/Game Boy Advance.sys/manifest.bml
>@@ -10,10 +9,7 @@
> %%DATADIR%%/Game Boy.sys/manifest.bml
> %%DATADIR%%/Super Famicom.sys/ipl.rom
> %%DATADIR%%/Super Famicom.sys/manifest.bml
>-%%DATADIR%%/shaders/Curvature.shader/curvature.fs
>-%%DATADIR%%/shaders/Curvature.shader/manifest.bml
>-%%DATADIR%%/shaders/Edge Detection.shader/edge-detection.fs
>-%%DATADIR%%/shaders/Edge Detection.shader/manifest.bml
>-%%DATADIR%%/shaders/Scanline.shader/manifest.bml
>-%%DATADIR%%/shaders/Scanline.shader/scanline.fs
>+%%DATADIR%%/WonderSwan Color.sys/manifest.bml
>+%%DATADIR%%/WonderSwan.sys/manifest.bml
>+%%DATADIR%%/cheats.bml
> share/pixmaps/higan.png

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 211855: 173686 | 173826 | 180930