View | Details | Raw Unified | Return to bug 223649 | Differences between
and this patch

Collapse All | Expand All

(-)games/xptools/Makefile (+104 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	xptools
4
DISTVERSION=	wed_161r1
5
CATEGORIES=	games
6
7
MAINTAINER=	mike.d.ft402@gmail.com
8
COMMENT=	X-Plane Scenery Tools
9
10
LICENSE=	MIT
11
12
# Platform-specific defines in patch-src_XESCore_Airports.cpp.
13
# Somewhere on FlightGear wiki it is said WED would only work for AMD64 anyway.
14
ONLY_FOR_ARCHS=	amd64
15
16
LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
17
		libcurl.so:ftp/curl \
18
		libexpat.so:textproc/expat2 \
19
		libfreetype.so:print/freetype2 \
20
		libgmp.so:math/gmp \
21
		libjasper.so:graphics/jasper \
22
		libgeotiff.so:graphics/libgeotiff \
23
		libproj.so:graphics/proj \
24
		libmpfr.so:math/mpfr \
25
		libpng.so:graphics/png \
26
		libshp.so:devel/shapelib \
27
		libsquish.so:graphics/squish \
28
		libtiff.so:graphics/tiff \
29
		lib3ds.so:graphics/lib3ds \
30
		libGLw.so:graphics/libGLw \
31
		libGLU.so:graphics/libGLU
32
33
BUILD_DEPENDS=	gnustat:sysutils/coreutils
34
35
# Bundled cgal and libdime:
36
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
37
		${LOCALBASE}/lib/libntl.a:math/ntl
38
BUILD_DEPENDS+=	cmake:devel/cmake
39
40
USE_GITHUB=	yes
41
GH_ACCOUNT=	X-Plane
42
GH_SUBDIR=	libs:xptools_libs
43
GH_TAGNAME=	982173e:xptools_libs
44
45
USES=		gmake jpeg sqlite ssl
46
USE_CXXSTD=	c++11
47
USE_BINUTILS=	yes
48
USE_QT4=	corelib gui moc opengl
49
USE_GL+=	gl
50
51
BINARIES=	DDSTool DSFTool MeshTool ObjConverter ObjView RenderFarm RenderFarmUI WED XGrinder XPlaneSupportLin.p
52
53
OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DEBUG
54
55
.include <bsd.port.options.mk>
56
57
.if ${PORT_OPTIONS:MDEBUG}
58
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
59
IGNORE=	the Makefile has no flags for both debug and optimization
60
.else
61
ALL_TARGET=		debug
62
.endif
63
.else
64
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
65
ALL_TARGET=		release-opt
66
.else
67
ALL_TARGET=		release
68
.endif
69
.endif
70
71
post-patch:
72
	@${REINPLACE_CMD} \
73
		-e's:g++:${CXX}:g' \
74
		-e's|gcc|${CC}|g' \
75
		${WRKSRC}/makerules/global/toplevel.mk \
76
		${WRKSRC}/src/OneOffs/Makefile
77
	@${REINPLACE_CMD} \
78
		-e's:-Wl,--exclude-libs,libpng.a::g' \
79
		-e's:\./libs/local$$(MULTI_SUFFIX)/lib/libCGAL.a:XYZZY&:g' \
80
		-e's: \./libs/local$$(MULTI_SUFFIX)/lib/libCGAL_Core.a::g' \
81
		-e's:\./libs/local$$(MULTI_SUFFIX)/lib/libdime.a:XYZZY&:g' \
82
		-e's: .*libz.a: /usr/lib/libz.a /usr/lib/libbz2.a /usr/lib/liblzma.a:g' \
83
		-e's: \./libs/local$$(MULTI_SUFFIX)/lib: ${PREFIX}/lib:g' \
84
		-e's: ${PREFIX}/lib/libtiff.a:& ${PREFIX}/lib/libjbig.a:g' \
85
		-e's:XYZZY::g' \
86
		-e's: -ldl: -lexecinfo -lelf:g' \
87
		${WRKSRC}/makerules/ac3d \
88
		${WRKSRC}/makerules/DDSTool \
89
		${WRKSRC}/makerules/DSFTool \
90
		${WRKSRC}/makerules/ObjConverter \
91
		${WRKSRC}/makerules/ObjView \
92
		${WRKSRC}/makerules/RenderFarm \
93
		${WRKSRC}/makerules/WED \
94
		${WRKSRC}/makerules/XGrinder
95
96
pre-build:
97
	cd ${WRKSRC}/libs && ${GMAKE}
98
99
do-install:
100
.for f in ${BINARIES}
101
	${INSTALL_PROGRAM} ${WRKSRC}/build/*/*/${f} ${STAGEDIR}${PREFIX}/bin
102
.endfor
103
104
.include <bsd.port.mk>
(-)games/xptools/distinfo (+5 lines)
Line 0 Link Here
1
TIMESTAMP = 1511276611
2
SHA256 (X-Plane-xptools-wed_161r1_GH0.tar.gz) = eede9732b24dea94be1c21bf0b6c6dec475a25bbb2de2ce234f3ce701a216b82
3
SIZE (X-Plane-xptools-wed_161r1_GH0.tar.gz) = 20419334
4
SHA256 (X-Plane-xptools-982173e_GH0.tar.gz) = 9c705ded5e83e264e12cb36bacd7bbfc9adbce06eb2d523e6ac32aae08e0eecd
5
SIZE (X-Plane-xptools-982173e_GH0.tar.gz) = 115284556
(-)games/xptools/files/patch-libs_Makefile (+66 lines)
Line 0 Link Here
1
--- libs/Makefile.orig	2015-11-30 20:55:15 UTC
2
+++ libs/Makefile
3
@@ -111,6 +111,10 @@
4
 	PLAT_LINUX := Yes
5
 	VIS	:= -fvisibility=hidden
6
 endif
7
+ifeq ($(PLATFORM), FreeBSD)
8
+	PLAT_LINUX := Yes
9
+	VIS	:= -fvisibility=hidden
10
+endif
11
 
12
 # boost
13
 ARCHIVE_BOOST		:= boost_$(VER_BOOST).tar.gz
14
@@ -368,9 +372,7 @@
15
 libexpat libgmp libmpfr libssl libcurl libjasper
16
 
17
 all: ./local$(MULTI_SUFFIX)/.xpt_libs
18
-./local$(MULTI_SUFFIX)/.xpt_libs: boost mesa_headers zlib libpng \
19
-libfreetype libjpeg libtiff libproj libgeotiff libsqlite lib3ds libcgal \
20
-libsquish libdime libshp libexpat libgmp libmpfr libssl libcurl libjasper
21
+./local$(MULTI_SUFFIX)/.xpt_libs: libcgal libdime
22
 	@touch ./local$(MULTI_SUFFIX)/.xpt_libs
23
 	
24
 clean:
25
@@ -629,11 +631,7 @@
26
 
27
 
28
 libcgal: ./local$(MULTI_SUFFIX)/lib/.xpt_libcgal
29
-./local$(MULTI_SUFFIX)/lib/.xpt_libcgal: \
30
-./local$(MULTI_SUFFIX)/lib/.xpt_zlib \
31
-./local$(MULTI_SUFFIX)/lib/.xpt_libgmp \
32
-./local$(MULTI_SUFFIX)/lib/.xpt_libmpfr \
33
-./local$(MULTI_SUFFIX)/lib/.xpt_boost
34
+./local$(MULTI_SUFFIX)/lib/.xpt_libcgal:
35
 	@echo "building libcgal..."
36
 	@-mkdir -p "./local$(MULTI_SUFFIX)/include"
37
 	@-mkdir -p "./local$(MULTI_SUFFIX)/lib"
38
@@ -663,24 +661,17 @@
39
 endif
40
 ifdef PLAT_LINUX
41
 	@cd "CGAL-$(VER_CGAL)" && \
42
+	sed -i.orig 81d src/CMakeLists.txt && \
43
 	cmake . -DCMAKE_INSTALL_PREFIX=$(DEFAULT_PREFIX) \
44
 	-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=FALSE \
45
 	-DCGAL_CXX_FLAGS="$(VIS) -I$(DEFAULT_INCDIR)" \
46
 	-DCGAL_MODULE_LINKER_FLAGS="-L$(DEFAULT_LIBDIR)" \
47
 	-DCGAL_SHARED_LINKER_FLAGS="-L$(DEFAULT_LIBDIR)" \
48
 	-DCGAL_EXE_LINKER_FLAGS="-L$(DEFAULT_LIBDIR)" \
49
-	-DGMP_INCLUDE_DIR=$(DEFAULT_INCDIR) \
50
-	-DGMP_LIBRARIES_DIR=$(DEFAULT_LIBDIR) \
51
-	-DGMP_LIBRARIES=$(DEFAULT_LIBDIR)/libgmp.a \
52
-	-DGMPXX_INCLUDE_DIR=$(DEFAULT_INCDIR) \
53
-	-DGMPXX_LIBRARIES=$(DEFAULT_LIBDIR)/libgmpxx.a \
54
-	-DMPFR_INCLUDE_DIR=$(DEFAULT_INCDIR) \
55
-	-DMPFR_LIBRARIES_DIR=$(DEFAULT_LIBDIR) \
56
-	-DMPFR_LIBRARIES=$(DEFAULT_LIBDIR)/libmpfr.a \
57
 	-DWITH_CGAL_ImageIO=OFF -DWITH_CGAL_PDB=OFF -DWITH_CGAL_Qt3=OFF \
58
-	-DWITH_CGAL_Qt4=OFF -DBoost_INCLUDE_DIR=$(DEFAULT_PREFIX)/include \
59
-	-DBOOST_ROOT=$(DEFAULT_PREFIX) $(BE_QUIET) && \
60
-	make $(BE_QUIET) && make install $(BE_QUIET)
61
+	-DWITH_CGAL_Qt4=OFF \
62
+	$(BE_QUIET) && \
63
+	gmake $(BE_QUIET) && gmake install $(BE_QUIET)
64
 endif
65
 ifdef PLAT_MINGW
66
 	@cd "CGAL-$(VER_CGAL)" && \
(-)games/xptools/files/patch-makerules_Meshtool (+34 lines)
Line 0 Link Here
1
--- makerules/MeshTool.orig	2017-04-14 14:21:02 UTC
2
+++ makerules/MeshTool
3
@@ -11,18 +11,20 @@
4
 ifdef PLAT_LINUX
5
 LDFLAGS		+= -static
6
 LIBS		:= ./libs/local$(MULTI_SUFFIX)/lib/libCGAL.a
7
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libboost_thread.a
8
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libboost_system.a
9
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libsquish.a
10
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libgeotiff.a
11
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libshp.a
12
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libproj.a
13
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libtiff.a
14
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libjpeg.a
15
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libpng.a
16
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libz.a
17
-LIBS		+= ./libs/local$(MULTI_SUFFIX)/lib/libjasper.a
18
+LIBS		+= ${PREFIX}/lib/libboost_thread.a
19
+LIBS		+= ${PREFIX}/lib/libboost_system.a
20
+LIBS		+= ${PREFIX}/lib/libsquish.a
21
+LIBS		+= ${PREFIX}/lib/libgeotiff.a
22
+LIBS		+= ${PREFIX}/lib/libshp.a
23
+LIBS		+= ${PREFIX}/lib/libproj.a
24
+LIBS		+= ${PREFIX}/lib/libtiff.a
25
+LIBS		+= ${PREFIX}/lib/libjbig.a
26
+LIBS		+= ${PREFIX}/lib/libjpeg.a
27
+LIBS		+= ${PREFIX}/lib/libpng.a
28
+LIBS		+= -lz -llzma
29
+LIBS		+= ${PREFIX}/lib/libjasper.a
30
 LIBS		+= -lpthread -lrt
31
+LIBS		+= -lexecinfo -lelf
32
 endif #PLAT_LINUX
33
 
34
 ifdef PLAT_MINGW
(-)games/xptools/files/patch-makerules_RenderFarmUI (+25 lines)
Line 0 Link Here
1
--- makerules/RenderFarmUI.orig	2017-04-14 14:21:02 UTC
2
+++ makerules/RenderFarmUI
3
@@ -14,10 +14,10 @@
4
 LIBS		+= -Wl,--as-needed
5
 LIBS		+= -Wl,-Bstatic -Wl,--start-group
6
 LIBS		+= -lexpat -lsquish -lsqlite3 -lshp -lgeotiff
7
-LIBS		+= -lCGAL -lCGAL_Core -lproj -lfreetype -ltiff -ljpeg -lpng -lz -ljasper
8
-LIBS		+= -lgmp -lmpfr -lstdc++ -lm -lgcc -lgcc_eh
9
+LIBS		+= -lCGAL -lproj -lfreetype -ltiff -ljbig -ljpeg -lpng -lz -lbz2 -llzma -ljasper
10
+LIBS		+= -lgmp -lmpfr -lc++ -lm -lgcc -lgcc_eh
11
 LIBS		+= -Wl,--end-group -Wl,-Bdynamic
12
-LIBS		+= -lQtCore -lQtGui -lQtOpenGL -lGL -lGLU -ldl -lc
13
+LIBS		+= -lQtCore -lQtGui -lQtOpenGL -lGL -lGLU -lexecinfo -lelf -lc
14
 LIBS		+= -lboost_thread -lboost_system -lpthread
15
 endif #PLAT_LINUX
16
 
17
@@ -39,7 +39,7 @@
18
 LIBS		+= ./libs/local/lib/libpng.a
19
 LIBS		+= ./libs/local/lib/libfreetype.a
20
 LIBS		+= ./libs/local/lib/libexpat.a
21
-LIBS		+= ./libs/local/lib/libz.a
22
+LIBS		+= /usr/lib/libz.a /usr/lib/libbz2.a /usr/lib/liblzma.a
23
 endif #PLAT_DARWIN
24
 
25
 ##
(-)games/xptools/files/patch-makerules_global_paths.mk (+20 lines)
Line 0 Link Here
1
--- makerules/global/paths.mk.orig	2017-04-14 14:21:02 UTC
2
+++ makerules/global/paths.mk
3
@@ -2,6 +2,8 @@
4
 # project wide include and library searchpaths
5
 ##############################################
6
 
7
+LIBPATHS += -L${PREFIX}/lib
8
+LIBPATHS += -L${PREFIX}/lib/qt4
9
 LIBPATHS += -L./libs/local$(MULTI_SUFFIX)/lib
10
 
11
 INCLUDEPATHS += -I./libs/local$(MULTI_SUFFIX)/include
12
@@ -43,5 +44,7 @@
13
 
14
 ifdef PLAT_LINUX
15
 INCLUDEPATHS += -I./libs/local$(MULTI_SUFFIX)/include/mesa
16
-INCLUDEPATHS += -I/usr/include/qt4
17
+INCLUDEPATHS += -I${PREFIX}/include
18
+INCLUDEPATHS += -I${PREFIX}/include/qt4
19
+INCLUDEPATHS += -I${PREFIX}/include/freetype2
20
 endif #PLAT_LINUX
(-)games/xptools/files/patch-makerules_global_toplevel.mk (+34 lines)
Line 0 Link Here
1
--- makerules/global/toplevel.mk.orig	2017-04-14 14:21:02 UTC
2
+++ makerules/global/toplevel.mk
3
@@ -8,7 +8,7 @@
4
 .PHONY: all clean linkclean
5
 
6
 PLATFORM	:= $(shell uname)
7
-ARCHITECTURE	:= $(shell uname -m)
8
+ARCHITECTURE	:= $(shell uname -m |sed s/amd64/x86_64/)
9
 WD		:= $(PWD)
10
 
11
 
12
@@ -23,6 +23,9 @@
13
 ifeq ($(PLATFORM), Linux)
14
 	PLAT_LINUX	:= Yes
15
 endif
16
+ifeq ($(PLATFORM), FreeBSD)
17
+	PLAT_LINUX	:= Yes
18
+endif
19
 ifeq ($(PLATFORM), Darwin)
20
 	PLAT_DARWIN	:= Yes
21
 endif
22
@@ -110,9 +113,9 @@
23
 # if someone has a ppc linux machine, please define -DLIL/-DBIG in the code,
24
 # remove them here and use the __ppc__ macro to resolve endianess issues
25
 	DEFINES		:= -DLIN=1 -DIBM=0 -DAPL=0 -DLIL=1 -DBIG=0
26
-	CFLAGS		:= $(M32_SWITCH) -Wno-deprecated-declarations -Wno-multichar -pipe -frounding-math
27
-	CXXFLAGS	:= $(M32_SWITCH) -Wno-deprecated -Wno-deprecated-declarations -Wno-multichar -pipe -frounding-math
28
-	LDFLAGS		:= $(M32_SWITCH) -static-libgcc
29
+	CFLAGS		:= $(M32_SWITCH) -Wno-deprecated-declarations -Wno-multichar -pipe
30
+	CXXFLAGS	:= $(M32_SWITCH) -Wno-deprecated -Wno-deprecated-declarations -Wno-multichar -pipe
31
+	LDFLAGS		:= $(M32_SWITCH)
32
 	BARE_LDFLAGS	:=
33
 	STRIPFLAGS	:= -s -x
34
 endif
(-)games/xptools/files/patch-src_GUI_GUI_Resources.cpp (+11 lines)
Line 0 Link Here
1
--- src/GUI/GUI_Resources.cpp.orig	2017-04-14 14:21:02 UTC
2
+++ src/GUI/GUI_Resources.cpp
3
@@ -242,7 +242,7 @@
4
 
5
 GUI_Resource	GUI_LoadResource(const char* in_resource)
6
 {
7
-	if (sResMap.empty()) gModuleHandle = dlopen(0, RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
8
+	if (sResMap.empty()) gModuleHandle = dlopen(0, RTLD_NOW | RTLD_LOCAL);
9
 	if (!gModuleHandle)
10
 	{
11
 		printf("error opening module\n");
(-)games/xptools/files/patch-src_Network_PCSBSocket.lin.cpp (+12 lines)
Line 0 Link Here
1
--- src/Network/PCSBSocket.lin.cpp.orig	2017-04-14 14:21:02 UTC
2
+++ src/Network/PCSBSocket.lin.cpp
3
@@ -30,9 +30,6 @@
4
 #include <netinet/in.h>
5
 #include <netinet/tcp.h>
6
 #include <sys/ioctl.h>
7
-#if LIN
8
-	#include <asm/ioctls.h>
9
-#endif
10
 #include <arpa/inet.h>
11
 #include <netdb.h>
12
 #include <unistd.h>
(-)games/xptools/files/patch-src_Obj_XDefs.h (+48 lines)
Line 0 Link Here
1
--- src/Obj/XDefs.h.orig	2017-04-14 14:21:02 UTC
2
+++ src/Obj/XDefs.h
3
@@ -177,40 +177,21 @@
4
 //		#define __powerpc__
5
 //	#endif
6
 
7
-	#if APL || LIN || MINGW_BUILD
8
-// TODO: replace this hack with standard conform <unordered_map>, <hash_map> will disappear in the near future
9
-	#define GCC_VERSION (__GNUC__ * 10000 \
10
-                               + __GNUC_MINOR__ * 100 \
11
-                               + __GNUC_PATCHLEVEL__)
12
-	#if GCC_VERSION >= 40300
13
-		#include <backward/hash_fun.h>
14
-		#include <backward/hash_map>
15
-	#else
16
		#include <ext/hash_map>
17
-		#include <ext/hash_fun.h>
18
-	#endif
19
-
20
 		namespace __gnu_cxx {
21
 			template<>
22
 			struct hash<std::string>
23
 			{
24
 				size_t
25
 				operator()(const std::string& __s) const
26
-				{ return __stl_hash_string(__s.c_str()); }
27
-			};
28
-
29
-			template<>
30
-			struct hash<float>
31
-			{
32
-				size_t
33
-				operator()(const float& __s) const
34
-				{ return (size_t) __s; }
35
+				{
36
+					std::hash<std::string> hash_fn;
37
+					return hash_fn(__s);
38
+				}
39
 			};
40
 
41
 		}
42
-	#else
43
-		#include <hash_map>
44
-	#endif
45
+
46
 	using namespace	std;				// DEC THIS TO GET THE NEW IOS FUNCTIONS IN fstream, iomanip, and string, which are all new, unlike the old fstream.h, iomanip.h, and string.h
47
 	using namespace __gnu_cxx;			// DEC THIS TO GET THE NEW IOS FUNCTIONS IN fstream, iomanip, and string, which are all new, unlike the old fstream.h, iomanip.h, and string.h
48
 	using __gnu_cxx::hash_map;
(-)games/xptools/files/patch-src_UI_XGUIApp.cpp (+11 lines)
Line 0 Link Here
1
--- src/UI/XGUIApp.cpp.orig	2017-04-14 14:21:02 UTC
2
+++ src/UI/XGUIApp.cpp
3
@@ -26,6 +26,8 @@
4
 #include "PlatformUtils.h"
5
 #include "ObjCUtils.h"
6
 
7
+#include <locale.h>
8
+
9
 class	XGrinderWin;
10
 
11
 #if IBM
(-)games/xptools/files/patch-src_Utils_GISUtils.cpp (+15 lines)
Line 0 Link Here
1
--- src/Utils/GISUtils.cpp.orig	2017-11-07 02:12:22 UTC
2
+++ src/Utils/GISUtils.cpp
3
@@ -40,12 +40,7 @@
4
 // set to 1 to save geotiff inside geojp2 to disk
5
 #define DUMP_GTIF 0
6
 
7
-#if defined(IBM)
8
-	#include <libxtiff/xtiffio.h>
9
-	#include "GUI_Unicode.h"
10
-#else
11
 	#include <xtiffio.h>
12
-#endif
13
 void	make_cache_file_path(const char * cache_base, int west, int south, const char * cache_name, char path[1024])
14
 {
15
 	sprintf(path, "%s%s%+03d%+04d%s%+03d%+04d.%s.txt", cache_base, DIR_STR, latlon_bucket (south), latlon_bucket (west), DIR_STR, (int) south, (int) west, cache_name);
(-)games/xptools/files/patch-src_Utils_PlatformUtils.lin.cpp (+10 lines)
Line 0 Link Here
1
--- src/Utils/PlatformUtils.lin.cpp.orig	2017-04-14 14:21:02 UTC
2
+++ src/Utils/PlatformUtils.lin.cpp
3
@@ -28,7 +28,6 @@
4
 #include <pwd.h>
5
 #include <cstring>
6
 #include <string>
7
-#include <linux/limits.h>
8
 
9
 string GetApplicationPath()
10
 {
(-)games/xptools/files/patch-src_WEDCore_WED_AppMain.cpp (+11 lines)
Line 0 Link Here
1
--- src/WEDCore/WED_AppMain.cpp.orig	2017-04-14 14:21:02 UTC
2
+++ src/WEDCore/WED_AppMain.cpp
3
@@ -27,6 +27,8 @@
4
 #include <stdio.h>
5
 #endif
6
 
7
+#include <locale.h>
8
+
9
 #include "WED_AboutBox.h"
10
 // Stuff we need to init
11
 //#include "XESInit.h"
(-)games/xptools/files/patch-src_XESCore_Airports.cpp (+14 lines)
Line 0 Link Here
1
/usr/local/include/boost/numeric/interval/hw_rounding.hpp:42:4: error: Boost.Numeric.Interval: Please specify rounding control mechanism.
2
--- src/XESCore/Airports.cpp.orig	2017-11-07 03:31:14 UTC
3
+++ src/XESCore/Airports.cpp
4
@@ -38,6 +38,10 @@
5
 #include "CompGeomUtils.h"
6
 #include "MapBuffer.h"
7
 #include <CGAL/convex_hull_2.h>
8
+// FIXME Arch-specific!
9
+#define __x86_64__ YES
10
+#define __USE_ISOC99 YES
11
+// END FIXME
12
 #include <CGAL/Sweep_line_2_algorithms.h>
13
 #include <CGAL/Boolean_set_operations_2/Gps_polygon_validation.h>
14
 #if DEV
(-)games/xptools/files/patch-src__WEDImportExport__WED_DSFExport.cpp.patch (+38 lines)
Line 0 Link Here
1
--- src/WEDImportExport/WED_DSFExport.cpp.orig	2017-04-14 14:21:02 UTC
2
+++ src/WEDImportExport/WED_DSFExport.cpp
3
@@ -685,7 +685,7 @@
4
 
5
 }
6
 
7
-static void	DSF_AccumChainBezier(
8
+static void	DSF_AccumChainBezier2p(
9
 						vector<Bezier2p>::const_iterator		start,
10
 						vector<Bezier2p>::const_iterator		end,
11
 						const Bbox2&							bounds,
12
@@ -802,7 +802,7 @@
13
 	}	
14
 }
15
 
16
-static void	DSF_AccumChain(
17
+static void	DSF_AccumChain2p(
18
 						vector<Segment2p>::const_iterator	start,
19
 						vector<Segment2p>::const_iterator	end,
20
 						const Bbox2&						bounds,
21
@@ -1370,7 +1370,7 @@
22
 						if(fac_is_auto_closed && bad_match(chain.front(),chain.back()))
23
 							problem_children.insert(what);
24
 						else
25
-							DSF_AccumChainBezier(chain.begin(),chain.end(), safe_bounds, cbs,writer, idx, fac->GetHeight(), fac_is_auto_closed);
26
+							DSF_AccumChainBezier2p(chain.begin(),chain.end(), safe_bounds, cbs,writer, idx, fac->GetHeight(), fac_is_auto_closed);
27
 					}
28
 				}
29
 				else
30
@@ -1391,7 +1391,7 @@
31
 						if(fac_is_auto_closed && bad_match(chain.front(),chain.back()))
32
 							problem_children.insert(what);
33
 						else						
34
-							DSF_AccumChain(chain.begin(),chain.end(), safe_bounds, cbs,writer, idx, fac->GetHeight(), fac_is_auto_closed);
35
+							DSF_AccumChain2p(chain.begin(),chain.end(), safe_bounds, cbs,writer, idx, fac->GetHeight(), fac_is_auto_closed);
36
 					}
37
 				}
38
 			}
(-)games/xptools/files/patch-src_linuxinit_initializer.cpp (+13 lines)
Line 0 Link Here
1
--- src/linuxinit/initializer.cpp.orig	2017-04-14 14:21:02 UTC
2
+++ src/linuxinit/initializer.cpp
3
@@ -102,9 +102,7 @@
4
 	}
