Attachment 196340 Details for Bug 230744 – etracer.diff

[patch] etracer.diff

etracer.diff (text/plain), 2.58 KB, created by Tobias Kortkamp on 2018-08-19 09:17:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2018-08-19 09:17:02 UTC

Size: 2.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 477499)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	etracer
> PORTVERSION=	0.6.0
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	games
> MASTER_SITES=	SF/extremetuxracer/releases/${PORTVERSION}
> DISTNAME=	etr-${PORTVERSION}
>@@ -16,11 +16,13 @@
> LIB_DEPENDS=	libpng.so:graphics/png \
> 		libfreetype.so:print/freetype2
> 
>+USES=		compiler gmake localbase pkgconfig tar:xz tcl
> USE_SDL=	mixer sdl image
>-USE_GCC=	yes
> USE_GL=		gl glu
>-USES=		gmake pkgconfig tar:xz tcl
>-CPPFLAGS+=	-I${LOCALBASE}/include
>+
> GNU_CONFIGURE=	yes
> 
>+CXXFLAGS+=      ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
>+CXXFLAGS_clang= -Wno-c++11-narrowing
>+
> .include <bsd.port.mk>
>Index: files/patch-quadtree.cpp
>===================================================================
>--- files/patch-quadtree.cpp	(nonexistent)
>+++ files/patch-quadtree.cpp	(working copy)
>@@ -0,0 +1,16 @@
>+quadtree.cpp:860:29: error: ordered comparison between pointer and zero
>+      ('TTexture *' and 'int')
>+                                if (TerrList[j].texture > 0) {
>+                                    ~~~~~~~~~~~~~~~~~~~ ^ ~
>+
>+--- quadtree.cpp.orig	2018-08-19 09:03:02 UTC
>++++ quadtree.cpp
>+@@ -857,7 +857,7 @@ void quadsquare::Render (const quadcornerdata& cd, GLu
>+ 			}
>+ 
>+ 			for (size_t j=0; j<numTerrains; j++) {
>+-				if (TerrList[j].texture > 0) {
>++				if (TerrList[j].texture != 0) {
>+ 					Course.TerrList[j].texture->Bind();
>+ 
>+ 					for (GLuint i=0; i<VertexArrayCounter; i++) {
>
>Property changes on: files/patch-quadtree.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-spx.h
>===================================================================
>--- files/patch-spx.h	(nonexistent)
>+++ files/patch-spx.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- spx.h.orig	2018-08-19 09:01:47 UTC
>++++ spx.h
>+@@ -21,6 +21,7 @@ GNU General Public License for more details.
>+ #include <string>
>+ #include <vector>
>+ #include <map>
>++#include <ios>
>+ 
>+ using namespace std;
>+ 
>
>Property changes on: files/patch-spx.h
>___________________________________________________________________
>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 230744: 196340 | 196416