diff options
Diffstat (limited to 'gis/osgEarth')
-rw-r--r-- | gis/osgEarth/README | 14 | ||||
-rw-r--r-- | gis/osgEarth/geos-3_8-support.patch | 69 | ||||
-rw-r--r-- | gis/osgEarth/osgEarth.SlackBuild | 33 | ||||
-rw-r--r-- | gis/osgEarth/osgEarth.info | 8 |
4 files changed, 29 insertions, 95 deletions
diff --git a/gis/osgEarth/README b/gis/osgEarth/README index eb37a51796..f589884f3f 100644 --- a/gis/osgEarth/README +++ b/gis/osgEarth/README @@ -1,10 +1,6 @@ -osgEarth is a C++ terrain rendering toolkit. Just create a simple XML file, -point it at your imagery, elevation, and vector data, load it into your favorite -OpenSceneGraph application, and go! +osgEarth is a C++ terrain rendering toolkit. Just create a simple XML +file, point it at your imagery, elevation, and vector data, load it +into your favorite 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. - -Some optional requirements are recommended for enhanced functionality -and/or performance. They include: - poco, protobuf, rocksdb +osgEarth supports all kinds of data and comes with lots of examples to +help you get up and running quickly and easily. diff --git a/gis/osgEarth/geos-3_8-support.patch b/gis/osgEarth/geos-3_8-support.patch deleted file mode 100644 index 5993d4cb0c..0000000000 --- a/gis/osgEarth/geos-3_8-support.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Nur osgearth-osgearth-2.10.2.a/src/osgEarthSymbology/GEOS.cpp osgearth-osgearth-2.10.2.b/src/osgEarthSymbology/GEOS.cpp ---- osgearth-osgearth-2.10.2.a/src/osgEarthSymbology/GEOS.cpp 2019-07-12 08:49:14.000000000 -0700 -+++ osgearth-osgearth-2.10.2.b/src/osgEarthSymbology/GEOS.cpp 2019-11-16 10:00:08.966241888 -0800 -@@ -49,7 +49,7 @@ - - namespace - { -- geom::CoordinateSequence* -+ std::unique_ptr<geom::CoordinateSequence> - vec3dArray2CoordSeq( const Symbology::Geometry* input, bool close, const geom::CoordinateSequenceFactory* factory ) - { - bool needToClose = close && input->size() > 2 && input->front() != input->back(); -@@ -64,7 +64,7 @@ - { - coords->push_back( coords->front() ); - } -- geom::CoordinateSequence* seq = factory->create( coords ); -+ std::unique_ptr<geom::CoordinateSequence> seq = factory->create( coords ); - - return seq; - } -@@ -108,7 +108,8 @@ - else - { - // any other type will at least contain points: -- geom::CoordinateSequence* seq = 0L; -+ std::unique_ptr<geom::CoordinateSequence> seq = 0L; -+ - try - { - switch( input->getType() ) -@@ -119,24 +120,24 @@ - - case Symbology::Geometry::TYPE_POINTSET: - seq = vec3dArray2CoordSeq( input, false, f->getCoordinateSequenceFactory() ); -- if ( seq ) output = f->createPoint( seq ); -+ if ( seq ) output = f->createPoint( *seq ); - break; - - case Symbology::Geometry::TYPE_LINESTRING: - seq = vec3dArray2CoordSeq( input, false, f->getCoordinateSequenceFactory() ); -- if ( seq ) output = f->createLineString( seq ); -+ if ( seq ) output = f->createLineString( *seq ); - break; - - case Symbology::Geometry::TYPE_RING: - seq = vec3dArray2CoordSeq( input, true, f->getCoordinateSequenceFactory() ); -- if ( seq ) output = f->createLinearRing( seq ); -+ if ( seq ) output = f->createLinearRing( *seq ); - break; - - case Symbology::Geometry::TYPE_POLYGON: - seq = vec3dArray2CoordSeq( input, true, f->getCoordinateSequenceFactory() ); - geom::LinearRing* shell = 0L; - if ( seq ) -- shell = f->createLinearRing( seq ); -+ shell = f->createLinearRing( *seq ); - - if ( shell ) - { -@@ -155,7 +156,7 @@ - holes = 0L; - } - } -- output = f->createPolygon( shell, holes ); -+ output = f->createPolygon( shell, (std::vector<geom::LinearRing * >*)holes ); - } - - break; diff --git a/gis/osgEarth/osgEarth.SlackBuild b/gis/osgEarth/osgEarth.SlackBuild index cf201daf4e..ede79953f1 100644 --- a/gis/osgEarth/osgEarth.SlackBuild +++ b/gis/osgEarth/osgEarth.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for osgEarth # Copyright 2012 Alexander Bruy <alexander.bruy@gmail.com> -# Copyright 2018-2019 Christoph Willing, Brisbane Australia +# Copyright 2018-2023 Christoph Willing, Brisbane Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=osgEarth SRCNAM=osgearth -VERSION=${VERSION:-2.10.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -62,8 +72,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -71,16 +81,13 @@ 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 .. \ -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 make make install DESTDIR=$PKG @@ -90,11 +97,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a tests LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/osgEarth/osgEarth.info b/gis/osgEarth/osgEarth.info index d87bb83193..e46300338f 100644 --- a/gis/osgEarth/osgEarth.info +++ b/gis/osgEarth/osgEarth.info @@ -1,10 +1,10 @@ PRGNAM="osgEarth" -VERSION="2.10.2" +VERSION="3.5" HOMEPAGE="http://osgearth.org/" -DOWNLOAD="https://github.com/gwaldron/osgearth/archive/osgearth-2.10.2/osgearth-osgearth-2.10.2.tar.gz" -MD5SUM="24f01afedb2eeac8154bf64772b7cbc7" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/osgEarth/osgearth-3.5.tar.gz" +MD5SUM="58de6c17ac7643a3ba30d978dc6f0e1b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="OpenSceneGraph gdal" +REQUIRES="fmt gdal OpenSceneGraph protobuf3 rocksdb spdlog" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" |