5
 	m_init = true;
6
 	// Try to resolve /proc/self/exe first
7
-	if (!(m_abspath = canonicalize_file_name("/proc/self/exe")))
8
-		// Try argv[0]
9
-		if (!(m_abspath = canonicalize_file_name(*argv[0])))
10
+	if (!(m_abspath = *argv[0]))
11
 			goto critical;
12
 
13
 	temp = strdup(const_cast<const char* const>(m_abspath));
(-)games/xptools/pkg-descr (+7 lines)
Line 0 Link Here
1
The X-Plane Scenery Tools (XPTools) code base is the source code tree for all
2
of the Laminar Research scenery creation/editing tools.  This code does not
3
include X-Plane and the "X-Apps" (PlaneMaker, WorldMaker, AirfoilMaker, and
4
Briefer).  It does include source to the ac3d x-plane plugin, WED, the various
5
tools, and our global scenery generator.
6
7
WWW: https://developer.x-plane.com/code/
(-)games/xptools/pkg-message (+16 lines)
Line 0 Link Here
1
X-Plane itself does not need to be installed before using WED. However, WED will
2
require that you choose the X-Plane folder before it will allow you to do
3
anything. Create a working directory with the following structure before
4
starting WED for the first time.
5
6
working directory <-- Pick a name
7
   |--Custom Scenery
8
   |--Global Scenery
9
   |--Resources
10
         |--default scenery
11
12
You can create it with the following commands:
13
14
$ mkdir working_directory
15
$ cd working_directory
16
$ mkdir -p 'Custom Scenery' 'Global Scenery' 'Resources/default scenery'
(-)games/xptools/pkg-plist (+10 lines)
Line 0 Link Here
1
bin/DDSTool
2
bin/DSFTool
3
bin/MeshTool
4
bin/ObjConverter
5
bin/ObjView
6
bin/RenderFarm
7
bin/RenderFarmUI
8
bin/WED
9
bin/XGrinder
10
bin/XPlaneSupportLin.p

Return to bug 223649