diff options
Diffstat (limited to 'gis/osgEarth/osgEarth.SlackBuild')
| -rw-r--r-- | gis/osgEarth/osgEarth.SlackBuild | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gis/osgEarth/osgEarth.SlackBuild b/gis/osgEarth/osgEarth.SlackBuild index ff83e100c5..cf201daf4e 100644 --- a/gis/osgEarth/osgEarth.SlackBuild +++ b/gis/osgEarth/osgEarth.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=osgEarth SRCNAM=osgearth VERSION=${VERSION:-2.10.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -56,16 +56,6 @@ 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 @@ -81,6 +71,8 @@ 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 {} \; +patch -p1 < $CWD/geos-3_8-support.patch + mkdir -p build cd build cmake .. \ @@ -88,8 +80,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lX11" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DDYNAMIC_OSGEARTH=ON \ - $osgqt + -DDYNAMIC_OSGEARTH=ON make make install DESTDIR=$PKG |