Attachment 160157 Details for Bug 202532 – higan.patch

[patch] higan.patch

higan.patch (text/plain), 6.54 KB, created by Naram Qashat on 2015-08-20 21:15:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2015-08-20 21:15:47 UTC

Size: 6.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 394552)
>+++ Makefile	(working copy)
>@@ -16,7 +16,6 @@
> USE_LDCONFIG=	yes
> 
> ONLY_FOR_ARCHS=	i386 amd64
>-#MAKE_ENV+=	c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x"
> MAKE_ENV+=	compiler="${CXX}" cflags="-x c -std=c99 ${CFLAGS}" \
> 		cppflags="-x c++ -std=c++11 ${CXXFLAGS}"
> 
>@@ -118,19 +117,18 @@
> 		${WRKSRC}/target-ethos/Makefile
> 	${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \
> 		${WRKSRC}/nall/string/platform.hpp
>-.if ${PORT_OPTIONS:MDEBUG}
>+
>+post-patch-DEBUG-on:
> 	${REINPLACE_CMD} -e 's|-O3|-g|g' \
> 		${WRKSRC}/ananke/Makefile \
> 		${WRKSRC}/Makefile
> 	${REINPLACE_CMD} -e 's|:= -s|:= #|g' \
> 		${WRKSRC}/Makefile
>-.endif
>-#	${RM} ${WRKSRC}/shaders/Sepia.Direct3D.shader
> 
>+pre-build-QT4-on:
>+	(cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp)
>+
> do-build:
>-.if ${PORT_OPTIONS:MQT4}
>-	(cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp)
>-.endif
> .for d in . ananke
> 	(cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV})
> .endfor
>Index: files/patch-nall-platform.hpp
>===================================================================
>--- files/patch-nall-platform.hpp	(revision 394552)
>+++ files/patch-nall-platform.hpp	(working copy)
>@@ -1,6 +1,6 @@
>---- ./nall/platform.hpp.orig	2014-03-16 21:33:25.000000000 -0400
>-+++ ./nall/platform.hpp	2014-03-16 21:45:07.000000000 -0400
>-@@ -41,7 +41,7 @@
>+--- 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
>Index: files/patch-ruby__video__glx.cpp
>===================================================================
>--- files/patch-ruby__video__glx.cpp	(revision 394552)
>+++ files/patch-ruby__video__glx.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- ./ruby/video/glx.cpp.orig	2014-01-20 01:37:14.000000000 -0500
>-+++ ./ruby/video/glx.cpp	2014-06-02 23:32:39.000000000 -0400
>-@@ -128,6 +128,28 @@
>+--- 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;
>  
>Index: files/patch-shaders
>===================================================================
>--- files/patch-shaders	(revision 394552)
>+++ files/patch-shaders	(working copy)
>@@ -1,22 +0,0 @@
>---- ./target-ethos/general/presentation.cpp.orig	2013-12-06 15:19:40.000000000 -0500
>-+++ ./target-ethos/general/presentation.cpp	2014-03-16 22:40:31.000000000 -0400
>-@@ -235,7 +235,7 @@
>- 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;
>---- ./target-ethos/utility/utility.cpp.orig	2013-12-21 02:00:03.000000000 -0500
>-+++ ./target-ethos/utility/utility.cpp	2014-03-16 22:41:03.000000000 -0400
>-@@ -203,7 +203,7 @@
>-     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)) {
>Index: files/patch-target-ethos-Makefile
>===================================================================
>--- files/patch-target-ethos-Makefile	(revision 394552)
>+++ files/patch-target-ethos-Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- ./target-ethos/Makefile.orig	2014-01-13 00:26:29.000000000 -0500
>-+++ ./target-ethos/Makefile	2014-03-16 21:57:02.000000000 -0400
>-@@ -27,9 +27,9 @@
>+--- 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)
>Index: files/patch-target-ethos_general_presentation.cpp
>===================================================================
>--- files/patch-target-ethos_general_presentation.cpp	(revision 0)
>+++ files/patch-target-ethos_general_presentation.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- 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
>___________________________________________________________________
>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-target-ethos_utility_utility.cpp
>===================================================================
>--- files/patch-target-ethos_utility_utility.cpp	(revision 0)
>+++ files/patch-target-ethos_utility_utility.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- 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
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 202532: 160157