From d097a9a7a4ecc953a5ac5f0f1fb6570e90e34639 Mon Sep 17 00:00:00 2001 From: martymac Date: Mon, 3 Nov 2014 13:07:17 +0000 Subject: Update Simgear and Flightgear ports to 3.2.0 PR: 194571 Submitted by: mike.d.ft402@gmail.com --- games/flightgear-aircraft/Makefile | 22 +++++++-------- games/flightgear-aircraft/distinfo | 20 ++++++------- games/flightgear-data/Makefile | 4 +-- games/flightgear-data/distinfo | 4 +-- games/flightgear/Makefile | 16 +++++------ games/flightgear/distinfo | 4 +-- ...-src-FDM-JSBSim-input_output-string_utilities.h | 30 -------------------- .../patch-3rdparty-hts_engine_API-lib-HTS_misc.c | 11 ++++++++ .../patch-3rdparty-iaxclient-lib-CMakeLists.txt | 33 ++++++++++++++++------ .../files/patch-3rdparty-iaxclient-lib-iaxclient.h | 11 -------- .../patch-3rdparty-iaxclient-lib-libiax2-src-iax.c | 11 -------- games/flightgear/files/patch-CMakeLists.txt | 23 +++++++++------ .../files/patch-JS_SERVER-CMakeLists.txt | 17 +++++++++++ .../files/patch-JS_SERVER-utils-CMakeLists.txt | 13 +++++++++ .../patch-JS_SERVER-utils-js_server-CMakeLists.txt | 10 +++++++ .../files/patch-src-Airports-airports_fwd.hxx | 10 ------- .../files/patch-src-FDM-JSBSim-JSBSim.cxx | 12 -------- games/flightgear/files/patch-utils-CMakeLists.txt | 13 --------- .../files/patch-utils-js_server-CMakeLists.txt | 10 ------- 19 files changed, 125 insertions(+), 149 deletions(-) delete mode 100644 games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h create mode 100644 games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c delete mode 100644 games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h delete mode 100644 games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c create mode 100644 games/flightgear/files/patch-JS_SERVER-CMakeLists.txt create mode 100644 games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt create mode 100644 games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt delete mode 100644 games/flightgear/files/patch-src-Airports-airports_fwd.hxx delete mode 100644 games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx delete mode 100644 games/flightgear/files/patch-utils-CMakeLists.txt delete mode 100644 games/flightgear/files/patch-utils-js_server-CMakeLists.txt (limited to 'games') diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile index 30b66fa53ba9..c88fad94b453 100644 --- a/games/flightgear-aircraft/Makefile +++ b/games/flightgear-aircraft/Makefile @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= flightgear-aircraft -PORTVERSION= 20140319 +PORTVERSION= 20141022 CATEGORIES= games # see http://www.flightgear.org/templates.js -MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.0/ \ - http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.0/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.0/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.0/ \ - ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.0/ +MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.2/ \ + http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.2/ \ + ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.2/ \ + ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.2/ \ + ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.2/ # Selection of production-ready/well-known planes # (planes already included in flightgear-data are excluded) # Please contact the MAINTAINER if a plane is missing @@ -25,8 +25,8 @@ DISTFILES= 737-200_20120506.zip \ Caudron-G3_20120506.zip \ F80C_20120717.zip \ Hurricane_20130823.zip \ - IL-2_20110311.zip \ - Lightning_20140116.zip \ + IL-2_20140508.zip \ + Lightning_20140613.zip \ Lockheed1049h_1.0.zip \ Messerschmitt-P1101_20130315.zip \ MirageIII_20131008.zip \ @@ -38,12 +38,12 @@ DISTFILES= 737-200_20120506.zip \ Super-Etendard_20131008.zip \ Supermarine-S.6B_20130312.zip \ Superwal_20100330.zip \ - airwaveXtreme150_July-2013.zip \ - asw20_July-2013.zip \ + airwaveXtreme150_June-2014.zip \ + asw20_June-2014.zip \ bf109_20130615.zip \ c310_20130209.zip \ dhc3_20120506.zip \ - f16_20120812.zip \ + f16_20140612.zip \ harrier_20130823.zip \ pa24-250_20121128.zip \ tu154_20081221.zip \ diff --git a/games/flightgear-aircraft/distinfo b/games/flightgear-aircraft/distinfo index 998111eee71d..8db939573248 100644 --- a/games/flightgear-aircraft/distinfo +++ b/games/flightgear-aircraft/distinfo @@ -22,10 +22,10 @@ SHA256 (flightgear-aircraft/F80C_20120717.zip) = 633016a2ea70f9be59927d5201c48af SIZE (flightgear-aircraft/F80C_20120717.zip) = 1528349 SHA256 (flightgear-aircraft/Hurricane_20130823.zip) = 10dfe10c5365c7232fdd324a0c3af6c1b2c90cd5373af263ac35eb031b3b4fb5 SIZE (flightgear-aircraft/Hurricane_20130823.zip) = 12062976 -SHA256 (flightgear-aircraft/IL-2_20110311.zip) = 1c7e126956247f7a6ed93cd4fc2abe65c756b07275559ed1f0bd03d731a51ee0 -SIZE (flightgear-aircraft/IL-2_20110311.zip) = 3933481 -SHA256 (flightgear-aircraft/Lightning_20140116.zip) = 607ce5957aeac09f1e223d5add0687c7d0e6e5651b0fa9f576934c8150798e3f -SIZE (flightgear-aircraft/Lightning_20140116.zip) = 4784925 +SHA256 (flightgear-aircraft/IL-2_20140508.zip) = 8e6ecb37fa5b5d0c6c8a6aac8a7aad55071582183d16851323e99c68aa451d97 +SIZE (flightgear-aircraft/IL-2_20140508.zip) = 4801474 +SHA256 (flightgear-aircraft/Lightning_20140613.zip) = 4c72b9cda1b901cd95c89361cbad3bb730e59cf1084658ce1fb6f619e050ec87 +SIZE (flightgear-aircraft/Lightning_20140613.zip) = 4785070 SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 624d85fe96380870387bb35c0c43601cbe0fb19506f6915e69bb49853c836371 SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529095 SHA256 (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 6a1a53902ffd6ff33c412a1d605e2a43615b3dcdaa7efebdff1f647ebe4b40ec @@ -48,18 +48,18 @@ SHA256 (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 4222889bf64693630d1 SIZE (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 3275253 SHA256 (flightgear-aircraft/Superwal_20100330.zip) = cd013f6c6ab073cea4c5eef59acb3b51c8a40d47652a3dfcbebfc79c30504384 SIZE (flightgear-aircraft/Superwal_20100330.zip) = 2654839 -SHA256 (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 12ca13fe06e7ff4e7a2e9bf7971c2397b86a06b2e83f2eb2e21b640edc5ab817 -SIZE (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 1209981 -SHA256 (flightgear-aircraft/asw20_July-2013.zip) = 22728d2d24c7b54fb7a41789ffe7ebbb73e1acb39e8230d63b2bdc6ce1fbd9f3 -SIZE (flightgear-aircraft/asw20_July-2013.zip) = 3592090 +SHA256 (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 67d58564d244f1aeb3fae20b3a996cf9a8eeb7ff3136039d4e05f8bbfcd9050e +SIZE (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 1219396 +SHA256 (flightgear-aircraft/asw20_June-2014.zip) = a0a0680fa68933f579f01462703151b907d895dee69d44d8e3007abc0dd9ad3c +SIZE (flightgear-aircraft/asw20_June-2014.zip) = 3592394 SHA256 (flightgear-aircraft/bf109_20130615.zip) = 1245ba5d1c00a01b74cef208f28f70ffe27f6285f7d52c4ddd901b370e3aca94 SIZE (flightgear-aircraft/bf109_20130615.zip) = 24201689 SHA256 (flightgear-aircraft/c310_20130209.zip) = 07d765eac4a6cb9bc115dc4d302fed972776f5148cb1154f666b6a7f3c27543a SIZE (flightgear-aircraft/c310_20130209.zip) = 615078 SHA256 (flightgear-aircraft/dhc3_20120506.zip) = 808215533d23b9e2a23b0249bacff9504b72a8e4263a562058dea9c6060c12f9 SIZE (flightgear-aircraft/dhc3_20120506.zip) = 20789012 -SHA256 (flightgear-aircraft/f16_20120812.zip) = c4782fbcfeba7fea5204d048a0cb36499e0901b1ef514c8c638b14928ce7396a -SIZE (flightgear-aircraft/f16_20120812.zip) = 19445799 +SHA256 (flightgear-aircraft/f16_20140612.zip) = b40dc7f9eca5976183cea0b0fbf71d7560c8e5166876d41ff682e43c89f59b73 +SIZE (flightgear-aircraft/f16_20140612.zip) = 19445894 SHA256 (flightgear-aircraft/harrier_20130823.zip) = 35d1b2c95b2801651ce0fdd50b5e3015a75a120ab3f709cf2adb1dbd49bc26d7 SIZE (flightgear-aircraft/harrier_20130823.zip) = 4208173 SHA256 (flightgear-aircraft/pa24-250_20121128.zip) = dd78878bfbf21bb77405a3f5c1586f1043487c6d8499ec28361fbc3131500952 diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile index 3897ee1cb7a9..af671935c22b 100644 --- a/games/flightgear-data/Makefile +++ b/games/flightgear-data/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 3.0.0 +PORTVERSION= 3.2.0 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Shared/ \ @@ -25,7 +25,7 @@ DATADIR= ${PREFIX}/share/flightgear PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= %%DATADIR%% -MANUAL_PACKAGE_BUILD= very large distfile (>900 MB) +MANUAL_PACKAGE_BUILD= very large distfile (>1 GB) post-patch: @${RM} -f ${WRKSRC}/COPYING diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo index dbce33dcb3f8..8702dc05fe45 100644 --- a/games/flightgear-data/distinfo +++ b/games/flightgear-data/distinfo @@ -1,2 +1,2 @@ -SHA256 (FlightGear-data-3.0.0.tar.bz2) = 048349a167d55c2a6f84a71dd5654cba0b7866ce43c6f06a12a1be8fe0840557 -SIZE (FlightGear-data-3.0.0.tar.bz2) = 1078366345 +SHA256 (FlightGear-data-3.2.0.tar.bz2) = bd48708931335698303ad5739146924fe70f1ff00c3cb8c6207c6d45140a27a4 +SIZE (FlightGear-data-3.2.0.tar.bz2) = 1264837989 diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 267c2a0db829..89a3740a8b2c 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 3.0.0 -PORTREVISION= 4 +PORTVERSION= 3.2.0 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Source/ \ @@ -21,7 +20,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng15.so:${PORTSDIR}/graphics/png \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ - libosg.so:${PORTSDIR}/graphics/osg + libosg.so:${PORTSDIR}/graphics/osg \ + libspeex.so:${PORTSDIR}/audio/speex BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ @@ -32,10 +32,9 @@ USE_XORG= ice sm x11 xext xft xi xinerama xt xmu USE_GL= gl glu glut USE_SQLITE= 3 -USES= tar:bzip2 dos2unix cmake compiler:features openal:al,alut +USES= tar:bzip2 dos2unix cmake compiler openal:al,alut DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) -CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON \ - -DENABLE_JS_SERVER:BOOL=ON \ +CMAKE_ARGS+= -DENABLE_JS_SERVER:BOOL=ON \ -DSYSTEM_SQLITE:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ @@ -49,8 +48,9 @@ DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF .include -.if ${COMPILER_FEATURES:Mlibc++} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h +# Chase devel/simgear compiler version +.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 +USE_GCC= 4.6+ .endif post-install: diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo index 127fb71b001c..ff6415f4ab49 100644 --- a/games/flightgear/distinfo +++ b/games/flightgear/distinfo @@ -1,2 +1,2 @@ -SHA256 (flightgear-3.0.0.tar.bz2) = e4bf1922825920a404539e6611c36eb5567b85d46a726fd8c6f9b19c138ba6e9 -SIZE (flightgear-3.0.0.tar.bz2) = 5874662 +SHA256 (flightgear-3.2.0.tar.bz2) = addac512375b9f800a77e5733c7c0e4214442ed61a0b2712abedc0a506ac5f12 +SIZE (flightgear-3.2.0.tar.bz2) = 6950249 diff --git a/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h b/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h deleted file mode 100644 index c6e096b3f437..000000000000 --- a/games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h +++ /dev/null @@ -1,30 +0,0 @@ ---- src/FDM/JSBSim/input_output/string_utilities.h.orig 2014-03-12 18:30:00.000000000 +0100 -+++ src/FDM/JSBSim/input_output/string_utilities.h 2014-03-12 18:31:18.000000000 +0100 -@@ -73,9 +73,11 @@ - extern bool is_number(const std::string& str); - std::vector split(std::string str, char d); - /* Comment out to_string functions when they are defined already - C++ 11 defines these */ -+/* - extern std::string to_string(int); - extern std::string to_string(double); - extern std::string to_string(float); -+*/ - extern std::string replace(std::string str, const std::string& old, const std::string& newstr); - #else - #include -@@ -159,6 +161,7 @@ - return str_array; - } - /* Comment out to_string functions when they are defined already - C++ 11 defines these */ -+/* - string to_string(int i) - { - char buffer[32]; -@@ -179,6 +182,7 @@ - if (!(o << x)) cerr << "Bad double to string conversion" << endl; - return o.str(); - } -+*/ - - string replace(string str, const string& oldstr, const string& newstr) - { diff --git a/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c b/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c new file mode 100644 index 000000000000..ed10a8c0ddef --- /dev/null +++ b/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c @@ -0,0 +1,11 @@ +--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig 2014-10-21 18:20:10.716009721 +0200 ++++ 3rdparty/hts_engine_API/lib/HTS_misc.c 2014-10-21 18:21:32.200933884 +0200 +@@ -245,7 +245,7 @@ + } else if (fp->type == HTS_FILE) { + fpos_t pos; + fgetpos((FILE *) fp->pointer, &pos); +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__) + return (size_t) pos; + #else + return (size_t) pos.__pos; diff --git a/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt b/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt index 4bd4f929261d..ce8eb99d5526 100644 --- a/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt +++ b/games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt @@ -1,11 +1,28 @@ ---- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-03-12 18:13:58.000000000 +0100 -+++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-03-12 18:14:39.000000000 +0100 -@@ -88,7 +88,7 @@ - libspeex/vq.c - ) +--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-10-21 18:27:37.041376820 +0200 ++++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-10-21 18:27:53.883368567 +0200 +@@ -1,6 +1,6 @@ + # CMakeLists.txt, for utils/iaxclient/lib - 20130925 + # even if we don't select the codec, speex is used for pre-processing audio +-set(ENABLE_SPEXX 1) ++set(ENABLE_SPEEX 1) + + set(IAXCLIENT_BASE_SOURCES + audio_encode.c +@@ -57,7 +57,7 @@ + list(APPEND IAXCLIENT_BASE_SOURCES unixfuncs.c) + endif(WIN32) + +-if (ENABLE_SPEXX) ++if (ENABLE_SPEEX) + list(APPEND IAXCLIENT_BASE_SOURCES codec_speex.c) + + if (SYSTEM_SPEEX) +@@ -115,7 +115,7 @@ -- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) -+ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) - endif(ENABLE_SPEXX) + include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include) + endif(SPEEX_FOUND AND SPEEXDSP_FOUND) +-endif(ENABLE_SPEXX) ++endif(ENABLE_SPEEX) if (ENABLE_ALSA) + list(APPEND IAXCLIENT_BASE_SOURCES audio_alsa.c) diff --git a/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h b/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h deleted file mode 100644 index 189ee3d44479..000000000000 --- a/games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 3rdparty/iaxclient/lib/iaxclient.h.orig 2014-03-17 07:06:55.000000000 +0100 -+++ 3rdparty/iaxclient/lib/iaxclient.h 2014-03-17 07:09:42.000000000 +0100 -@@ -45,6 +45,8 @@ - #include - #endif - -+#include -+ - #ifdef BUILDING_DLL - # if defined(WIN32) || defined(_WIN32_WCE) - # ifdef _MSC_VER diff --git a/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c b/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c deleted file mode 100644 index 571ffef44e5f..000000000000 --- a/games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig 2014-03-12 18:16:21.000000000 +0100 -+++ 3rdparty/iaxclient/lib/libiax2/src/iax.c 2014-03-12 18:18:38.000000000 +0100 -@@ -72,7 +72,7 @@ - #include - #include - --#if !defined(MACOSX) && !defined(__OpenBSD__) -+#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include - #if !defined(SOLARIS) - #include diff --git a/games/flightgear/files/patch-CMakeLists.txt b/games/flightgear/files/patch-CMakeLists.txt index 4d92c0ec8292..d22f0dc0ca78 100644 --- a/games/flightgear/files/patch-CMakeLists.txt +++ b/games/flightgear/files/patch-CMakeLists.txt @@ -1,11 +1,16 @@ ---- CMakeLists.txt.orig 2012-08-27 18:14:13.000000000 +0200 -+++ CMakeLists.txt 2012-08-27 18:14:52.000000000 +0200 -@@ -225,7 +225,7 @@ - endif(LIBSVN_FOUND) - endif(ENABLE_LIBSVN) +--- CMakeLists.txt.orig 2014-10-21 18:32:02.620104085 +0200 ++++ CMakeLists.txt 2014-10-22 06:52:20.912083280 +0200 +@@ -96,10 +96,11 @@ + find_library(COCOA_LIBRARY Cocoa) + list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY}) --find_package(PLIB REQUIRED puaux pu js fnt) -+find_package(PLIB REQUIRED puaux pu js fnt net) +-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") ++elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ++ ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set(USE_DBUS_DEFAULT 1) +- find_package(UDev) - # FlightGear and SimGear versions need to match - find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED) ++ find_package(UDev) + if(UDEV_FOUND) + set(EVENT_INPUT_DEFAULT 1) + endif(UDEV_FOUND) diff --git a/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt b/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt new file mode 100644 index 000000000000..403578496087 --- /dev/null +++ b/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt @@ -0,0 +1,17 @@ +--- CMakeLists.txt.orig 2014-10-22 07:01:17.414717967 +0200 ++++ CMakeLists.txt 2014-10-22 07:01:34.267267822 +0200 +@@ -266,13 +266,13 @@ + + # Sqlite always depends on the threading lib + list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT}) + + ############################################################################## + +-find_package(PLIB REQUIRED puaux pu js fnt) ++find_package(PLIB REQUIRED puaux pu js fnt net) + + # FlightGear and SimGear versions need to match + find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED) + + ############################################################################## + diff --git a/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt b/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt new file mode 100644 index 000000000000..d1241f36ff97 --- /dev/null +++ b/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt @@ -0,0 +1,13 @@ +--- utils/CMakeLists.txt.orig 2013-10-01 16:13:22.000000000 +0200 ++++ utils/CMakeLists.txt 2013-10-01 16:13:47.000000000 +0200 +@@ -29,4 +29,8 @@ + + if(ENABLE_TERRASYNC) + add_subdirectory(TerraSync) +-endif() +\ No newline at end of file ++endif() ++ ++if(ENABLE_JS_SERVER) ++ add_subdirectory(js_server) ++endif() diff --git a/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt b/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt new file mode 100644 index 000000000000..33d832907e15 --- /dev/null +++ b/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt @@ -0,0 +1,10 @@ +--- utils/js_server/CMakeLists.txt.orig 2012-03-09 14:44:22.999701740 +0100 ++++ utils/js_server/CMakeLists.txt 2012-03-09 14:59:36.643375244 +0100 +@@ -0,0 +1,7 @@ ++add_executable(js_server js_server.cxx) ++ ++target_link_libraries(js_server ++ ${PLIB_LIBRARIES} ++) ++ ++install(TARGETS js_server RUNTIME DESTINATION bin) diff --git a/games/flightgear/files/patch-src-Airports-airports_fwd.hxx b/games/flightgear/files/patch-src-Airports-airports_fwd.hxx deleted file mode 100644 index 8b55e284f19c..000000000000 --- a/games/flightgear/files/patch-src-Airports-airports_fwd.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Airports/airports_fwd.hxx.orig 2013-10-09 15:45:38.000000000 +0200 -+++ src/Airports/airports_fwd.hxx 2013-10-09 10:56:51.000000000 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - // forward decls - class FGAirport; diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx b/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx deleted file mode 100644 index 0b2ec5c09515..000000000000 --- a/games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- src/FDM/JSBSim/JSBSim.cxx.orig 2012-04-30 11:31:18.119554386 +0300 -+++ src/FDM/JSBSim/JSBSim.cxx 2012-04-30 11:31:38.251553602 +0300 -@@ -28,7 +28,7 @@ - #include - #include - --#include // size_t -+#include // size_t - #include - - #include - diff --git a/games/flightgear/files/patch-utils-CMakeLists.txt b/games/flightgear/files/patch-utils-CMakeLists.txt deleted file mode 100644 index d1241f36ff97..000000000000 --- a/games/flightgear/files/patch-utils-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- utils/CMakeLists.txt.orig 2013-10-01 16:13:22.000000000 +0200 -+++ utils/CMakeLists.txt 2013-10-01 16:13:47.000000000 +0200 -@@ -29,4 +29,8 @@ - - if(ENABLE_TERRASYNC) - add_subdirectory(TerraSync) --endif() -\ No newline at end of file -+endif() -+ -+if(ENABLE_JS_SERVER) -+ add_subdirectory(js_server) -+endif() diff --git a/games/flightgear/files/patch-utils-js_server-CMakeLists.txt b/games/flightgear/files/patch-utils-js_server-CMakeLists.txt deleted file mode 100644 index 33d832907e15..000000000000 --- a/games/flightgear/files/patch-utils-js_server-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- utils/js_server/CMakeLists.txt.orig 2012-03-09 14:44:22.999701740 +0100 -+++ utils/js_server/CMakeLists.txt 2012-03-09 14:59:36.643375244 +0100 -@@ -0,0 +1,7 @@ -+add_executable(js_server js_server.cxx) -+ -+target_link_libraries(js_server -+ ${PLIB_LIBRARIES} -+) -+ -+install(TARGETS js_server RUNTIME DESTINATION bin) -- cgit