flightgear: Update wip/flightgear to 3.4.0.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: flightgear: Update wip/flightgear to 3.4.0.
From: Mateusz Poszwa <old4%o2.pl@localhost>
Date: Fri, 06 Nov 2015 22:00:23 +0000
Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Fri Nov 6 23:00:23 2015 +0100
Changeset:	e4bae972ccc887297259cf1f669daa033e1bc068

Modified Files:
	flightgear/Makefile
	flightgear/PLIST
	flightgear/distinfo
	flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp
	flightgear/patches/patch-src_Main_locale_cxx
Added Files:
	flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c
	flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c
	flightgear/patches/patch-3rdparty_mongoose_mongoose.c
Removed Files:
	flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h

Log Message:
flightgear: Update wip/flightgear to 3.4.0.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4bae972ccc887297259cf1f669daa033e1bc068

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 flightgear/Makefile                                    | 10 +++++-----
 flightgear/PLIST                                       |  3 ++-
 flightgear/distinfo                                    | 16 +++++++++-------
 .../patch-3rdparty_hts__engine__API_lib_HTS__misc.c    | 13 +++++++++++++
 .../patch-3rdparty_iaxclient_lib_libiax2_src_iax.c     | 13 +++++++++++++
 flightgear/patches/patch-3rdparty_mongoose_mongoose.c  | 18 ++++++++++++++++++
 .../patches/patch-src_Canvas_ShivaVG_src_shConfig_h    | 18 ------------------
 ...patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp | 10 +++++-----
 flightgear/patches/patch-src_Main_locale_cxx           |  2 +-
 9 files changed, 66 insertions(+), 37 deletions(-)

diffs:
diff --git a/flightgear/Makefile b/flightgear/Makefile
index 534fac5..4654580 100644
--- a/flightgear/Makefile
+++ b/flightgear/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.53 2015/06/30 09:57:35 ryoon Exp $
 
-DISTNAME=	flightgear-2.8.0
-PKGREVISION=	24
+DISTNAME=	flightgear-3.4.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Source/ \
 		http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
@@ -24,9 +23,10 @@ CMAKE_ARGS+=		-DJPEG_FACTORY:BOOL=ON
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.simgear+=	simgear>=2.0.0
-.include "../../games/simgear/buildlink3.mk"
+BUILDLINK_API_DEPENDS.simgear+=	simgear>=${PKGVERSION}
+.include "../../wip/simgear/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
-.include "../../graphics/osg/buildlink3.mk"
+BUILDLINK_API_DEPENDS.osg+=	osg>=3.2.0
+.include "../../wip/osg/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/flightgear/PLIST b/flightgear/PLIST
index c012f0f..c29aa50 100644
--- a/flightgear/PLIST
+++ b/flightgear/PLIST
@@ -2,6 +2,8 @@
 bin/GPSsmooth
 bin/MIDGsmooth
 bin/UGsmooth
+bin/fgcom
+bin/fgelev
 bin/fgfs
 bin/fgjs
 bin/fgpanel
@@ -14,6 +16,5 @@ bin/yasim-proptest
 man/man1/fgfs.1
 man/man1/fgjs.1
 man/man1/fgpanel.1
-man/man1/gl-info.1
 man/man1/js_demo.1
 man/man1/terrasync.1
diff --git a/flightgear/distinfo b/flightgear/distinfo
index 6e527cc..b523500 100644
--- a/flightgear/distinfo
+++ b/flightgear/distinfo
@@ -1,13 +1,15 @@
 $NetBSD: distinfo,v 1.6 2015/11/03 20:56:49 agc Exp $
 
