games/FlightGear: Updated for version 2024.1.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 31 insertions, 11 deletions

diff --git a/games/FlightGear/FlightGear.SlackBuild b/games/FlightGear/FlightGear.SlackBuild
index 8b9365f1b6..a474580c88 100644
--- a/games/FlightGear/FlightGear.SlackBuild
+++ b/games/FlightGear/FlightGear.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=FlightGear
 SRCNAM=flightgear
-VERSION=${VERSION:-2020.3.19}
+VERSION=${VERSION:-2024.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -72,9 +72,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-${VERSION}.tar.?z*
-cd $SRCNAM-$VERSION
+rm -rf $SRCNAM-v$VERSION
+tar xvf $CWD/$SRCNAM-v${VERSION}.tar.?z*
+cd $SRCNAM-v$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -99,8 +100,13 @@ cd ..
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Unpack FlightGear-data:
+cd $PKG/usr/share
+  tar xvf $CWD/FlightGear-${VERSION}-data.txz
+  mv fgdata_2024_1 FlightGear
+cd -
+
 mv $PKG/usr/share/man $PKG/usr/man
-rm -fr $PKG/usr/share
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/games/FlightGear/FlightGear.info b/games/FlightGear/FlightGear.info
index d7bf1df1d6..b152d851d8 100644
--- a/games/FlightGear/FlightGear.info
+++ b/games/FlightGear/FlightGear.info
@@ -1,10 +1,12 @@
 PRGNAM="FlightGear"
-VERSION="2020.3.19"
-HOMEPAGE="http://www.flightgear.org/"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2020.3.19.tar.bz2"
-MD5SUM="75556000160b9ffea23e013bc8d5d8f9"
+VERSION="2024.1.1"
+HOMEPAGE="https://www.flightgear.org/"
+DOWNLOAD="https://gitlab.com/flightgear/flightgear/-/archive/v2024.1.1/flightgear-v2024.1.1.tar.gz \
+          https://download.flightgear.org/release-2024.1/FlightGear-2024.1.1-data.txz"
+MD5SUM="d5184746bbe5d83465080415a6b048de \
+        e5f45fbf0a62ea3bba273f5f69e7253d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="FlightGear-data SimGear"
+REQUIRES="SimGear"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/games/FlightGear/README b/games/FlightGear/README
index 798e5c06c1..11e4d228ad 100644
--- a/games/FlightGear/README
+++ b/games/FlightGear/README
@@ -2,7 +2,7 @@ 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.
 
-This build now includes the internal Qt launcher.  To launch FlightGear
+This build 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.)
 
@@ -10,5 +10,17 @@ 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.
 
+This package now includes the FlightGear-data package, so there is no
+longer a need to build two separate packages.
+
 flite is an optional dependency for voice communication (autodetected
 at build time).
+
+Note that the source has been moved from Sourceforge to Gitlab.
+
+NOTE: FlightGear will build and run in 32-bit, but you will most likely
+have to set your graphics settings fairly low to get any kind of decent
+framerate.
+
+BIG FAT NOTE: SimGear and FlightGear will no longer build on current
+because of incompatibilities in boost 1.87 (built fine with 1.86).