From 990da1af79afa4c33385508f32f79878a4a67966 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 17 Dec 2022 11:42:55 +0000 Subject: gnu: proj: Update to 9.1.1. * gnu/packages/geo.scm (proj): Update to 9.1.1. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index cefe973f4a..c7071f1559 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -599,7 +599,7 @@ fully fledged Spatial SQL capabilities.") (define-public proj (package (name "proj") - (version "9.1.0") + (version "9.1.1") (source (origin (method url-fetch) @@ -607,7 +607,7 @@ fully fledged Spatial SQL capabilities.") version ".tar.gz")) (sha256 (base32 - "0593vd9sac0c98j1f4rammd90d4xnhygbr6d49i8il6ajjdj7cl1")))) + "0fbd1vj4cj19kwh03vdn0a4hr0xaacvi876yyyw5xfsj1q0x8g00")))) (build-system cmake-build-system) (native-inputs (list googletest pkg-config)) (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc -- cgit 1.4.1 From 12586fd0b843c942f87f3afad4be422bf5f1e6cb Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 17 Dec 2022 11:42:56 +0000 Subject: gnu: libgeotiff: Apply patch for building against proj 9.1.1. * gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/geo.scm (libgeotiff): Apply it. Signed-off-by: Guillaume Le Vaillant --- gnu/local.mk | 1 + gnu/packages/geo.scm | 1 + .../libgeotiff-fix-tests-with-proj-9.1.1.patch | 100 +++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch (limited to 'gnu/packages/geo.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 56634e090c..faad95d902 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1381,6 +1381,7 @@ dist_patch_DATA = \ %D%/packages/patches/julia-tracker-16-compat.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ + %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c7071f1559..66280ff18b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -409,6 +409,7 @@ and driving.") (method url-fetch) (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" version ".tar.gz")) + (patches (search-patches "libgeotiff-fix-tests-with-proj-9.1.1.patch")) (sha256 (base32 "1mjmgv48x51ppax5dnb6lq7z600czxll53bx6jbzqwd4m93i7aq5")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch new file mode 100644 index 0000000000..b4bf292c1e --- /dev/null +++ b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch @@ -0,0 +1,100 @@ +From: Even Rouault +Date: Sat, 26 Nov 2022 13:23:12 +0100 +Subject: Fix test failures with PROJ 9.1.1 + +https://github.com/OSGeo/libgeotiff/pull/82 +--- + bin/listgeo.c | 7 ++++++- + test/testlistgeo | 4 ++-- + test/testlistgeo_out.dist | 14 -------------- + 3 files changed, 8 insertions(+), 17 deletions(-) + +diff --git a/bin/listgeo.c b/bin/listgeo.c +index 06c45f70..acad54c6 100644 +--- a/bin/listgeo.c ++++ b/bin/listgeo.c +@@ -29,6 +29,7 @@ void Usage() + " -tfw: Generate a .tfw (ESRI TIFF World) file for the target file.\n" + " -proj4: Report PROJ.4 equivalent projection definition.\n" + " -no_norm: Don't report 'normalized' parameter values.\n" ++ " -no_corners: Don't report corner coordinates.\n" + " filename: Name of the GeoTIFF file to report on.\n" ); + + exit( 1 ); +@@ -42,6 +43,7 @@ int main(int argc, char *argv[]) + int i, norm_print_flag = 1, proj4_print_flag = 0; + int tfw_flag = 0, inv_flag = 0, dec_flag = 0; + int st_test_flag = 0; ++ int corners = 1; + + /* + * Handle command line options. +@@ -50,6 +52,8 @@ int main(int argc, char *argv[]) + { + if( strcmp(argv[i],"-no_norm") == 0 ) + norm_print_flag = 0; ++ else if( strcmp(argv[i],"-no_corners") == 0 ) ++ corners = 0; + else if( strcmp(argv[i],"-tfw") == 0 ) + tfw_flag = 1; + else if( strcmp(argv[i],"-proj4") == 0 ) +@@ -130,7 +134,8 @@ int main(int argc, char *argv[]) + + TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &xsize ); + TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &ysize ); +- GTIFPrintCorners( gtif, &defn, stdout, xsize, ysize, inv_flag, dec_flag ); ++ if( corners ) ++ GTIFPrintCorners( gtif, &defn, stdout, xsize, ysize, inv_flag, dec_flag ); + } + + } +diff --git a/test/testlistgeo b/test/testlistgeo +index 596301b4..9a41e74f 100755 +--- a/test/testlistgeo ++++ b/test/testlistgeo +@@ -59,11 +59,11 @@ $EXE ${DATA_DIR}/ProjLinearUnitsGeoKey_9036.tif >>${OUT} + echo "" >>${OUT} + + echo "Testing listgeo ProjectedCSTypeGeoKey_28191_cassini_soldner.tif" >> ${OUT} +-$EXE ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT} ++$EXE -no_corners ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT} + echo "" >>${OUT} + + echo "Testing listgeo cassini_soldner.tif" >> ${OUT} +-$EXE ${DATA_DIR}/cassini_soldner.tif >>${OUT} ++$EXE -no_corners ${DATA_DIR}/cassini_soldner.tif >>${OUT} + echo "" >>${OUT} + + echo "Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif" >> ${OUT} +diff --git a/test/testlistgeo_out.dist b/test/testlistgeo_out.dist +index 742f0fce..20221cec 100644 +--- a/test/testlistgeo_out.dist ++++ b/test/testlistgeo_out.dist +@@ -299,13 +299,6 @@ Ellipsoid: 7010/Clarke 1880 (Benoit) (6378300.79,6356566.43) + Prime Meridian: 8901/Greenwich (0.000000/ 0d 0' 0.00"E) + Projection Linear Units: 9001/metre (1.000000m) + +-Corner Coordinates: +-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N) +-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N) +-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N) +-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N) +-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N) +- + Testing listgeo cassini_soldner.tif + Geotiff_Information: + Version: 1 +@@ -348,13 +341,6 @@ Projection Method: CT_CassiniSoldner + ProjFalseNorthingGeoKey: 126867.909000 m + Projection Linear Units: 9001/metre (1.000000m) + +-Corner Coordinates: +-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N) +-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N) +-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N) +-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N) +-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N) +- + Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif + Geotiff_Information: + Version: 1 -- cgit 1.4.1 From 9c5c432f407d6717c85c25a09910d600a69d38da Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 17 Dec 2022 11:42:57 +0000 Subject: gnu: python-pyproj: Update to 3.4.0. * gnu/packages/geo.scm (python-pyproj): Update to 3.4.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 66280ff18b..b157678eba 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -702,14 +702,14 @@ projections.") (define-public python-pyproj (package (name "python-pyproj") - (version "3.3.1") + (version "3.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pyproj" version)) (sha256 (base32 - "1gjg63irs44djyqbp9gg7s02d0y5i9cd1a83phyzp5fcj56y3n5k")))) + "0czbfl5dd7jckbwvinfwiwdb99sxj796gfn3a9zqbsdc4xcl8257")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From f912be4c12ec4c3200dccca642c7021aa872d3c2 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 17 Dec 2022 11:42:58 +0000 Subject: gnu: python-cartopy: Update to 0.21.0. * gnu/packages/geo.scm (python-cartopy): Update to 0.21.0. [inputs]: Remove proj. [native-inputs]: Add python-pytest-mpl. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b157678eba..897d5ecee6 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1178,13 +1178,13 @@ utilities for data translation and processing.") (package (name "python-cartopy") ;; This is a post-release fix that adds build_ext to setup.py. - (version "0.20.3") + (version "0.21.0") (source (origin (method url-fetch) (uri (pypi-uri "Cartopy" version)) (sha256 - (base32 "01lhnkhw22jp6hnrs5qvgkq4fqcni2sx7ydiyv8w8xxx5wpglq0d")))) + (base32 "0hnfs75dcnz12ximah5xn9566r8zz189lxikmj4lrs9jl4l3l7ff")))) (build-system python-build-system) (arguments `(#:phases @@ -1207,13 +1207,12 @@ utilities for data translation and processing.") python-scipy python-shapely)) (inputs - (list geos - ;; cartopy's setup.py looks for the proj executable. - ;; Not sure if it actually makes use of it since it - ;; probably uses proj only through pyproj. - proj)) + (list geos)) (native-inputs - (list python-cython python-flufl-lock python-pytest)) + (list python-cython + python-flufl-lock + python-pytest + python-pytest-mpl)) (home-page "https://scitools.org.uk/cartopy/docs/latest/") (synopsis "Cartographic library for visualisation") (description -- cgit 1.4.1 From d30ad6ff5c4c4fbcaa9821f4e04a90d601642506 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 17 Dec 2022 12:24:10 +0000 Subject: gnu: geos: Update to 3.11.1. * gnu/packages/geo.scm (geos): Update to 3.11.1. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 897d5ecee6..cc537ee179 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -293,7 +293,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.") (define-public geos (package (name "geos") - (version "3.11.0") + (version "3.11.1") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geos/geos-" @@ -301,7 +301,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.") ".tar.bz2")) (sha256 (base32 - "12l59pxawyizmc4wn20dvjn7aifqwkim4ysmc78h91mayjmqravr")))) + "1qhbirv1rbznv99ha0pa0zybvcsn0dsz2xfc65vr8bgrm77v63kd")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From d8231432c57a3d8d8def39c2effd45221794bb6f Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 17 Dec 2022 13:12:37 +0000 Subject: gnu: gdal: Update to 3.6.1. * gnu/packages/geo.scm (gdal): Update to 3.6.1. [inputs]: Add libjxl. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index cc537ee179..78427f03eb 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1046,7 +1046,7 @@ development.") (define-public gdal (package (name "gdal") - (version "3.5.1") + (version "3.6.1") (source (origin (method url-fetch) (uri (string-append @@ -1054,7 +1054,7 @@ development.") version ".tar.gz")) (sha256 (base32 - "1l93q7xf6qx9ck5axfkf3ygmvclxkvrjd8x00ckn7j0d0750ci3w")) + "1qckwnygszxkkq40bf87s3m1sab6jj9jyakdvskh0qf7dq8zjarf")) (modules '((guix build utils))) (snippet `(begin @@ -1084,6 +1084,7 @@ development.") json-c libgeotiff libjpeg-turbo + libjxl libpng libtiff libwebp -- cgit 1.4.1 From 3c6f7b53cea7ea5dc8176fec02271bc3770d7fc1 Mon Sep 17 00:00:00 2001 From: Roman Scherer Date: Sat, 3 Dec 2022 18:59:02 +0100 Subject: gnu: gdal: Add support for lz4 and openjpeg. * gnu/packages/geo.scm (gdal)[inputs]: Add lz4 and openjpeg. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 78427f03eb..02259c2f6c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1088,8 +1088,10 @@ development.") libpng libtiff libwebp + lz4 netcdf openssl + openjpeg pcre2 postgresql ; libpq proj -- cgit 1.4.1 From 25f702449c8683b3ec78b2e4a5728e700462e5a2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 20 Dec 2022 17:01:41 +0100 Subject: gnu: Merge gdal and python-gdal packages. * gnu/packages/geo.scm (gdal)[inputs]: Add swig and zstd. [native-inputs]: Add python. [propagated-inputs]: Add python-numpy. (python-gdal): Remove variable. (qgis)[inputs]: Remove python-gdal. [arguments]: Disable a flaky test. --- gnu/packages/geo.scm | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 02259c2f6c..2185af7a98 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1097,9 +1097,14 @@ development.") proj qhull sqlite - zlib)) + swig + zlib + zstd)) (native-inputs - (list pkg-config)) + (list pkg-config + python)) + (propagated-inputs + (list python-numpy)) (home-page "https://gdal.org/") (synopsis "Raster and vector geospatial data format library") (description "GDAL is a translator library for raster and vector geospatial @@ -1128,25 +1133,6 @@ utilities for data translation and processing.") ;; frmts/mrf/libLERC license:asl2.0)))) -(define-public python-gdal - (package (inherit gdal) - (name "python-gdal") - (build-system python-build-system) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-before 'build 'chdir - (lambda _ - (chdir "swig/python") - #t))))) - (native-inputs '()) - (propagated-inputs - (list python-numpy)) - (inputs - (list gdal)) - (synopsis "GDAL (Geospatial Data Abstraction Library) python bindings"))) - (define-public python-pyshp (package (name "python-pyshp") @@ -2554,6 +2540,7 @@ growing set of geoscientific methods.") "ProcessingQgisAlgorithmsTestPt2" "ProcessingQgisAlgorithmsTestPt3" "ProcessingQgisAlgorithmsTestPt4" + "ProcessingGdalAlgorithmsRasterTest" "ProcessingGdalAlgorithmsVectorTest" "ProcessingGrass7AlgorithmsImageryTest" "ProcessingGrass7AlgorithmsRasterTestPt1" @@ -2671,7 +2658,6 @@ growing set of geoscientific methods.") python-chardet python-dateutil python-future - python-gdal python-jinja2 python-numpy python-owslib -- cgit 1.4.1