geo/geos: update to 3.10.0.

See https://lists.osgeo.org/pipermail/geos-devel/2021-October/010484.html
This commit is contained in:
landry 2021-10-23 09:15:12 +00:00
parent 955387a5de
commit 81b32f9cfb
5 changed files with 56 additions and 35 deletions

View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.35 2021/03/24 10:53:30 landry Exp $
BROKEN-hppa = undefined reference to 'std::auto_ptr<geos::geom::Envelope>::~auto_ptr()'
BROKEN-arm = ld: error: duplicate symbol: typeinfo for geos::noding::BasicSegmentString
# $OpenBSD: Makefile,v 1.36 2021/10/23 09:15:12 landry Exp $
COMMENT= 2d geometry and topology engine
DISTNAME= geos-3.9.1
DISTNAME= geos-3.10.0
CATEGORIES= geo
REVISION= 0
MAINTAINER = Landry Breuil <landry@openbsd.org>
SHARED_LIBS= geos 16.0 \
geos_c 4.5
SHARED_LIBS= geos 17.0 \
geos_c 4.6
# LGPLv2.1
PERMIT_PACKAGE= Yes
@ -21,7 +18,7 @@ MASTER_SITES= http://download.osgeo.org/geos/
EXTRACT_SUFX= .tar.bz2
WANTLIB= m ${COMPILER_LIBCXX}
WANTLIB= c m ${COMPILER_LIBCXX}
# cf https://trac.osgeo.org/geos/wiki/RFC7
MODULES = devel/cmake

View File

@ -1,2 +1,2 @@
SHA256 (geos-3.9.1.tar.bz2) = fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo=
SIZE (geos-3.9.1.tar.bz2) = 4761372
SHA256 (geos-3.10.0.tar.bz2) = CX1w48j2iOWWM86404rVybDX6tVymt65JdvEiUN6vhM=
SIZE (geos-3.10.0.tar.bz2) = 6799370

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.8 2021/02/21 07:36:49 landry Exp $
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -418,7 +418,6 @@ lib_LTLIBRARIES = libgeos.la
# has changed between releases; the project chooses not to expend the
# effort to determine this because GEOS does not promise ABI stability.
libgeos_la_LDFLAGS = \
- -release @VERSION_RELEASE@ \
-no-undefined
libgeos_la_SOURCES = \

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-tools_geos-config_in,v 1.1 2021/02/21 07:36:49 landry Exp $
$OpenBSD: patch-tools_geos-config_in,v 1.2 2021/10/23 09:15:12 landry Exp $
Index: tools/geos-config.in
--- tools/geos-config.in.orig
+++ tools/geos-config.in
@@ -49,7 +49,7 @@ while test $# -gt 0; do
@@ -44,7 +44,7 @@ while test $# -gt 0; do
--libs)
# TODO: make an alias for --clibs
# see http://trac.osgeo.org/geos/ticket/497

View File

