Attachment #196416 for bug #230744





PORTNAME=	etracer
PORTVERSION=	0.6.0
PORTREVISION=	7
CATEGORIES=	games
MASTER_SITES=	SF/extremetuxracer/releases/${PORTVERSION}
DISTNAME=	etr-${PORTVERSION}

MAINTAINER=	tobik@FreeBSD.org
COMMENT=	Extreme Tux Racer

LICENSE=	GPLv2


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

CPPFLAGS+=	-I${LOCALBASE}/include
GNU_CONFIGURE=	yes

CXXFLAGS+=      ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
CXXFLAGS_clang= -Wno-c++11-narrowing

.include <bsd.port.mk>




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++) {

Line 0 Link Here

(-)files/patch-spx.h (+10 lines)
	1	--- spx.h.orig 2018-08-19 09:01:47 UTC
	2	+++ spx.h
	3	@@ -21,6 +21,7 @@ GNU General Public License for more details.
	4	#include <string>
	5	#include <vector>
	6	#include <map>
	7	+#include <ios>
	8
	9	using namespace std;
	10

Lines 1-5 Link Here

(-)pkg-descr (-3 / +3 lines)
1	This is a port for Extreme Tux Racer, the latest fork of the classic Tux Racer,	1	Extreme Tux Racer, the latest fork of the classic Tux Racer, involves
2	which involves racing downhill as tux.	2	racing downhill as Tux. Extreme Tux Racer contains many new courses,
3	Extreme Tux Racer contains many new courses, cups and other features.	3	cups and other features.
4		4
5	WWW: https://sourceforge.net/projects/extremetuxracer/	5	WWW: https://sourceforge.net/projects/extremetuxracer/

Return to bug 230744

Lines 3-15 Link Here

(-)Makefile (-6 / +8 lines)
3		3
4	PORTNAME= etracer	4	PORTNAME= etracer
5	PORTVERSION= 0.6.0	5	PORTVERSION= 0.6.0
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/extremetuxracer/releases/${PORTVERSION}	8	MASTER_SITES= SF/extremetuxracer/releases/${PORTVERSION}
9	DISTNAME= etr-${PORTVERSION}	9	DISTNAME= etr-${PORTVERSION}
10		10
11	MAINTAINER= peter_dunning@dsl.pipex.com	11	MAINTAINER= tobik@FreeBSD.org
12	COMMENT= Latest and greatest fork of the classic Tux Racer	12	COMMENT= Extreme Tux Racer
13		13
14	LICENSE= GPLv2	14	LICENSE= GPLv2
15		15
Lines 16-26 Link Here
16	LIB_DEPENDS= libpng.so:graphics/png \	16	LIB_DEPENDS= libpng.so:graphics/png \
17	libfreetype.so:print/freetype2	17	libfreetype.so:print/freetype2
18		18
		19	USES= compiler gmake localbase pkgconfig tar:xz tcl
19	USE_SDL= mixer sdl image	20	USE_SDL= mixer sdl image
20	USE_GCC= yes
21	USE_GL= gl glu	21	USE_GL= gl glu
22	USES= gmake pkgconfig tar:xz tcl	22
23	CPPFLAGS+= -I${LOCALBASE}/include
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25		24
		25	CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
		26	CXXFLAGS_clang= -Wno-c++11-narrowing
		27
26	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-quadtree.cpp (+16 lines)
	1	quadtree.cpp:860:29: error: ordered comparison between pointer and zero
	2	('TTexture *' and 'int')
	3	if (TerrList[j].texture > 0) {
	4	~~~~~~~~~~~~~~~~~~~ ^ ~
	5
	6	--- quadtree.cpp.orig 2018-08-19 09:03:02 UTC
	7	+++ quadtree.cpp
	8	@@ -857,7 +857,7 @@ void quadsquare::Render (const quadcornerdata& cd, GLu
	9	}
	10
	11	for (size_t j=0; j<numTerrains; j++) {
	12	- if (TerrList[j].texture > 0) {
	13	+ if (TerrList[j].texture != 0) {
	14	Course.TerrList[j].texture->Bind();
	15
	16	for (GLuint i=0; i<VertexArrayCounter; i++) {