aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/SimGear/README3
-rw-r--r--libraries/SimGear/SimGear.SlackBuild14
-rw-r--r--libraries/SimGear/SimGear.info6
3 files changed, 18 insertions, 5 deletions
diff --git a/libraries/SimGear/README b/libraries/SimGear/README
index f5664619a72e4..a67f428044924 100644
--- a/libraries/SimGear/README
+++ b/libraries/SimGear/README
@@ -1,3 +1,6 @@
SimGear is a set of open-source libraries designed to be used as building
blocks for quickly assembling 3d simulations, games, and visualization
applications.
+
+For those wanting to build this in current (15.0 EXPERIMENTAL), pass
+CURRENT=yes to the script.
diff --git a/libraries/SimGear/SimGear.SlackBuild b/libraries/SimGear/SimGear.SlackBuild
index 02e0b04b75de1..2fe3db206df27 100644
--- a/libraries/SimGear/SimGear.SlackBuild
+++ b/libraries/SimGear/SimGear.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=SimGear
SRCNAM=simgear
-VERSION=${VERSION:-2019.1.2}
+VERSION=${VERSION:-2018.3.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,7 +61,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-${VERSION}-rc.tar.?z*
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
@@ -70,6 +70,15 @@ 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 {} \;
+# Option to build on -current
+if [ "${CURRENT:-no}" = "yes" ]; then
+ BOOSTOPT="-DBoost_NO_BOOST_CMAKE=ON"
+ # patch for the new boost:
+ patch -p1 < $CWD/simgear-enable-if.patch
+else
+ BOOSTOPT=""
+fi
+
mkdir -p build
cd build
cmake \
@@ -79,6 +88,7 @@ cd build
-DSIMGEAR_SHARED=ON \
-DSYSTEM_EXPAT=ON \
-DENABLE_TESTS=OFF \
+ $BOOSTOPT \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG
diff --git a/libraries/SimGear/SimGear.info b/libraries/SimGear/SimGear.info
index 8e7ee1bceda28..8509946a96cb4 100644
--- a/libraries/SimGear/SimGear.info
+++ b/libraries/SimGear/SimGear.info
@@ -1,8 +1,8 @@
PRGNAM="SimGear"
-VERSION="2019.1.2"
+VERSION="2018.3.5"
HOMEPAGE="http://wiki.flightgear.org/SimGear"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2019.1.2-rc.tar.bz2"
-MD5SUM="355859dc2b52b4700deb8a9e2a9e5d75"
+DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2018.3.5.tar.bz2"
+MD5SUM="33a70ca5b2325d180f2d933f5a7283f3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="OpenSceneGraph freealut plib"