Skip to content

Commit

Permalink
update spatial libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
s-u committed Feb 8, 2025
1 parent 59cf076 commit 53037b1
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 46 deletions.
7 changes: 7 additions & 0 deletions recipes/blosc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Package: blosc
Version: 1.21.6
Source-URL: https://github.com/Blosc/c-blosc/archive/refs/tags/v${ver}.tar.gz
Source-SHA256: 9fcd60301aae28f97f1301b735f966cc19e7c49b6b4321b839b4579a0c156f38
Depends: lz4, zstd
Build-system: cmake
Configure: -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_BUILD_TYPE="Release" -DPREFER_EXTERNAL_LZ4=ON -DPREFER_EXTERNAL_ZLIB=ON -DPREFER_EXTERNAL_ZSTD=ON -DBUILD_TESTS=OFF -DBUILD_BENCHMARKS=OFF
11 changes: 11 additions & 0 deletions recipes/blosc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -ru blosc-1.21.6/blosc.pc.in blosc-1.21.6-1/blosc.pc.in
--- blosc-1.21.6/blosc.pc.in 2024-06-25 03:56:17
+++ blosc-1.21.6-1/blosc.pc.in 2025-02-03 13:51:56
@@ -9,6 +9,6 @@
URL: https://blosc.org/
Version: @BLOSC_VERSION_STRING@

-Requires:
+Requires: libzstd, liblz4, zlib
Libs: -L${libdir} -L${sharedlibdir} -lblosc
Cflags: -I${includedir}
7 changes: 4 additions & 3 deletions recipes/expat
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Package: expat
Version: 2.6.2
Source-URL: https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-${ver}.tar.bz2
Source-SHA256: 9c7c1b5dcbc3c237c500a8fb1493e14d9582146dd9b42aa8d3ffb856a3b927e0
Version: 2.6.4
Source-URL: https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-${ver}.tar.bz2
Source-SHA256: 8dc480b796163d4436e6f1352e71800a774f73dbae213f1860b60607d2a83ada
Build-system: cmake
9 changes: 4 additions & 5 deletions recipes/gdal
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Package: gdal
Version: 3.5.3
Depends: pkgconfig, xz, libpq, proj, openjpeg, libwebp, libgeotiff, freexl, sqlite3, expat, hdf4, hdf5, szip, netcdf, geos, unixodbc
Version: 3.10.1
Depends: pkgconfig, xz, libpq, proj, openjpeg, libwebp, libgeotiff, freexl, sqlite3, expat, hdf4, hdf5, szip, netcdf, geos, unixodbc, blosc, zstd
Source-URL: https://github.com/OSGeo/gdal/releases/download/v${ver}/gdal-${ver}.tar.gz
Source-SHA256: a9ea0300d17e35bab71df4f16e62bb2fb8081caf994ab3ee0502ce4cf0d4e593
Configure: --with-proj-extra-lib-for-test="`pkg-config --static --libs proj` -lsz" --with-freexl=/${prefix} --with-expat=/${prefix} --with-liblzma --with-sqlite3=/${prefix}
Special: in-sources
Source-SHA256: b1c739256d074be42d67c6c3d33eee94c90a490ebb02fcb7fc21c569a6fc78bd
Build-system: cmake
21 changes: 0 additions & 21 deletions recipes/gdal.patch

This file was deleted.

10 changes: 4 additions & 6 deletions recipes/hdf5
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
Package: hdf5
Version: 1.12.2
Source-URL: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-${ver}/src/hdf5-${ver}.tar.bz2
Source-SHA256: 1a88bbe36213a2cea0c8397201a459643e7155c9dc91e062675b3fb07ee38afe
Version: 1.14.5
Source-URL: https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_5/downloads/hdf5-${ver}.tar.gz
Source-SHA256: ec2e13c52e60f9a01491bb3158cb3778c985697131fc6a342262d32a26e58e44
Depends: szip, jpeg
Configure: --enable-build-mode=production --with-szlib
#Note: there is a bug in install-examples of hdf5 1.12.0 so have to skip those by uisng install-recursive only
Install: make install-recursive
Configure: --enable-build-mode=production --with-szlib --enable-cxx
4 changes: 2 additions & 2 deletions recipes/libgeotiff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: libgeotiff
Version: 1.7.1
Version: 1.7.3
Depends: jpeg, tiff, proj (>= 6.0)
Source-URL: https://github.com/OSGeo/libgeotiff/releases/download/${ver}/libgeotiff-${ver}.tar.gz
Source-SHA256: 05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
Source-SHA256: ba23a3a35980ed3de916e125c739251f8e3266be07540200125a307d7cf5a704
7 changes: 4 additions & 3 deletions recipes/proj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Package: proj
Version: 9.1.0
Version: 9.5.1
Depends: pkgconfig, tiff, libpng, jpeg, sqlite3
Source-URL: https://github.com/OSGeo/PROJ/releases/download/${ver}/proj-${ver}.tar.gz
Source-SHA256: 81b2239b94cad0886222cde4f53cb49d34905aad2a1317244a0c30a553db2315
Source-SHA256: a8395f9696338ffd46b0feb603edbb730fad6746fba77753c77f7f997345e3d3
Build-system: cmake
Configure: -DCMAKE_EXE_LINKER_FLAGS="`pkg-config --static --libs libtiff-4`" -DCMAKE_C_FLAGS="`pkg-config --cflags libtiff-4`"
#Note: their CFLAGS/LIBS detection is broken, requires flags to be manually added
Configure: -DCMAKE_EXE_LINKER_FLAGS="`pkg-config --static --libs libtiff-4`" -DCMAKE_C_FLAGS="`pkg-config --cflags libtiff-4`"
10 changes: 7 additions & 3 deletions recipes/sqlite3
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Package: sqlite3
Version: 3.39.3
Source-URL: https://www.sqlite.org/2022/sqlite-autoconf-3390300.tar.gz
Source-SHA256: 7868fb3082be3f2cf4491c6fba6de2bddcbc293a35fefb0624ee3c13f01422b9
Version: 3.48.0
#FWIW: 3.49.0 is broken do NOT upgrade
Source-URL: https://www.sqlite.org/2025/sqlite-autoconf-3480000.tar.gz
Source-SHA256: ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5
#Note: this is needed because their script is broken and fails with standard flags; extra flags from MXE
Configure-script: configure
Configure: --prefix=/${prefix} --disable-shared --enable-static --enable-threadsafe CFLAGS="-fPIC -DSQLITE_ENABLE_COLUMN_METADATA"
10 changes: 10 additions & 0 deletions recipes/sqlite3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff -Nru sqlite-autoconf-3480000-orig/sqlite3.pc.in sqlite-autoconf-3480000-patched/sqlite3.pc.in
--- sqlite-autoconf-3480000-orig/sqlite3.pc.in 2025-01-14 06:22:34.000000000 -0500
+++ sqlite-autoconf-3480000-patched/sqlite3.pc.in 2025-01-20 13:24:09.316242726 -0500
@@ -9,5 +9,5 @@
Description: SQL database engine
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lsqlite3
-Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_ICU@
+Libs.private: @LIBS@
Cflags: -I${includedir}
6 changes: 3 additions & 3 deletions recipes/tiff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: tiff
Version: 4.5.0
Version: 4.7.0
Source-URL: http://download.osgeo.org/libtiff/tiff-${ver}.tar.gz
Source-SHA256: c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464
Depends: jpeg, xz, libwebp
Source-SHA256: 67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976
Depends: jpeg, xz, libwebp, libdeflate, zstd

0 comments on commit 53037b1

Please sign in to comment.