feat: upgrade geos to 3.12.0 and fix gdal build (#1697)

metwork-framework · Oct 3, 2023 · e3e1de0 · e3e1de0
1 parent 9a826a0
commit e3e1de0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md
@@ -64,7 +64,7 @@
 | [frozenlist](https://github.com/aio-libs/frozenlist) | 1.4.0 | python3 |
 | [gdal](http://www.gdal.org) | 3.7.2 | scientific_core |
 | [geojson](https://github.com/jazzband/geojson) | 3.0.1 | python3 |
-| [geos](http://trac.osgeo.org/geos/) | 3.10.3 | scientific_core |
+| [geos](http://trac.osgeo.org/geos/) | 3.12.0 | scientific_core |
 | [ghp-import](https://github.com/c-w/ghp-import) | 2.1.0 | python3_devtools |
 | [gitignore-parser](https://github.com/mherrmann/gitignore_parser) | 0.1.6 | python3 |
 | [hatch-fancy-pypi-readme](https://pypi.org/project/hatch-fancy-pypi-readme) | 23.1.0 | python3 |
@@ -95,7 +95,7 @@
 | [layerapi2](https://github.com/metwork-framework/layerapi2) | 0.0.4 | core |
 | [lazy-import](https://github.com/mnmelo/lazy_import) | 0.2.2 | python3 |
 | [lazy-object-proxy](https://github.com/ionelmc/python-lazy-object-proxy) | 1.8.0 | python3_devtools |
-| [libgeotiff](https://www.hdfgroup.org) | 1.7.1 | scientific_core |
+| [libgeotiff](https://github.com/OSGeo/libgeotiff) | 1.7.1 | scientific_core |
 | [libspatialite](https://www.gaia-gis.it/fossil/libspatialite) | 5.0.1 | scientific_core |
 | [libtree](https://github.com/haampie/libtree) | 3.1.1 | devtools |
 | [liquidprompt](https://github.com/nojhan/liquidprompt) | 2.1.2 | core |

diff --git a/layers/layer1_scientific_core/0020_libgeotiff/Makefile.mk b/layers/layer1_scientific_core/0020_libgeotiff/Makefile.mk
@@ -8,8 +8,8 @@ export CHECKTYPE=MD5
 export CHECKSUM=22879ac6f83460605f9c39147a2ccc7a
 DESCRIPTION=\
 Libgeotiff is designed to permit the extraction and parsing of the "GeoTIFF" Key directories, as well as definition and installation of GeoTIFF keys in new files
-WEBSITE=https://www.hdfgroup.org
-LICENSE=BSD
+WEBSITE=https://github.com/OSGeo/libgeotiff
+LICENSE=MIT
 
 $(shell echo "prefix=$(PREFIX)" > libgeotiff.pc)
 $(shell echo "exec_prefix=$(PREFIX)" >> libgeotiff.pc)

diff --git a/layers/layer1_scientific_core/0021_geos/Makefile.mk b/layers/layer1_scientific_core/0021_geos/Makefile.mk
@@ -2,10 +2,10 @@ include ../../../adm/root.mk
 include ../../package.mk
 
 export NAME=geos
-export VERSION=3.10.3
+export VERSION=3.12.0
 export EXTENSION=tar.bz2
 export CHECKTYPE=MD5
-export CHECKSUM=a5a6959a8a294d9dab778a9ef03ccced
+export CHECKSUM=b2538c3b0b719c64797256ceef5fcc78
 DESCRIPTION=\
 GEOS is a C++ port of the JTS Topology Suite (JTS). \
 GEOS provides spatial functionality. Especially, it allows to calculate complex intersections of polygons.

diff --git a/layers/layer1_scientific_core/0021_geos/sources b/layers/layer1_scientific_core/0021_geos/sources
@@ -1 +1 @@
-https://download.osgeo.org/geos/geos-3.10.3.tar.bz2
+https://download.osgeo.org/geos/geos-3.12.0.tar.bz2
diff --git a/layers/layer1_scientific_core/0023_gdal/Makefile.mk b/layers/layer1_scientific_core/0023_gdal/Makefile.mk
@@ -16,5 +16,5 @@ LICENSE=MIT
 
 all:: $(PREFIX)/lib/libgdal.so
 $(PREFIX)/lib/libgdal.so:
-	$(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) OPTIONS="-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL" download uncompress configure_cmake build_cmake install_cmake
+	$(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) OPTIONS="-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL -DCMAKE_BUILD_TYPE=Release" download uncompress configure_cmake build_cmake install_cmake
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://download.osgeo.org/geos/geos-3.10.3.tar.bz2
		https://download.osgeo.org/geos/geos-3.12.0.tar.bz2