-SHA1 (flightgear-2.8.0.tar.bz2) = fee4b2f1f6aca8e163ea018ae9897b99971c20bd
-RMD160 (flightgear-2.8.0.tar.bz2) = 97d8f572aeb186bfed27eb5b06803a0fa5213a61
-SHA512 (flightgear-2.8.0.tar.bz2) = 4d9b2584dd7c2fa4ad28d9769a9429809e420c7bf858967a5bb461f8ecb78dd079ff01c78febb95b7c3edce40dbf01e077bf7423324958e0b0a3cc74df12e1c1
-Size (flightgear-2.8.0.tar.bz2) = 2311023 bytes
+SHA1 (flightgear-3.4.0.tar.bz2) = 6ec57120338212a54dcb906f33d78ac4def8df18
+RMD160 (flightgear-3.4.0.tar.bz2) = 18e2b3e75c4f54f998f1654428e645b33f7493d9
+SHA512 (flightgear-3.4.0.tar.bz2) = 840d695f90f34879e36cd44a6ed3f5be1fb27ac48fcbc71a5ae99b556778289d4303d20b6dce3d70d16c1c34a7c69dee81af06898d08b9e55808efb6540f70f8
+Size (flightgear-3.4.0.tar.bz2) = 7520321 bytes
+SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = da3f79e04f4fc20dac5697a242931a2aa1ee1886
+SHA1 (patch-3rdparty_iaxclient_lib_libiax2_src_iax.c) = 3a9b8cb33d92aca86fd5ed72fcecb40f5e381225
+SHA1 (patch-3rdparty_mongoose_mongoose.c) = a106619eadb26907865691e66bdd6955a02aa291
 SHA1 (patch-CMakeModules_FindPLIB_cmake) = c5761d425743761f5f0c711ef2ca384a06f6d524
-SHA1 (patch-src_Canvas_ShivaVG_src_shConfig_h) = bd70a1e41a59196e31789e38ec67e65cef546edf
-SHA1 (patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp) = 9c066364096452868194f84d8c853131aec83f80
-SHA1 (patch-src_Main_locale_cxx) = 327f4103ff3aea60f2394a2ed192c5f6af36f60b
+SHA1 (patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp) = 964b8b9986762187e89b332f4fd1cfbd60253a22
+SHA1 (patch-src_Main_locale_cxx) = b10930f1cd770108896e695b30ef8470505ddadb
 SHA1 (patch-src_Network_ATC-Inputs_cxx) = 08644c682ddddcefea48aa84fa538b8fd20289c0
 SHA1 (patch-src_Network_ATC-Outputs_cxx) = d5367f8536988b2705b2ba4f8d86e28576b04648
 SHA1 (patch-utils_TerraSync_terrasync_cxx) = 48855911a5052301f2c7a449ac8ff14ada9ae8ea
