sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Simgear & Flightgear ports to 2018.3.1

Browse source 
Changes:	http://wiki.flightgear.org/Changelog_2018.3
PR:		233811
Submitted by:	Michael Danilov <mike.d.ft402@gmail.com>
This commit is contained in:
Ganael LAPLANCHE 2018-12-12 11:02:44 +00:00
parent 41f4d42792
commit 12b32c00e3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=487291
12 changed files with 14 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/simgear/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= simgear
PORTVERSION= 2018.2.2
PORTREVISION= 3
PORTVERSION= 2018.3.1
CATEGORIES= devel games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}

6
devel/simgear/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535914817
SHA256 (simgear-2018.2.2.tar.bz2) = f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5
SIZE (simgear-2018.2.2.tar.bz2) = 1313890
TIMESTAMP = 1544043372
SHA256 (simgear-2018.3.1.tar.bz2) = 294580c8e98044f660d2a9d202856970a4ce9d81ff0107fffcbd701d36daa06a
SIZE (simgear-2018.3.1.tar.bz2) = 1330322

1
devel/simgear/pkg-plist
View file

@ -54,6 +54,7 @@ include/simgear/canvas/layout/SpacerItem.hxx
include/simgear/compiler.h
include/simgear/constants.h
include/simgear/debug/BufferedLogCallback.hxx
include/simgear/debug/OsgIoCapture.hxx
include/simgear/debug/debug_types.h
include/simgear/debug/logstream.hxx
include/simgear/embedded_resources/EmbeddedResource.hxx

2
games/flightgear-data/Makefile
View file

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

6
games/flightgear-data/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535914967
SHA256 (FlightGear-2018.2.2-data.tar.bz2) = c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4
SIZE (FlightGear-2018.2.2-data.tar.bz2) = 1624681801
TIMESTAMP = 1544038436
SHA256 (FlightGear-2018.3.1-data.tar.bz2) = b03a74a69cf02370e4ff3cf3dd09fff9ae217b2873f9938803935082a48bc9c0
SIZE (FlightGear-2018.3.1-data.tar.bz2) = 1735407015

5
games/flightgear/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flightgear
PORTVERSION= 2018.2.2
PORTREVISION= 3
PORTVERSION= 2018.3.1
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
@ -49,6 +48,6 @@ DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF
QT5_CMAKE_ON= -DENABLE_QT:BOOL=ON
QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF
QT5_USES= qt:5
QT5_USE= QT=core,buildtools,gui,declarative,network,qmake,widgets
QT5_USE= QT=core,buildtools,gui,declarative,network,qmake,widgets,svg
.include <bsd.port.mk>

6
games/flightgear/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1535914762
SHA256 (flightgear-2018.2.2.tar.bz2) = 61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147
SIZE (flightgear-2018.2.2.tar.bz2) = 8346698
TIMESTAMP = 1544037940
SHA256 (flightgear-2018.3.1.tar.bz2) = 3d4a1f37e4d5cb376c16f02c111aac9d3e6b05529015c7d068ce2c00ecb5a640
SIZE (flightgear-2018.3.1.tar.bz2) = 8404294

25
games/flightgear/files/patch-3rdparty-joystick-js.h
View file

@ -1,25 +0,0 @@
Add missing defines and includes from removed ul.h
--- 3rdparty/joystick/js.h.orig 2018-05-30 23:24:08.180090000 +0200
+++ 3rdparty/joystick/js.h 2018-05-30 23:32:04.841896000 +0200
@@ -25,10 +25,20 @@
#define __INCLUDED_JS_H__ 1
#define JS_NEW
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+#include <fcntl.h>
+#include <sys/param.h>
+
#include <string>
#include <cstring>
#include <cstdlib>
+#include <simgear/props/props.hxx> /* for jsSetError and SG_WARN */
+
#define _JS_MAX_AXES 16
#define _JS_MAX_BUTTONS 32
#define _JS_MAX_HATS 4

15
games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx
View file

