summaryrefslogtreecommitdiffstats
path: root/gis
diff options
context:
space:
mode:
Diffstat (limited to 'gis')
-rw-r--r--gis/osgEarth/README18
-rw-r--r--gis/osgEarth/osgEarth.SlackBuild22
-rw-r--r--gis/osgEarth/osgEarth.info2
3 files changed, 34 insertions, 8 deletions
diff --git a/gis/osgEarth/README b/gis/osgEarth/README
index ba1b2a6b46..8026af489f 100644
--- a/gis/osgEarth/README
+++ b/gis/osgEarth/README
@@ -5,5 +5,19 @@ OpenSceneGraph application, and go!
osgEarth supports all kinds of data and comes with lots of examples to help you
get up and running quickly and easily.
-Optional requirements protobuf and rocksdb are recommended for enhanced
-performance. They will be used if detected when osgEarth is built.
+Some optional requirements are recommended for enhanced functionality
+and/or performance. They include:
+ osgQt, poco, protobuf, rocksdb
+
+For all but osgQt, they will be used if detected when osgEarth is built.
+
+In the case of osgQt, the version of Qt that it was built with is relevant.
+If osgQt was built with Qt5, the environment variable OSGQT=5 must be set when
+running the osgEarth SlackBuild i.e.
+ OSGQT=5 sh osgEarth.SlackBuild
+In this case, the qt5 package is also an additional build requirement.
+
+If osgQt was built with Qt4 (the standard for Slackware 14.2), set OSGQT=4 i.e.
+ OSGQT=4 sh osgEarth.SlackBuild
+
+If OSGQT is not set, osgQt support will not be included.
diff --git a/gis/osgEarth/osgEarth.SlackBuild b/gis/osgEarth/osgEarth.SlackBuild
index 2677c42388..69fc3f2061 100644
--- a/gis/osgEarth/osgEarth.SlackBuild
+++ b/gis/osgEarth/osgEarth.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=osgEarth
SRCNAM=osgearth
VERSION=${VERSION:-2.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -56,12 +56,22 @@ else
LIBDIRSUFFIX=""
fi
+osgqt="";
+echo "OSGQT = $OSGQT"
+if [ "$OSGQT" = "4" ]; then
+ osgqt="-DOSGEARTH_QT_BUILD=ON -DOSGEARTH_QT_VERSION=4"
+elif [ "$OSGQT" = "5" ]; then
+ osgqt="-DOSGEARTH_QT_BUILD=ON -DOSGEARTH_QT_VERSION=5"
+else
+ osgqt=""
+fi
+
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $SRCNAM-$VERSION
+rm -rf $SRCNAM-$SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$SRCNAM-$VERSION
chown -R root:root .
@@ -73,12 +83,14 @@ find -L . \
mkdir -p build
cd build
- cmake \
+ cmake .. \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lX11" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release .. \
- -DDYNAMIC_OSGEARTH=ON
+ -DCMAKE_BUILD_TYPE=Release \
+ -DDYNAMIC_OSGEARTH=ON \
+ $osgqt
+
make
make install DESTDIR=$PKG
cd ..
diff --git a/gis/osgEarth/osgEarth.info b/gis/osgEarth/osgEarth.info
index d84fcea427..38ce67d8e9 100644
--- a/gis/osgEarth/osgEarth.info
+++ b/gis/osgEarth/osgEarth.info
@@ -1,7 +1,7 @@
PRGNAM="osgEarth"
VERSION="2.9"
HOMEPAGE="http://osgearth.org/"
-DOWNLOAD="https://github.com/gwaldron/osgearth/archive/osgearth-2.9.tar.gz"
+DOWNLOAD="https://github.com/gwaldron/osgearth/archive/osgearth-2.9/osgearth-2.9.tar.gz"
MD5SUM="87d0ce80a9bb5c8b8ce4ae7b5b257c52"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""