update: GDAL 3.4.2, proj 9.0, proj-data 1.9, sqlite3 3.38.1, entwine 2.2

jef-n · Mar 25, 2022 · da319ad · da319ad
1 parent 6ab5f21
commit da319ad
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 64 deletions.
diff --git a/src/entwine/osgeo4w/package.sh b/src/entwine/osgeo4w/package.sh
@@ -1,5 +1,5 @@
 export P=entwine
-export V=2.1.0
+export V=2.2.0
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS="curl-devel openssl-devel pdal-devel python3-core"
@@ -28,9 +28,10 @@ cmake -Wno-dev -G Ninja \
 	-D BUILD_SHARED_LIBS=ON \
 	-D PYTHON_EXECUTABLE=$(cygpath -am ../osgeo4w/bin/python3.exe) \
 	-D CMAKE_CXX_FLAGS=/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING \
+	-D WITH_TESTS=OFF \
 	../../$P-$V
-ninja
-ninja install
+cmake --build .
+cmake --build . --target install
 
 cd ..
 

diff --git a/src/gdal/osgeo4w/package.sh b/src/gdal/osgeo4w/package.sh
@@ -1,5 +1,5 @@
 export P=gdal
-export V=3.4.1
+export V=3.4.2
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS="python3-core swig zlib-devel proj-devel libpng-devel curl-devel geos-devel libmysql-devel sqlite3-devel netcdf-devel libpq-devel expat-devel xerces-c-devel szip-devel hdf4-devel hdf5-devel ogdi-devel libiconv-devel openjpeg-devel libspatialite-devel freexl-devel libkml-devel xz-devel zstd-devel msodbcsql-devel poppler-devel libwebp-devel oci-devel openfyba-devel freetype-devel python3-devel python3-numpy libjpeg-devel libjpeg12-devel python3-setuptools"

diff --git a/src/liblas/osgeo4w/package.sh b/src/liblas/osgeo4w/package.sh
@@ -10,11 +10,6 @@ startlog
 
 [ -f libLAS-$V.tar.bz2 ] || wget http://download.osgeo.org/$P/libLAS-$V.tar.bz2
 [ -f ../libLAS-$V/CMakeLists.txt ] || tar -C .. -xjf  libLAS-$V.tar.bz2
-[ -f ../libLAS-$V/patched ] || {
-	patch -p1 -d ../libLAS-$V --dry-run <patch
-	patch -p1 -d ../libLAS-$V <patch
-	touch ../libLAS-$V/patched
-}
 
 (
 	fetchenv osgeo4w/bin/o4w_env.bat
@@ -32,8 +27,8 @@ startlog
 		-D BUILD_OSGEO4W=OFF \
 		-D JPEG_LIBRARY=$(cygpath -am ../osgeo4w/lib/jpeg_i.lib) \
 		../../libLAS-$V
-	ninja
-	ninja install
+	cmake --build .
+	cmake --build . --target install
 )
 
 export R=$OSGEO4W_REP/x86_64/release/$P

diff --git a/src/liblas/osgeo4w/patch b/src/liblas/osgeo4w/patch
diff --git a/src/pdal/osgeo4w/package.sh b/src/pdal/osgeo4w/package.sh
@@ -28,8 +28,8 @@ startlog
 		-D CMAKE_BUILD_TYPE=Release \
 		-D CMAKE_INSTALL_PREFIX=../install \
 		../../$P-$V
-	ninja
-	ninja install
+	cmake --build .
+	cmake --build . --target install
 
 	sed -i -e "s#$(cygpath -am ../install)#\$OSGEO4W_ROOT_MSYS#g" -e "s#$(cygpath -am ../osgeo4w)#\$OSGEO4W_ROOT_MSYS#g" ../install/bin/pdal-config
 	sed -i -e "s#$(cygpath -am ../install)#%OSGEO4W_ROOT%#g"      -e "s#$(cygpath -am ../osgeo4w)#%OSGEO4W_ROOT%#g" ../install/bin/pdal-config.bat

diff --git a/src/proj-data/osgeo4w/package.sh b/src/proj-data/osgeo4w/package.sh
@@ -1,5 +1,5 @@
 export P=proj-data
-export V=1.8
+export V=1.9
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS=none

diff --git a/src/proj/osgeo4w/package.sh b/src/proj/osgeo4w/package.sh
@@ -1,5 +1,5 @@
 export P=proj
-export V=8.2.1
+export V=9.0.0
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS="sqlite3-devel libtiff-devel curl-devel"
@@ -39,8 +39,8 @@ cmake -G Ninja \
 	-D BUILD_TESTING=OFF \
 	-D BUILD_SHARED_LIBS=ON \
 	../../$P-${V%RC*}
-ninja
-ninja install
+cmake --build .
+cmake --build . --target install
 
 cd ..
 

diff --git a/src/sqlite3/osgeo4w/package.sh b/src/sqlite3/osgeo4w/package.sh
@@ -1,13 +1,13 @@
 export P=sqlite3
-export V=3.37.2
+export V=3.38.1
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS=none
 
 IFS=. read major minor patch < <(echo $V)
 
 export BASE=$(printf "sqlite-amalgamation-%d%02d%02d00" $major $minor $patch)
-export URL=https://sqlite.org/2022/$BASE.zip
+export URL=https://sqlite.org/$(date +%Y)/$BASE.zip
 
 source ../../../scripts/build-helpers