From owner-svn-ports-head@freebsd.org Tue Dec 10 17:16:16 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 698761DFD1E; Tue, 10 Dec 2019 17:16:16 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47XRYD1LPkz41Gy; Tue, 10 Dec 2019 17:16:16 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5A9E2DFFF; Tue, 10 Dec 2019 17:16:15 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBAHGFTj008739; Tue, 10 Dec 2019 17:16:15 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBAHGFFq008738; Tue, 10 Dec 2019 17:16:15 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201912101716.xBAHGFFq008738@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 10 Dec 2019 17:16:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519759 - head/graphics/osgearth/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/graphics/osgearth/files X-SVN-Commit-Revision: 519759 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2019 17:16:16 -0000 Author: sunpoet Date: Tue Dec 10 17:16:15 2019 New Revision: 519759 URL: https://svnweb.freebsd.org/changeset/ports/519759 Log: Fix build with geos 3.8.0 Obtained from: https://git.slackbuilds.org/slackbuilds/tree/gis/osgEarth/geos-3_8-support.patch Added: head/graphics/osgearth/files/patch-src-osgEarthSymbology-GEOS.cpp (contents, props changed) Added: head/graphics/osgearth/files/patch-src-osgEarthSymbology-GEOS.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/osgearth/files/patch-src-osgEarthSymbology-GEOS.cpp Tue Dec 10 17:16:15 2019 (r519759) @@ -0,0 +1,70 @@ +Obtained from: https://git.slackbuilds.org/slackbuilds/tree/gis/osgEarth/geos-3_8-support.patch + +--- src/osgEarthSymbology/GEOS.cpp.orig 2019-04-19 16:45:18 UTC ++++ src/osgEarthSymbology/GEOS.cpp +@@ -49,7 +49,7 @@ using namespace geos::operation; + + 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 @@ namespace + { + coords->push_back( coords->front() ); + } +- geom::CoordinateSequence* seq = factory->create( coords ); ++ std::unique_ptr seq = factory->create( coords ); + + return seq; + } +@@ -108,7 +108,8 @@ namespace + 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 @@ namespace + + 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 @@ namespace + holes = 0L; + } + } +- output = f->createPolygon( shell, holes ); ++ output = f->createPolygon( shell, (std::vector*)holes ); + } + + break;