5 files changed, 41 insertions, 33 deletions
diff --git a/games/FlightGear/FlightGear.SlackBuild b/games/FlightGear/FlightGear.SlackBuild
index 77920a9421..8b9365f1b6 100644
--- a/games/FlightGear/FlightGear.SlackBuild
+++ b/games/FlightGear/FlightGear.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for FlightGear
 
 # Copyright before version 2016.3.1 by Diego Pantano  <poplin.dp@gmail.com>
 # Copyright 2016-2018 Panagiotis Nikolaou, Culver City, CA
+# Copyright 2019, 2020 Lenard Spencer, Orlando, Florida, USA
+
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +24,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=FlightGear
 SRCNAM=flightgear
-VERSION=${VERSION:-2019.1.1}
+VERSION=${VERSION:-2020.3.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,18 +69,11 @@ fi
 
 set -e
 
-# Choose if we build the internal Qt launcher.
-if [ "${QT5}" == "yes" ]; then
-	OPT="$OPT -DENABLE_QT=ON"
-else
-	OPT="$OPT -DENABLE_QT=OFF"
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+tar xvf $CWD/$SRCNAM-${VERSION}.tar.?z*
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,13 +85,13 @@ find -L . \
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DEVENT_INPUT:STRING="ON" \
+    -DEVENT_INPUT="ON" \
     -DFG_DATA_DIR=/usr/share/${PRGNAM} \
-    $OPT \
-    -DCMAKE_BUILD_TYPE=Release ..
+    -DCMAKE_BUILD_TYPE=Release \
+    -DFG_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
 cd ..
@@ -101,7 +106,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING INSTALL NEWS README* Thanks docs-mini/ \
+  AUTHORS ChangeLog COPYING NEWS README* Thanks docs-mini/ \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -109,14 +114,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Add a desktop entry for the GUI launcher
-case "$QT5" in
-  yes) install -D -m0644 $CWD/FlightGear.desktop \
-         $PKG/usr/share/applications/FlightGear.desktop
-       install -D -m0644 $CWD/FlightGear.png \
-         $PKG/usr/share/icons/hicolor/64x64/apps/FlightGear.png
-       cat $CWD/doinst.sh > $PKG/install/doinst.sh
-;;
-esac
+install -D -m0644 $CWD/FlightGear.desktop \
+  $PKG/usr/share/applications/FlightGear.desktop
+install -D -m0644 $CWD/FlightGear.png \
+  $PKG/usr/share/icons/hicolor/48x48/apps/FlightGear.png
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/FlightGear/FlightGear.desktop b/games/FlightGear/FlightGear.desktop
index fd18a1ac60..25421b3282 100644
--- a/games/FlightGear/FlightGear.desktop
+++ b/games/FlightGear/FlightGear.desktop
@@ -4,7 +4,7 @@ Name=FlightGear
 GenericName=FlightGear
 Comment=FlightGear Launcher
 Exec=fgfs --launcher
-Icon=/usr/share/icons/hicolor/64x64/apps/FlightGear.png
+Icon=/usr/share/icons/hicolor/48x48/apps/FlightGear.png
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/games/FlightGear/FlightGear.info b/games/FlightGear/FlightGear.info
index e5d23bc298..d7bf1df1d6 100644
--- a/games/FlightGear/FlightGear.info
+++ b/games/FlightGear/FlightGear.info
@@ -1,8 +1,8 @@
 PRGNAM="FlightGear"
-VERSION="2019.1.1"
+VERSION="2020.3.19"
 HOMEPAGE="http://www.flightgear.org/"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2019.1.1.tar.bz2"
-MD5SUM="6a4d708cb407885dd8731f793ecec3bd"
+DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2020.3.19.tar.bz2"
+MD5SUM="75556000160b9ffea23e013bc8d5d8f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FlightGear-data SimGear"
diff --git a/games/FlightGear/FlightGear.png b/games/FlightGear/FlightGear.png
index a0d912dfbf..e49d653e97 100644
--- a/games/FlightGear/FlightGear.png
+++ b/games/FlightGear/FlightGear.png
diff --git a/games/FlightGear/README b/games/FlightGear/README
index 592ed58ccb..798e5c06c1 100644
--- a/games/FlightGear/README
+++ b/games/FlightGear/README
@@ -2,7 +2,13 @@ FlightGear is a flight-simulator created by an international group of
 volunteers, and released as free, open-source GPL software.
 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
+This build now includes the internal Qt launcher.  To launch FlightGear
+from a terminal window, run 'fgfs --launcher' from the command line.
+(This is how the .desktop file launches it.)
 
-To enable voice ATC, you will need flite (autodetected at build time).
+If you prefer, you can install either fgo (python2) or ffgo (python3)
+as a more basic launcher.  They will launch fgfs directly without the
+'--launcher' parameter.
+
+flite is an optional dependency for voice communication (autodetected
+at build time).