From 1dd011998ea4bc8db5126b8e2b4950e0a9034c25 Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Thu, 13 May 2021 20:00:04 +1000 Subject: gis/osgEarth: Updated for version 3.1 Signed-off-by: Christoph Willing Signed-off-by: Willy Sudiarto Raharjo --- gis/osgEarth/geos-3_8-support.patch | 69 ------------------------------------- gis/osgEarth/osgEarth.SlackBuild | 13 +++---- gis/osgEarth/osgEarth.info | 6 ++-- 3 files changed, 8 insertions(+), 80 deletions(-) delete mode 100644 gis/osgEarth/geos-3_8-support.patch 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 - 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 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 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*)holes ); - } - - break; diff --git a/gis/osgEarth/osgEarth.SlackBuild b/gis/osgEarth/osgEarth.SlackBuild index cf201daf4e..00e84254a5 100644 --- a/gis/osgEarth/osgEarth.SlackBuild +++ b/gis/osgEarth/osgEarth.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for osgEarth # Copyright 2012 Alexander Bruy -# Copyright 2018-2019 Christoph Willing, Brisbane Australia +# Copyright 2018-2021 Christoph Willing, Brisbane Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ PRGNAM=osgEarth SRCNAM=osgearth -VERSION=${VERSION:-2.10.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,16 +71,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,7 +87,7 @@ 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 diff --git a/gis/osgEarth/osgEarth.info b/gis/osgEarth/osgEarth.info index d87bb83193..75cc714ddd 100644 --- a/gis/osgEarth/osgEarth.info +++ b/gis/osgEarth/osgEarth.info @@ -1,8 +1,8 @@ PRGNAM="osgEarth" -VERSION="2.10.2" +VERSION="3.1" 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://github.com/gwaldron/osgearth/archive/osgearth-3.1/osgearth-osgearth-3.1.tar.gz" +MD5SUM="20230b8e07da210c1a7757247a339243" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenSceneGraph gdal" -- cgit v1.2.3