diff --git a/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c b/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c
new file mode 100644
index 0000000..0d73cf7
--- /dev/null
+++ b/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig	2015-02-15 20:01:07.000000000 +0000
++++ 3rdparty/hts_engine_API/lib/HTS_misc.c
+@@ -247,6 +247,8 @@ size_t HTS_ftell(HTS_File * fp)
+       fgetpos((FILE *) fp->pointer, &pos);
+ #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__)
+       return (size_t) pos;
++#elif defined(__NetBSD__)
++      return (size_t) pos._pos;
+ #else
+       return (size_t) pos.__pos;
+ #endif                          /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
diff --git a/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c b/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c
new file mode 100644
index 0000000..06dd63c
--- /dev/null
+++ b/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig	2015-02-15 20:01:07.000000000 +0000
++++ 3rdparty/iaxclient/lib/libiax2/src/iax.c
+@@ -75,7 +75,7 @@
+ // FlightGear: Modified to include FreeBSD
+ #if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+-#if !defined(SOLARIS)
++#if !defined(SOLARIS) && !defined(__NetBSD__)
+ #include <error.h>
+ #endif
+ #endif
diff --git a/flightgear/patches/patch-3rdparty_mongoose_mongoose.c b/flightgear/patches/patch-3rdparty_mongoose_mongoose.c
new file mode 100644
index 0000000..9792ea8
--- /dev/null
+++ b/flightgear/patches/patch-3rdparty_mongoose_mongoose.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- 3rdparty/mongoose/mongoose.c.orig	2015-02-15 20:01:07.000000000 +0000
++++ 3rdparty/mongoose/mongoose.c
+@@ -118,6 +118,13 @@ typedef struct _stati64 ns_stat_t;
+ #include <netdb.h>
+ #include <pthread.h>
+ #include <stdarg.h>
++#ifndef va_copy
++#ifdef __va_copy
++#define va_copy(x,y) __va_copy((x), (y))
++#else
++#define va_copy(x,y) ((x) = (y))
++#endif // NetBSD defines va_copy only when certain conditions are met
++#endif
+ #include <unistd.h>
+ #include <arpa/inet.h>  // For inet_pton() when NS_ENABLE_IPV6 is defined
+ #include <netinet/in.h>
diff --git a/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h b/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h
deleted file mode 100644
index 6862d8e..0000000
--- a/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_Canvas_ShivaVG_src_shConfig_h,v 1.1 2012/09/30 10:04:33 dholland Exp $
-
-This sublibrary insists on being able to work out its OS type, and
-only knows a few, even though it uses the results for just about
-nothing. So give it some crayons to play with.
-
---- src/Canvas/ShivaVG/src/shConfig.h~	2012-08-16 14:20:56.000000000 +0000
-+++ src/Canvas/ShivaVG/src/shConfig.h
-@@ -34,7 +34,8 @@
- #else
- 
-     // Unsupported system
--    #error This operating system is not supported by SFML library
-+    //#error This operating system is not supported by SFML library
-+    #define VG_API_OTHER
- 
- #endif
- 
diff --git a/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp b/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp
index 355f0b6..3aafb07 100644
--- a/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp
+++ b/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp
@@ -6,8 +6,8 @@ $NetBSD: patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp,v 1.1 2014/08/19 13
  
    Name = engine_element->GetAttributeValue("name");
  
--  Load(engine_element, PropertyManager, to_string(EngineNumber)); // Call ModelFunctions loader
-+  Load(engine_element, PropertyManager, ::to_string(EngineNumber)); // Call ModelFunctions loader
+-  FGModelFunctions::Load(engine_element, PropertyManager, to_string((int)EngineNumber)); // Call ModelFunctions loader
++  FGModelFunctions::Load(engine_element, PropertyManager, ::to_string((int)EngineNumber)); // Call ModelFunctions loader
  
  // Find and set engine location
  
@@ -15,8 +15,8 @@ $NetBSD: patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp,v 1.1 2014/08/19 13
    property_name = base_property_name + "/fuel-used-lbs";
    PropertyManager->Tie( property_name.c_str(), this, &FGEngine::GetFuelUsedLbs);
  
--  PostLoad(engine_element, PropertyManager, to_string(EngineNumber));
-+  PostLoad(engine_element, PropertyManager, ::to_string(EngineNumber));
+-  PostLoad(engine_element, PropertyManager, to_string((int)EngineNumber));
++  PostLoad(engine_element, PropertyManager, ::to_string((int)EngineNumber));
  
    Debug(0);
- }
+ 
diff --git a/flightgear/patches/patch-src_Main_locale_cxx b/flightgear/patches/patch-src_Main_locale_cxx
index 72fa37e..4e0f879 100644
--- a/flightgear/patches/patch-src_Main_locale_cxx
+++ b/flightgear/patches/patch-src_Main_locale_cxx
@@ -12,4 +12,4 @@ Use standard headers.
 +#include <cstdlib>
  #endif
  
- #include <simgear/props/props_io.hxx>
+ #include <cstdio>
Prev by Date: simgear: Update wip/simgear to 3.4.0.
Next by Date: flightgear: Import flightgear-2.8.0 as wip/flightgear.
Previous by Thread: simgear: Update wip/simgear to 3.4.0.
Next by Thread: flightgear: Import flightgear-2.8.0 as wip/flightgear.
Indexes:
Home | Main Index | Thread Index | Old Index