1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00

Update Simgear & Flightgear ports to 2017.1.1

This commit is contained in:
Ganael LAPLANCHE 2017-03-01 20:44:10 +00:00
parent 0ae256d150
commit dd9b233570
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=435201
10 changed files with 31 additions and 58 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= simgear
PORTVERSION= 2016.4.4
PORTVERSION= 2017.1.1
CATEGORIES= devel games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1483648162
SHA256 (simgear-2016.4.4.tar.bz2) = 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc
SIZE (simgear-2016.4.4.tar.bz2) = 1200320
TIMESTAMP = 1487852956
SHA256 (simgear-2017.1.1.tar.bz2) = 1815f6a2c3f43bb6121b2394e68f8e6e341c14a7a40e4163c0bcc105ee06ccbc
SIZE (simgear-2017.1.1.tar.bz2) = 1236106

View File

@ -76,6 +76,9 @@ include/simgear/ephemeris/star.hxx
include/simgear/ephemeris/stardata.hxx
include/simgear/ephemeris/uranus.hxx
include/simgear/ephemeris/venus.hxx
include/simgear/io/iostreams/gzcontainerfile.hxx
include/simgear/io/iostreams/gzfstream.hxx
include/simgear/io/iostreams/sgstream.hxx
include/simgear/io/DNSClient.hxx
include/simgear/io/HTTPClient.hxx
include/simgear/io/HTTPFileRequest.hxx
@ -127,24 +130,22 @@ include/simgear/math/sg_geodesy.hxx
include/simgear/math/sg_random.h
include/simgear/math/sg_types.hxx
include/simgear/math/simd.hxx
include/simgear/math/simd4x4.hxx
include/simgear/misc/CSSBorder.hxx
include/simgear/misc/ListDiff.hxx
include/simgear/misc/ResourceManager.hxx
include/simgear/misc/SVGpreserveAspectRatio.hxx
include/simgear/misc/SimpleMarkdown.hxx
include/simgear/misc/gzcontainerfile.hxx
include/simgear/misc/interpolator.hxx
include/simgear/misc/make_new.hxx
include/simgear/misc/sg_dir.hxx
include/simgear/misc/sg_hash.hxx
include/simgear/misc/sg_path.hxx
include/simgear/misc/sgstream.hxx
include/simgear/misc/stdint.hxx
include/simgear/misc/stopwatch.hxx
include/simgear/misc/strutils.hxx
include/simgear/misc/tabbed_values.hxx
include/simgear/misc/texcoord.hxx
include/simgear/misc/zfstream.hxx
include/simgear/nasal/cppbind/Ghost.hxx
include/simgear/nasal/cppbind/NasalCallContext.hxx
include/simgear/nasal/cppbind/NasalContext.hxx

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flightgear-data
PORTVERSION= 2016.4.4
PORTVERSION= 2017.1.1
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
DISTNAME= FlightGear-${PORTVERSION}-data

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1483648719
SHA256 (FlightGear-2016.4.4-data.tar.bz2) = 3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668
SIZE (FlightGear-2016.4.4-data.tar.bz2) = 1654119067
TIMESTAMP = 1487853048
SHA256 (FlightGear-2017.1.1-data.tar.bz2) = 873c0906934b3d795db9fd78889a5c6badc2fe15229bef549974b1492042fd80
SIZE (FlightGear-2017.1.1-data.tar.bz2) = 1460031625

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flightgear
PORTVERSION= 2016.4.4
PORTREVISION= 1
PORTVERSION= 2017.1.1
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1483648311
SHA256 (flightgear-2016.4.4.tar.bz2) = d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc
SIZE (flightgear-2016.4.4.tar.bz2) = 7560911
TIMESTAMP = 1487853265
SHA256 (flightgear-2017.1.1.tar.bz2) = 8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028
SIZE (flightgear-2017.1.1.tar.bz2) = 8057285

View File

@ -1,41 +0,0 @@
Fix build with Clang 4.0
--- src/FDM/JSBSim/FGFDMExec.cpp 2017-01-20 21:38:08.784722000 +0000
+++ src/FDM/JSBSim/FGFDMExec.cpp 2017-01-20 22:55:24.501656000 +0000
@@ -211,7 +211,7 @@
SetGroundCallback(0);
- if (FDMctr > 0) (*FDMctr)--;
+ if (FDMctr != 0) (*FDMctr)--;
Debug(1);
}
--- src/FDM/JSBSim/input_output/FGInputSocket.cpp.orig 2017-01-21 20:58:27.676020000 +0100
+++ src/FDM/JSBSim/input_output/FGInputSocket.cpp 2017-01-21 21:02:08.818597000 +0100
@@ -192,7 +192,7 @@
} else {
socket->Reply("Must be in HOLD to search properties\n");
}
- } else if (node > 0) {
+ } else {
ostringstream buf;
buf << argument << " = " << setw(12) << setprecision(6) << node->getDoubleValue() << endl;
socket->Reply(buf.str());
--- src/Network/native_ctrls.cxx.orig 2017-01-21 21:06:09.165609000 +0100
+++ src/Network/native_ctrls.cxx 2017-01-21 21:10:14.120123000 +0100
@@ -428,10 +428,10 @@
// node->setDoubleValue( net->brake_right );
node = fgGetNode( "/controls/switches", true );
- node->setBoolValue( "master-bat", net->master_bat > 0 );
- node->setBoolValue( "master-alt", net->master_alt > 0);
- node->setBoolValue( "master-avionics", net->master_avionics > 0);
-
+ node->setBoolValue( "master-bat", net->master_bat != 0 );
+ node->setBoolValue( "master-alt", net->master_alt != 0 );
+ node->setBoolValue( "master-avionics", net->master_avionics > 0 );
+
node = fgGetNode( "/environment", true );
node->setDoubleValue( "wind-speed-kt", net->wind_speed_kt );
node->setDoubleValue( "wind-from-heading-deg", net->wind_dir_deg );

View File

@ -0,0 +1,13 @@
--- src/Main/CMakeLists.txt.orig 2017-02-22 17:29:45.000000000 +0000
+++ src/Main/CMakeLists.txt 2017-02-28 12:42:12.797102000 +0000
@@ -157,6 +157,10 @@
target_link_libraries(fgfs Qt5::Widgets fglauncher)
endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ target_link_libraries(fgfs execinfo)
+endif()
+
if (APPLE)
install(TARGETS fgfs BUNDLE DESTINATION .)
else()

View File

@ -1,11 +1,12 @@
bin/GPSsmooth
bin/JSBSim
bin/MIDGsmooth
bin/UGsmooth
bin/fgcom
bin/fgelev
bin/fgfs
bin/fgjs
bin/fgpanel
bin/fgtraffic
bin/fgviewer
bin/js_demo
bin/js_server