@ -1,15 +0,0 @@
jsSetError() takes only two arguments (unlike ulSetError())
--- 3rdparty/joystick/jsBSD.cxx.orig 2018-05-28 23:22:56.449679000 +0200
+++ 3rdparty/joystick/jsBSD.cxx 2018-05-28 23:50:32.852422000 +0200
@@ -326,8 +289,8 @@
error = ( joyfile == NULL ) ;
if ( error )
{
- jsSetError ( SG_WARN, "unable to open calibration file %s (%s), joystick %i disabled (you can generate the calibration file with the plib-jscal utility)",
- joyfname, strerror ( errno ), id + 1 );
+ jsSetError ( SG_WARN, "unable to open calibration file, you can generate "
+ "the calibration file with the plib-jscal utility" );
return ;
}

13
games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake
View file

@ -1,13 +0,0 @@
Use all linker flags from pkgconf, including library path
--- CMakeModules/SetupFGFSLibraries.cmake.orig 2018-05-29 23:46:55.859412000 +0200
+++ CMakeModules/SetupFGFSLibraries.cmake 2018-05-29 23:47:59.869522000 +0200
@@ -27,7 +27,7 @@
endif()
if(USE_DBUS)
- target_link_libraries(${target} ${DBUS_LIBRARIES})
+ target_link_libraries(${target} ${DBUS_LDFLAGS})
endif()
if(FG_HAVE_GPERFTOOLS)

15
games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx
View file

@ -1,15 +0,0 @@
Fix build with clang 7:
src/AIModel/AIFlightPlanCreatePushBack.cxx:96:48: error: ordered comparison between pointer and zero ('FGTaxiNode *' and 'int')
--- src/AIModel/AIFlightPlanCreatePushBack.cxx.orig 2018-08-17 19:14:25.768512000 +0200
+++ src/AIModel/AIFlightPlanCreatePushBack.cxx 2018-08-17 19:14:44.343865000 +0200
@@ -93,7 +93,7 @@
FGGroundNetwork* groundNet = dep->groundNetwork();
FGParking *parking = gate.parking();
- if (parking && parking->getPushBackPoint() > 0) {
+ if (parking && parking->getPushBackPoint() != nullptr) {
FGTaxiRoute route = groundNet->findShortestRoute(parking, parking->getPushBackPoint(), false);
int size = route.size();

46
games/flightgear/files/patch-clang7-stack_scope.diff
View file

@ -1,46 +0,0 @@
Fix scope of 'stack' when building with clang 7:
error: reference to 'stack' is ambiguous
--- src/FDM/UIUCModel/uiuc_aircraft.h.orig 2018-08-31 19:26:14.641298000 +0200
+++ src/FDM/UIUCModel/uiuc_aircraft.h 2018-08-31 19:50:35.444961000 +0200
@@ -150,7 +150,7 @@
#include "uiuc_parsefile.h"
#include "uiuc_flapdata.h"
-typedef stack :: iterator LIST;
+typedef ::stack :: iterator LIST;
/* Add more keywords here if required*/
enum {init_flag = 1000, geometry_flag, controlSurface_flag, controlsMixer_flag,
--- src/FDM/UIUCModel/uiuc_parsefile.h.orig 2018-08-31 19:34:45.641135000 +0200
+++ src/FDM/UIUCModel/uiuc_parsefile.h 2018-08-31 19:35:35.903930000 +0200
@@ -23,7 +23,7 @@
{
private:
- stack commands;
+ ::stack commands;
ifstream file;
void readFile();
@@ -37,7 +37,7 @@
void removeComments(string& inputLine);
string getToken(string inputLine, int tokenNo);
void storeCommands(string inputLine);
- stack getCommands();
+ ::stack getCommands();
};
#endif // _PARSE_FILE_H_
--- src/FDM/UIUCModel/uiuc_recorder.cpp.orig 2018-08-31 19:16:32.680030000 +0200
+++ src/FDM/UIUCModel/uiuc_recorder.cpp 2018-08-31 19:16:57.872109000 +0200
@@ -102,7 +102,7 @@
void uiuc_recorder( double dt )
{
- stack command_list;
+ ::stack command_list;
string linetoken;
// static int init = 0;
static int recordStep = 0;