diff --git a/common/shlibs b/common/shlibs index 0750383d854..695794c63da 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 a114098612c..00000000000 --- 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 d5850fb768f..93d91609904 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