aboutsummaryrefslogtreecommitdiff
path: root/libraries/SimGear
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/SimGear')
-rw-r--r--libraries/SimGear/README5
-rw-r--r--libraries/SimGear/SimGear.SlackBuild14
-rw-r--r--libraries/SimGear/SimGear.info6
-rw-r--r--libraries/SimGear/compositor-pass-missing-array-include.patch11
4 files changed, 13 insertions, 23 deletions
diff --git a/libraries/SimGear/README b/libraries/SimGear/README
index ee218c1353..8a02e20b1f 100644
--- a/libraries/SimGear/README
+++ b/libraries/SimGear/README
@@ -1,3 +1,8 @@
SimGear is a set of open-source libraries designed to be used as
building blocks for quickly assembling 3d simulations, games, and
visualization applications.
+
+Note that the source has been moved from Sourceforge to Gitlab.
+
+BIG FAT NOTE: SimGear and FlightGear will no longer build on current
+because of incompatibilities in boost 1.87 (built fine with 1.86).
diff --git a/libraries/SimGear/SimGear.SlackBuild b/libraries/SimGear/SimGear.SlackBuild
index 48a63c1b42..87bbb65521 100644
--- a/libraries/SimGear/SimGear.SlackBuild
+++ b/libraries/SimGear/SimGear.SlackBuild
@@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=SimGear
SRCNAM=simgear
-VERSION=${VERSION:-2020.3.19}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2024.1.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -71,9 +71,9 @@ 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 \
@@ -81,10 +81,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 {} \;
-if [ "${CURRENT:-no}" = "yes" ]; then
- patch -p1 < $CWD/compositor-pass-missing-array-include.patch
-fi
-
mkdir -p build
cd build
cmake \
diff --git a/libraries/SimGear/SimGear.info b/libraries/SimGear/SimGear.info
index e1a5d02a29..a9c64e98b5 100644
--- a/libraries/SimGear/SimGear.info
+++ b/libraries/SimGear/SimGear.info
@@ -1,8 +1,8 @@
PRGNAM="SimGear"
-VERSION="2020.3.19"
+VERSION="2024.1.1"
HOMEPAGE="http://wiki.flightgear.org/SimGear"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2020.3.19.tar.bz2"
-MD5SUM="1e799e3ddee8040c0b6f7ec25f95c38c"
+DOWNLOAD="https://gitlab.com/flightgear/simgear/-/archive/v2024.1.1/simgear-v2024.1.1.tar.gz"
+MD5SUM="780101203cfdc2bc35dfc28600602016"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="OpenSceneGraph plib"
diff --git a/libraries/SimGear/compositor-pass-missing-array-include.patch b/libraries/SimGear/compositor-pass-missing-array-include.patch
deleted file mode 100644
index 5572f5f9e4..0000000000
--- a/libraries/SimGear/compositor-pass-missing-array-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur simgear-2020.3.17.orig/simgear/scene/viewer/Compositor.hxx simgear-2020.3.17/simgear/scene/viewer/Compositor.hxx
---- simgear-2020.3.17.orig/simgear/scene/viewer/Compositor.hxx 2022-11-20 19:01:30.000000000 +0100
-+++ simgear-2020.3.17/simgear/scene/viewer/Compositor.hxx 2023-03-10 18:40:59.219808993 +0100
-@@ -17,6 +17,7 @@
- #ifndef SG_COMPOSITOR_HXX
- #define SG_COMPOSITOR_HXX
-
-+#include <array>
- #include <unordered_map>
- #include <vector>
-