@ -1,11 +1,13 @@
@comment $OpenBSD: PLIST,v 1.19 2021/03/24 10:53:30 landry Exp $
@comment $OpenBSD: PLIST,v 1.20 2021/10/23 09:15:12 landry Exp $
bin/geos-config
@bin bin/geosop
include/geos/
include/geos/algorithm/
include/geos/algorithm/Angle.h
include/geos/algorithm/Area.h
include/geos/algorithm/BoundaryNodeRule.h
include/geos/algorithm/CGAlgorithmsDD.h
include/geos/algorithm/CGAlgorithmsDD.inl
include/geos/algorithm/CentralEndpointIntersector.h
include/geos/algorithm/Centroid.h
include/geos/algorithm/ConvexHull.h
@ -18,15 +20,18 @@ include/geos/algorithm/InteriorPointPoint.h
include/geos/algorithm/Intersection.h
include/geos/algorithm/Length.h
include/geos/algorithm/LineIntersector.h
include/geos/algorithm/LineIntersector.inl
include/geos/algorithm/MinimumBoundingCircle.h
include/geos/algorithm/MinimumDiameter.h
include/geos/algorithm/NotRepresentableException.h
include/geos/algorithm/Orientation.h
include/geos/algorithm/PointInRing.h
include/geos/algorithm/PointLocation.h
include/geos/algorithm/PointLocator.h
include/geos/algorithm/RayCrossingCounter.h
include/geos/algorithm/RayCrossingCounterDD.h
include/geos/algorithm/RobustDeterminant.h
include/geos/algorithm/SimplePointInRing.h
include/geos/algorithm/construct/
include/geos/algorithm/construct/LargestEmptyCircle.h
include/geos/algorithm/construct/MaximumInscribedCircle.h
@ -115,8 +120,10 @@ include/geos/geom/util/GeometryCombiner.h
include/geos/geom/util/GeometryEditor.h
include/geos/geom/util/GeometryEditorOperation.h
include/geos/geom/util/GeometryExtracter.h
include/geos/geom/util/GeometryFixer.h
include/geos/geom/util/GeometryTransformer.h
include/geos/geom/util/LinearComponentExtracter.h
include/geos/geom/util/NoOpGeometryOperation.h
include/geos/geom/util/PointExtracter.h
include/geos/geom/util/PolygonExtracter.h
include/geos/geom/util/ShortCircuitedGeometryVisitor.h
@ -205,6 +212,10 @@ include/geos/index/strtree/STRtree.h
include/geos/index/strtree/SimpleSTRdistance.h
include/geos/index/strtree/SimpleSTRnode.h
include/geos/index/strtree/SimpleSTRtree.h
include/geos/index/strtree/TemplateSTRNode.h
include/geos/index/strtree/TemplateSTRNodePair.h
include/geos/index/strtree/TemplateSTRtree.h
include/geos/index/strtree/TemplateSTRtreeDistance.h
include/geos/index/sweepline/
include/geos/index/sweepline/SweepLineEvent.h
include/geos/index/sweepline/SweepLineIndex.h
@ -216,6 +227,9 @@ include/geos/io/ByteOrderDataInStream.h
include/geos/io/ByteOrderDataInStream.inl
include/geos/io/ByteOrderValues.h
include/geos/io/CLocalizer.h
include/geos/io/GeoJSON.h
include/geos/io/GeoJSONReader.h
include/geos/io/GeoJSONWriter.h
include/geos/io/ParseException.h
include/geos/io/StringTokenizer.h
include/geos/io/WKBConstants.h
@ -253,8 +267,10 @@ include/geos/noding/MCIndexNoder.inl
include/geos/noding/MCIndexSegmentSetMutualIntersector.h
include/geos/noding/NodableSegmentString.h
include/geos/noding/NodedSegmentString.h
include/geos/noding/NodedSegmentString.inl
include/geos/noding/Noder.h
include/geos/noding/NodingIntersectionFinder.h
include/geos/noding/NodingIntersectionFinder.inl
include/geos/noding/NodingValidator.h
include/geos/noding/Octant.h
include/geos/noding/OrientedCoordinateArray.h
@ -262,6 +278,7 @@ include/geos/noding/ScaledNoder.h
include/geos/noding/SegmentIntersectionDetector.h
include/geos/noding/SegmentIntersector.h
include/geos/noding/SegmentNode.h
include/geos/noding/SegmentNode.inl
include/geos/noding/SegmentNodeList.h
include/geos/noding/SegmentPointComparator.h
include/geos/noding/SegmentSetMutualIntersector.h
@ -284,7 +301,6 @@ include/geos/noding/snapround/SnapRoundingIntersectionAdder.h
include/geos/noding/snapround/SnapRoundingNoder.h
include/geos/operation/
include/geos/operation/GeometryGraphOperation.h
include/geos/operation/IsSimpleOp.h
include/geos/operation/buffer/
include/geos/operation/buffer/BufferBuilder.h
include/geos/operation/buffer/BufferInputLineSimplifier.h
@ -331,7 +347,6 @@ include/geos/operation/overlay/PolygonBuilder.h
include/geos/operation/overlay/snap/
include/geos/operation/overlay/snap/GeometrySnapper.h
include/geos/operation/overlay/snap/LineStringSnapper.h
include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
include/geos/operation/overlay/snap/SnapOverlayOp.h
include/geos/operation/overlay/validate/
include/geos/operation/overlay/validate/FuzzyPointLocator.h
@ -339,7 +354,9 @@ include/geos/operation/overlay/validate/OffsetPointGenerator.h
include/geos/operation/overlay/validate/OverlayResultValidator.h
include/geos/operation/overlayng/
include/geos/operation/overlayng/Edge.h
include/geos/operation/overlayng/Edge.inl
include/geos/operation/overlayng/EdgeKey.h
include/geos/operation/overlayng/EdgeKey.inl
include/geos/operation/overlayng/EdgeMerger.h
include/geos/operation/overlayng/EdgeNodingBuilder.h
include/geos/operation/overlayng/EdgeSourceInfo.h
@ -351,9 +368,11 @@ include/geos/operation/overlayng/LineBuilder.h
include/geos/operation/overlayng/LineLimiter.h
include/geos/operation/overlayng/MaximalEdgeRing.h
include/geos/operation/overlayng/OverlayEdge.h
include/geos/operation/overlayng/OverlayEdge.inl
include/geos/operation/overlayng/OverlayEdgeRing.h
include/geos/operation/overlayng/OverlayGraph.h
include/geos/operation/overlayng/OverlayLabel.h
include/geos/operation/overlayng/OverlayLabel.inl
include/geos/operation/overlayng/OverlayLabeller.h
include/geos/operation/overlayng/OverlayMixedPoints.h
include/geos/operation/overlayng/OverlayNG.h
@ -391,9 +410,7 @@ include/geos/operation/sharedpaths/
include/geos/operation/sharedpaths/SharedPathsOp.h
include/geos/operation/union/
include/geos/operation/union/CascadedPolygonUnion.h
include/geos/operation/union/CascadedUnion.h
include/geos/operation/union/CoverageUnion.h
include/geos/operation/union/GeometryListHolder.h
include/geos/operation/union/OverlapUnion.h
include/geos/operation/union/PointGeometryUnion.h
include/geos/operation/union/UnaryUnionOp.h
@ -401,14 +418,19 @@ include/geos/operation/union/UnionStrategy.h
include/geos/operation/valid/
include/geos/operation/valid/ConnectedInteriorTester.h
include/geos/operation/valid/ConsistentAreaTester.h
include/geos/operation/valid/IndexedNestedShellTester.h
include/geos/operation/valid/IndexedNestedHoleTester.h
include/geos/operation/valid/IndexedNestedPolygonTester.h
include/geos/operation/valid/IsSimpleOp.h
include/geos/operation/valid/IsValidOp.h
include/geos/operation/valid/MakeValid.h
include/geos/operation/valid/QuadtreeNestedRingTester.h
include/geos/operation/valid/PolygonIntersectionAnalyzer.h
include/geos/operation/valid/PolygonNode.h
include/geos/operation/valid/PolygonRing.h
include/geos/operation/valid/PolygonRingSelfNode.h
include/geos/operation/valid/PolygonRingTouch.h
include/geos/operation/valid/PolygonTopologyAnalyzer.h
include/geos/operation/valid/RepeatedPointRemover.h
include/geos/operation/valid/RepeatedPointTester.h
include/geos/operation/valid/SimpleNestedRingTester.h
include/geos/operation/valid/SweeplineNestedRingTester.h
include/geos/operation/valid/TopologyValidationError.h
include/geos/planargraph/
include/geos/planargraph/DirectedEdge.h
@ -428,7 +450,9 @@ include/geos/precision/CommonBitsRemover.h
include/geos/precision/EnhancedPrecisionOp.h
include/geos/precision/GeometryPrecisionReducer.h
include/geos/precision/MinimumClearance.h
include/geos/precision/PointwisePrecisionReducerTransformer.h
include/geos/precision/PrecisionReducerCoordinateOperation.h
include/geos/precision/PrecisionReducerTransformer.h
include/geos/precision/SimpleGeometryPrecisionReducer.h
include/geos/profiler.h
include/geos/shape/
@ -449,6 +473,13 @@ include/geos/triangulate/
include/geos/triangulate/DelaunayTriangulationBuilder.h
include/geos/triangulate/IncrementalDelaunayTriangulator.h
include/geos/triangulate/VoronoiDiagramBuilder.h
include/geos/triangulate/polygon/
include/geos/triangulate/polygon/ConstrainedDelaunayTriangulator.h
include/geos/triangulate/polygon/PolygonEarClipper.h
include/geos/triangulate/polygon/PolygonHoleJoiner.h
include/geos/triangulate/polygon/PolygonTriangulator.h
include/geos/triangulate/polygon/TriDelaunayImprover.h
include/geos/triangulate/polygon/VertexSequencePackedRtree.h
include/geos/triangulate/quadedge/
include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h
include/geos/triangulate/quadedge/LocateFailureException.h
@ -459,6 +490,11 @@ include/geos/triangulate/quadedge/QuadEdgeSubdivision.h
include/geos/triangulate/quadedge/TrianglePredicate.h
include/geos/triangulate/quadedge/TriangleVisitor.h
include/geos/triangulate/quadedge/Vertex.h
include/geos/triangulate/tri/
include/geos/triangulate/tri/Tri.h
include/geos/triangulate/tri/TriEdge.h
include/geos/triangulate/tri/TriList.h
include/geos/triangulate/tri/TriangulationBuilder.h
include/geos/unload.h
include/geos/util/
include/geos/util.h
@ -475,6 +511,7 @@ include/geos/util/TopologyException.h
include/geos/util/UniqueCoordinateArrayFilter.h
include/geos/util/UnsupportedOperationException.h
include/geos/util/math.h
include/geos/vend/
include/geos/version.h
include/geos_c.h
lib/cmake/