summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLenard Spencer <lenardrspencer@gmail.com>2019-08-25 09:55:43 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-08-25 09:55:43 +0700
commit9e86ceb6064578d54cab742fff77dac82e060a08 (patch)
treef5320cd40ea08b194dea7c5fa1f31c2d1622113d
parent38d95f1338c24b8eeaca49b731b3a1ef0a0139c9 (diff)
downloadslackbuilds-9e86ceb6064578d54cab742fff77dac82e060a08.tar.gz
games/FlightGear: Updated for version 2019.1.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/FlightGear/FlightGear.SlackBuild5
-rw-r--r--games/FlightGear/FlightGear.info6
-rw-r--r--games/FlightGear/README2
-rw-r--r--games/FlightGear/flightgear-fix-broken-links.patch76
4 files changed, 6 insertions, 83 deletions
diff --git a/games/FlightGear/FlightGear.SlackBuild b/games/FlightGear/FlightGear.SlackBuild
index ac846100e3..77920a9421 100644
--- a/games/FlightGear/FlightGear.SlackBuild
+++ b/games/FlightGear/FlightGear.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=FlightGear
SRCNAM=flightgear
-VERSION=${VERSION:-2018.3.2}
+VERSION=${VERSION:-2019.1.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -77,9 +77,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# patch for broken links:
-patch -p1 < $CWD/flightgear-fix-broken-links.patch
-
mkdir -p build
cd build
cmake \
diff --git a/games/FlightGear/FlightGear.info b/games/FlightGear/FlightGear.info
index 0af8b6462f..e5d23bc298 100644
--- a/games/FlightGear/FlightGear.info
+++ b/games/FlightGear/FlightGear.info
@@ -1,8 +1,8 @@
PRGNAM="FlightGear"
-VERSION="2018.3.2"
+VERSION="2019.1.1"
HOMEPAGE="http://www.flightgear.org/"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2018.3.2.tar.bz2"
-MD5SUM="3aeecf335ea699d28eead45e4ecabad3"
+DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2019.1.1.tar.bz2"
+MD5SUM="6a4d708cb407885dd8731f793ecec3bd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="FlightGear-data SimGear"
diff --git a/games/FlightGear/README b/games/FlightGear/README
index 1ed241340a..592ed58ccb 100644
--- a/games/FlightGear/README
+++ b/games/FlightGear/README
@@ -4,3 +4,5 @@ It has been used for academic research, education, and for fun.
To build the internal Qt launcher, you will require QT5 and libxkbcommon
and then pass QT5=yes to the script
+
+To enable voice ATC, you will need flite (autodetected at build time).
diff --git a/games/FlightGear/flightgear-fix-broken-links.patch b/games/FlightGear/flightgear-fix-broken-links.patch
deleted file mode 100644
index 7d807a9cb5..0000000000
--- a/games/FlightGear/flightgear-fix-broken-links.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur flightgear-2018.3.2/src/Environment/realwx_ctrl.cxx flightgear-2018.3.2.new/src/Environment/realwx_ctrl.cxx
---- flightgear-2018.3.2/src/Environment/realwx_ctrl.cxx 2019-01-29 08:17:50.000000000 -0500
-+++ flightgear-2018.3.2.new/src/Environment/realwx_ctrl.cxx 2019-02-05 07:11:40.532121269 -0500
-@@ -426,7 +426,7 @@
- )
- {
- static const std::string NOAA_BASE_URL =
-- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/";
-+ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/";
- class NoaaMetarGetRequest:
- public simgear::HTTP::MemoryRequest
- {
-diff -Naur flightgear-2018.3.2/src/Main/metar_main.cxx flightgear-2018.3.2.new/src/Main/metar_main.cxx
---- flightgear-2018.3.2/src/Main/metar_main.cxx 2019-01-29 08:17:50.000000000 -0500
-+++ flightgear-2018.3.2.new/src/Main/metar_main.cxx 2019-02-05 07:11:40.533121277 -0500
-@@ -539,7 +539,7 @@
- try
- {
- static const std::string NOAA_BASE_URL =
-- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/";
-+ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/";
- HTTP::MemoryRequest* mr = new HTTP::MemoryRequest
- (
- NOAA_BASE_URL
-diff -Naur flightgear-2018.3.2/utils/fgcom/utils/build_fgcom_server.sh flightgear-2018.3.2.new/utils/fgcom/utils/build_fgcom_server.sh
---- flightgear-2018.3.2/utils/fgcom/utils/build_fgcom_server.sh 2019-01-29 08:17:50.000000000 -0500
-+++ flightgear-2018.3.2.new/utils/fgcom/utils/build_fgcom_server.sh 2019-02-05 07:11:40.533121277 -0500
-@@ -6,7 +6,7 @@
- DAHDI_SRC="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/dahdi-linux-complete-current.tar.gz"
- LOGSEP="###########################################"
- GETMETAR_SCRIPT="#!/bin/bash
--#curl http://tgftp.nws.noaa.gov/data/observations/metar/stations/$1.TXT
-+#curl https://tgftp.nws.noaa.gov/data/observations/metar/stations/$1.TXT
- echo \"Hello World !\""
-
- ROOT=$PWD
-diff -Naur flightgear-2018.3.2/utils/metarproxy/README flightgear-2018.3.2.new/utils/metarproxy/README
---- flightgear-2018.3.2/utils/metarproxy/README 2019-01-29 08:17:50.000000000 -0500
-+++ flightgear-2018.3.2.new/utils/metarproxy/README 2019-02-05 07:10:25.154570061 -0500
-@@ -266,13 +266,13 @@
- =====================
- Download addresses for the last 24 hours:
-
-- http://tgftp.nws.noaa.gov/data/observations/metar/cycles/
-+ https://tgftp.nws.noaa.gov/data/observations/metar/cycles/
- ftp://tgftp.nws.noaa.gov/data/observations/metar/cycles/
-
- Addresses for the most recent METAR data strings of particular
- stations:
-
-- http://tgftp.nws.noaa.gov/pub/data/observations/metar/stations/
-+ https://tgftp.nws.noaa.gov/pub/data/observations/metar/stations/
- ftp://tgftp.nws.noaa.gov/data/observations/metar/stations/
-
-
-diff -Naur flightgear-2018.3.2/utils/metarproxy/metarproxy flightgear-2018.3.2.new/utils/metarproxy/metarproxy
---- flightgear-2018.3.2/utils/metarproxy/metarproxy 2019-01-29 08:17:50.000000000 -0500
-+++ flightgear-2018.3.2.new/utils/metarproxy/metarproxy 2019-02-05 07:11:40.534121284 -0500
-@@ -81,7 +81,7 @@
- \$ http_proxy= metarproxy --record LOXL
-
- Sources:
-- http://tgftp.nws.noaa.gov/data/observations/metar/{stations,cycles}/
-+ https://tgftp.nws.noaa.gov/data/observations/metar/{stations,cycles}/
- ftp://tgftp.nws.noaa.gov/data/observations/metar/{stations,cycles}/
- EOF
-
-@@ -399,7 +399,7 @@
- s/\s+$//;
- &log($DEBUG, $_);
-
-- if (m|^GET\s+http://tgftp.nws.noaa.gov/.*/([A-Z][A-Z0-9]{3}).TXT\s+HTTP/|) {
-+ if (m|^GET\s+https://tgftp.nws.noaa.gov/.*/([A-Z][A-Z0-9]{3}).TXT\s+HTTP/|) {
- $icao = $1;
- } elsif (/X-Time: (\d+)/) {
- $epoch = $1;