Date: Sun, 05 Apr 2026 17:29:37 +0000 From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a1f3d38049d7 - main - cad/sumo: Fix build with gdal 3.12.0+ Message-ID: <69d29c01.1d9ea.2186fe8c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1f3d38049d711ba7a91bbc3139777ec885dffcb commit a1f3d38049d711ba7a91bbc3139777ec885dffcb Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2026-04-05 17:17:11 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2026-04-05 17:20:04 +0000 cad/sumo: Fix build with gdal 3.12.0+ Obtained from: https://github.com/eclipse-sumo/sumo/commit/8a52e99ba9170b65e7c661e001d5028e4bba5241 https://github.com/eclipse-sumo/sumo/commit/bb818b0822ea730e932769d9eba4cfdb3966095c --- cad/sumo/files/patch-gdal | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/cad/sumo/files/patch-gdal b/cad/sumo/files/patch-gdal new file mode 100644 index 000000000000..58bc45bcd88c --- /dev/null +++ b/cad/sumo/files/patch-gdal @@ -0,0 +1,45 @@ +Obtained from: https://github.com/eclipse-sumo/sumo/commit/8a52e99ba9170b65e7c661e001d5028e4bba5241 + https://github.com/eclipse-sumo/sumo/commit/bb818b0822ea730e932769d9eba4cfdb3966095c + +--- src/netbuild/NBHeightMapper.cpp.orig 2019-04-15 14:11:30 UTC ++++ src/netbuild/NBHeightMapper.cpp +@@ -192,7 +192,11 @@ NBHeightMapper::loadShapeFile(const std::string& file) + + // triangle coordinates are stored in WGS84 and later matched with network coordinates in WGS84 + // build coordinate transformation ++#if GDAL_VERSION_MAJOR < 3 + OGRSpatialReference* sr_src = layer->GetSpatialRef(); ++#else ++ const OGRSpatialReference* sr_src = layer->GetSpatialRef(); ++#endif + OGRSpatialReference sr_dest; + sr_dest.SetWellKnownGeogCS("WGS84"); + OGRCoordinateTransformation* toWGS84 = OGRCreateCoordinateTransformation(sr_src, &sr_dest); +--- src/netimport/NIImporter_ArcView.cpp.orig 2019-04-15 14:11:30 UTC ++++ src/netimport/NIImporter_ArcView.cpp +@@ -139,7 +139,11 @@ NIImporter_ArcView::load() { + poLayer->ResetReading(); + + // build coordinate transformation ++#if GDAL_VERSION_MAJOR < 3 + OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); ++#else ++ const OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); ++#endif + OGRSpatialReference destTransf; + // use wgs84 as destination + destTransf.SetWellKnownGeogCS("WGS84"); +--- src/polyconvert/PCLoaderArcView.cpp.orig 2019-04-15 14:11:30 UTC ++++ src/polyconvert/PCLoaderArcView.cpp +@@ -102,7 +102,11 @@ PCLoaderArcView::load(const std::string& file, Options + poLayer->ResetReading(); + + // build coordinate transformation ++#if GDAL_VERSION_MAJOR < 3 + OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); ++#else ++ const OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); ++#endif + OGRSpatialReference destTransf; + // use wgs84 as destination + destTransf.SetWellKnownGeogCS("WGS84");home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d29c01.1d9ea.2186fe8c>