From fdc19358f2478927db844a4c2d23cbd8ded64c04 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 15:13:02 -0800 Subject: [PATCH 1/9] libgdal: update to 3.8.4. --- common/shlibs | 2 +- srcpkgs/libgdal/patches/10-atoll.patch | 34 -------------------------- srcpkgs/libgdal/template | 6 ++--- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch diff --git a/common/shlibs b/common/shlibs index 3cf507d8ada879..f5b32693cae681 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2459,7 +2459,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5 libu2f-server.so.0 libu2f-server-1.1.0_9 libsqlcipher.so.0 sqlcipher-4.3.0_3 libgta.so.1 libgta-1.2.0_1 -libgdal.so.31 libgdal-3.5.3_1 +libgdal.so.34 libgdal-3.8.4_1 libosgViewer.so.161 osg-3.6.5_1 libosgShadow.so.161 osg-3.6.5_1 libosgParticle.so.161 osg-3.6.5_1 diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch deleted file mode 100644 index a114098612c522..00000000000000 --- a/srcpkgs/libgdal/patches/10-atoll.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Holger Jaekel -Summary: musl atoll() doesn't return ERANGE in case of overflow ----- - ---- a/port/cpl_conv.cpp -+++ b/port/cpl_conv.cpp -@@ -1011,8 +1011,6 @@ - #endif - } - --#if defined(__MINGW32__) || defined(__sun__) -- - // mingw atoll() doesn't return ERANGE in case of overflow - static int CPLAtoGIntBigExHasOverflow(const char* pszString, GIntBig nVal) - { -@@ -1035,8 +1033,6 @@ - return strcmp(szBuffer, pszString) != 0; - } - --#endif -- - /************************************************************************/ - /* CPLAtoGIntBigEx() */ - /************************************************************************/ -@@ -1065,9 +1061,7 @@ - GIntBig nVal = atol(pszString); - #endif - if( errno == ERANGE --#if defined(__MINGW32__) || defined(__sun__) - || CPLAtoGIntBigExHasOverflow(pszString, nVal) --#endif - ) - { - if( pbOverflow ) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index d5850fb768f669..93d916099045c0 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal -version=3.5.3 -revision=12 +version=3.8.4 +revision=1 build_style=cmake build_helper=python3 configure_args="-DGDAL_USE_OPENCL=ON @@ -21,7 +21,7 @@ license="MIT" homepage="https://www.gdal.org" changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md" distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890 +checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce python_version=3 if [ -z "$CROSS_BUILD" ]; then From 49cbec795434ea8b618401a62f58c62d7bcd0ef9 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:39:18 -0800 Subject: [PATCH 2/9] libpdal: update to 2.6.3. --- srcpkgs/libpdal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template index e0d517c709ea98..87b9e18b15791b 100644 --- a/srcpkgs/libpdal/template +++ b/srcpkgs/libpdal/template @@ -1,6 +1,6 @@ # Template file for 'libpdal' pkgname=libpdal -version=2.6.2 +version=2.6.3 revision=1 build_style=cmake build_helper="qemu" @@ -13,7 +13,7 @@ maintainer="Arjan Mossel " license="BSD-3-Clause" homepage="https://pdal.io/" distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz" -checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21 +checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75 do_check() { cd build From 6686abc53e0d433f7ae0f5557bf369869002b5f4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:42:40 -0800 Subject: [PATCH 3/9] grass: rebuild for libgdal 3.8 --- srcpkgs/grass/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template index 8910865f17529a..0dc590430d085b 100644 --- a/srcpkgs/grass/template +++ b/srcpkgs/grass/template @@ -1,7 +1,7 @@ # Template file for 'grass' pkgname=grass version=8.3.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--prefix=/usr/lib --enable-shared --without-pdal --with-bzlib --with-nls --with-pthread --with-readline --with-geos From 23c21d104ed19edabce7563fd2dc869de895b4d1 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:43:11 -0800 Subject: [PATCH 4/9] osg: rebuild for libgdal 3.8 --- srcpkgs/osg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index a9ebbd287933bd..8ef0efc599a1b1 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -1,7 +1,7 @@ # Template file for 'osg' pkgname=osg version=3.6.5 -revision=2 +revision=3 build_style=cmake build_helper="qemu" # don't use /usr/lib64 on 64bit platforms From e201cc31923a1a23bf6f06cce803823eea766a3f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:43:48 -0800 Subject: [PATCH 5/9] merkaartor: rebuild for libgdal 3.8 --- srcpkgs/merkaartor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template index c5848acf7d22a2..002a6f5b36c55f 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -1,7 +1,7 @@ # Template file for 'merkaartor' pkgname=merkaartor version=0.19.0 -revision=3 +revision=4 build_style=qmake configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5" hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools" From 02d8909d13aae90ac8c812ccc1506ae93193fc1a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:44:10 -0800 Subject: [PATCH 6/9] OpenOrienteering-Mapper: rebuild for libgdal 3.8 --- srcpkgs/OpenOrienteering-Mapper/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template index 611b9c7237b1ab..f68337dab80a70 100644 --- a/srcpkgs/OpenOrienteering-Mapper/template +++ b/srcpkgs/OpenOrienteering-Mapper/template @@ -1,7 +1,7 @@ # Template file for 'OpenOrienteering-Mapper' pkgname=OpenOrienteering-Mapper version=0.9.5 -revision=3 +revision=4 build_style=cmake hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools" makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel From 78a6794ec90a67f3df334406520f02970370215b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:44:53 -0800 Subject: [PATCH 7/9] postgis-postgresql15: rebuild for libgdal 3.8 --- srcpkgs/postgis-postgresql15/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template index ad5c7cc61bd393..ded20813af09bb 100644 --- a/srcpkgs/postgis-postgresql15/template +++ b/srcpkgs/postgis-postgresql15/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql15' pkgname=postgis-postgresql15 version=3.4.0 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --bindir=/usr/lib/psql15/bin From bdeec86922b7cfec1f096fd5eb78f47424e2e51a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:45:05 -0800 Subject: [PATCH 8/9] postgis-postgresql16: rebuild for libgdal 3.8 --- srcpkgs/postgis-postgresql16/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template index 9d62f16f767e06..765df9d8a2f6b9 100644 --- a/srcpkgs/postgis-postgresql16/template +++ b/srcpkgs/postgis-postgresql16/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql16' pkgname=postgis-postgresql16 version=3.4.0 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --bindir=/usr/lib/psql16/bin From 0f0fb1a064154319b7af7424441c972f9e234737 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 16:45:25 -0800 Subject: [PATCH 9/9] sumo: rebuild for libgdal 3.8 --- srcpkgs/sumo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template index a3fe134aa5acc2..a730afa9fafa92 100644 --- a/srcpkgs/sumo/template +++ b/srcpkgs/sumo/template @@ -1,7 +1,7 @@ # Template file for 'sumo' pkgname=sumo version=1.12.0 -revision=6 +revision=7 build_style=cmake hostmakedepends="libgdal-tools pkg-config swig python3-setuptools" makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel