Update FG for 2020.3.6

When no arguments are pased to the AppImage, start with
the launcher for a pleasant experience.

Adjust the RPath on our copied osgDB plugins, so that dependencies
are found at the bundled lib dir.

build_appimage.sh

@@ -47,6 +47,11 @@ rm appdir/usr/lib/lib*.a
 
 cp -a dist/lib64/osgPlugins-3.4.2 appdir/usr/lib
 
+# adjust the rpath on the copied plugins, so they don't
+# require LD_LIBRARY_PATH to be set to load their dependencies
+# correctly
+patchelf --set-rpath \$ORIGIN/../ appdir/usr/lib/osgPlugins-3.4.2/*.so
+
 cp -r dist/share appdir/usr
 
 cp -a /usr/lib64/qt5/qml/QtQuick.2 appdir/usr/qml
@@ -61,15 +66,23 @@ sed -i 's/^Categor.*/&;/ ; s/^Keyword.*/&;/ ; s/1\.1/1\.0/' appdir/usr/share/app
 
 #generate AppRun script
 
+# Note: don't set LD_LIBRARY_PATH here.
+# if you do, you need to add code to unset it *sinde* FlightGear (eg, bootstrap.cxx), 
+# so that fork-ed processes don't inherit the value. For an example see:
+# https://github.com/KDAB/hotspot/blob/master/src/main.cpp#L87
+
 cat << 'EOF' > appdir/AppRun
 #!/bin/bash
 HERE="$(dirname "$(readlink -f "${0}")")"
 export SIMGEAR_TLS_CERT_PATH=$HERE/usr/ssl/cacert.pem
-echo SIMGEAR_TLS_CERT_PATH=$SIMGEAR_TLS_CERT_PATH
-export LD_LIBRARY_PATH=${HERE}/usr/lib:${LD_LIBRARY_PATH}
-export OSG_LIBARARY_PATH=${HERE}/usr/lib
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-exec "${HERE}/usr/bin/fgfs" "$@"
+export OSG_LIBRARY_PATH=${HERE}/usr/lib
+
+if [[ $# -eq 0 ]]; then
+ echo "Started with no arguments; assuming --launcher"
+ exec "${HERE}/usr/bin/fgfs" --launcher
+else
+ exec "${HERE}/usr/bin/fgfs" "$@"
+fi
 EOF
 
 

release_builder/create_scenerypack.sh

@@ -21,9 +21,10 @@ tar --format=gnu --create --owner=root --group=root --gzip --file=${SCENERY_PACK
     ${SCENERY_PACK}/Terrain/${TUTORIAL_TILES} \
     ${SCENERY_PACK}/Airports/B/I/K \
     ${SCENERY_PACK}/Airports/P/H \
+    ${SCENERY_PACK}/Airports_archive.tgz \
     ${SCENERY_PACK}/Models
 
 rm ${SCENERY_PACK}
 
-# upload to frs.sourceforge.net /home/frs/project/fquitfl/flightgear/scenery/ 
+# upload to frs.sourceforge.net /home/frs/project/fl/flightgear/scenery/ 
 

version

@@ -1 +1 @@
-2020.3.2
+2020.3.6