* Re: [PR PATCH] [Updated] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
@ 2022-10-30 6:22 ` kruceter
2022-10-30 9:04 ` [PR REVIEW] " classabbyamp
` (26 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-10-30 6:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 21115 bytes --]
From 71aaf81ea84990b804e581c7f2c19362cc642430 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/6] libgdal: update to 3.5.2.
---
common/shlibs | 2 +-
srcpkgs/libgdal-python | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 -----
srcpkgs/libgdal/template | 48 +++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 95 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index 7bd563a89134..ae3b96bf5ebf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2502,7 +2502,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.2_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python b/srcpkgs/libgdal-python
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..2b986955b119 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,51 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.2
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON"
+hostmakedepends="pkg-config bison python3-setuptools swig python3-numpy"
+makedepends="python3-devel armadillo-devel freexl-devel c-blosc-devel cfitsio-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel
+ libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel
+ libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2
+subpackages="libgdal-devel libgdal-tools libgdal-python"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
+libgdal-python_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
+ }
+}
+
libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +55,10 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From d70ad81c6088db573fbf86f0c62be90c78e42636 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/6] osg: revbump for libgdal-3.5.2
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
From e2e9cbf338d4bb109e154c0dedfbd7546b0b6789 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/6] postgis-postgresql14: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 4114570329d797000424f7c2e3dfa931aa11c416 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/6] postgis-postgresql13: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From f779b3e5a83274ff97204976544494c3c16e35c4 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/6] OpenOrienteering-Mapper: revbump for libgdal-3.5.2
---
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 fd29a08e75b6..06181bd1f8a7 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
From f7877855dd81495b5febe8695b01c884ec27f4ed Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/6] grass: revbump for libgdal-3.5.2, fix build
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 2 +-
2 files changed, 158 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..0296cb13d7f1 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR REVIEW] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
2022-10-30 6:22 ` [PR PATCH] [Updated] " kruceter
@ 2022-10-30 9:04 ` classabbyamp
2022-10-30 9:04 ` classabbyamp
` (25 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2022-10-30 9:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#discussion_r1008816917
Comment:
https://grasswiki.osgeo.org/wiki/Compile_and_Install seems to indicate it's possible to use python 3. can we try moving to it?
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR REVIEW] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
2022-10-30 6:22 ` [PR PATCH] [Updated] " kruceter
2022-10-30 9:04 ` [PR REVIEW] " classabbyamp
@ 2022-10-30 9:04 ` classabbyamp
2022-10-30 18:09 ` [PR PATCH] [Updated] " kruceter
` (24 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2022-10-30 9:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#discussion_r1008815854
Comment:
```suggestion
libgdal-python3_package() {
```
and change the subpkg short desc and symlink
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (2 preceding siblings ...)
2022-10-30 9:04 ` classabbyamp
@ 2022-10-30 18:09 ` kruceter
2022-10-30 18:12 ` [PR REVIEW] " kruceter
` (23 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-10-30 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 22464 bytes --]
From e7059dc9430028365b1650412af7ef4058140609 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/6] libgdal: update to 3.5.2.
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 -----
srcpkgs/libgdal/template | 48 +++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 95 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index 7bd563a89134..ae3b96bf5ebf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2502,7 +2502,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.2_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..37bd80534d59 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,51 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.2
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON"
+hostmakedepends="pkg-config bison python3-setuptools swig python3-numpy"
+makedepends="python3-devel armadillo-devel freexl-devel c-blosc-devel cfitsio-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel
+ libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel
+ libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
+ }
+}
+
libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +55,10 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 8618fbd7268ee2154cd399c02392a862c81a5655 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/6] osg: revbump for libgdal-3.5.2
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From 04e263040b73d6edb9fd7a222c86fbfc98a0103a Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/6] postgis-postgresql14: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From cc932f2cef8fff0ec21d9859d8d49bcbbc0c91ba Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/6] postgis-postgresql13: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 6171ded7ebd34f1144ff088b16499f488b5b205f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/6] OpenOrienteering-Mapper: revbump for libgdal-3.5.2
---
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 fd29a08e75b6..06181bd1f8a7 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
From 3d7face4726e6e9c96c5cb869198f2ca5ecf6474 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/6] grass: revbump for libgdal-3.5.2, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR REVIEW] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (3 preceding siblings ...)
2022-10-30 18:09 ` [PR PATCH] [Updated] " kruceter
@ 2022-10-30 18:12 ` kruceter
2022-10-31 1:37 ` kruceter
` (22 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-10-30 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#discussion_r1008905840
Comment:
I already have a draft template for this package, yet the outcome proved to be challenging.
I will try to update grass and include it in this pull request instead of the bumped one.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR REVIEW] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (4 preceding siblings ...)
2022-10-30 18:12 ` [PR REVIEW] " kruceter
@ 2022-10-31 1:37 ` kruceter
2022-10-31 1:57 ` classabbyamp
` (21 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-10-31 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#discussion_r1008969231
Comment:
@classabbyamp, I could update it to 8.2.0 (did not crosscompile yet), but apparently it hangs with wxPython4 (`ToolBar.AddTool(): arguments did not match any overloaded call: ...`), rendering grass inoperable.
According to https://github.com/OSGeo/grass/issues/2019, this can be solved by updating wxPython4 to the newer version, but here the old version of wxWidgets itself (3.0.5 vs. 3.2.1) makes its appearance:
```
In file included from ../../../../sip/cpp/sip_corewxZoomGestureEvent.cpp:10:
../../../../sip/cpp/sipAPI_core.h:22411:10: fatal error: wx/collheaderctrl.h: No such file or directory
22411 | #include <wx/collheaderctrl.h>
| ^~~~~~~~~~~~~~~~~~~~~
compilation terminated.
```
Given how many packages depend on wxWidgets, I suspect that it must be updated in a separate PR along with its reverse dependencies.
Is there a course of action you would recommend?
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR REVIEW] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (5 preceding siblings ...)
2022-10-31 1:37 ` kruceter
@ 2022-10-31 1:57 ` classabbyamp
2022-10-31 12:51 ` [PR PATCH] [Updated] " kruceter
` (20 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2022-10-31 1:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#discussion_r1008974905
Comment:
i think it's fine to leave updating grass to py3 alone for now, just the bump is fine. it's evident that it's a much bigger project than just switching out deps. just that you're working on it is enough for me :)
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (6 preceding siblings ...)
2022-10-31 1:57 ` classabbyamp
@ 2022-10-31 12:51 ` kruceter
2022-10-31 12:55 ` kruceter
` (19 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-10-31 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 23491 bytes --]
From 41021884956876c60d32ff9c511922125e68a7d3 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/6] libgdal: update to 3.5.2.
cmake does not find python3-devel's headers in $XBPS_CROSS_BASE nor
/usr from masterdir.
Despite that factor, the package successfully builds with
python3-devel assigned to hostmakedepends.
armadillo-devel does seem to get disabled in crossbuilds because of
failing test during the configuration phase:
-- Performing Test ARMADILLO_TEST_PROGRAM_WITH_LAPACK_COMPILES - Failed
CMake Warning at cmake/helpers/CheckDependentLibraries.cmake:588 (message):
Armadillo found, but test program does not build. Disabling it.
Call Stack (most recent call first):
gdal.cmake:254 (include)
CMakeLists.txt:218 (include)
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 -----
srcpkgs/libgdal/template | 48 +++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 95 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index 7bd563a89134..ae3b96bf5ebf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2502,7 +2502,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.2_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..780f1ffff09f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,51 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.2
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON"
+hostmakedepends="pkg-config bison swig python3-numpy python3-devel"
+makedepends="armadillo-devel freexl-devel c-blosc-devel cfitsio-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel
+ libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel
+ libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
+ }
+}
+
libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +55,10 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 5e11377ddfd29a6f0349cd8102c420ab3b2b0469 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/6] osg: revbump for libgdal-3.5.2
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From ff8ff42b229cc98c3239fd57e53f4d69bd58e5be Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/6] postgis-postgresql14: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From feceed788330df9b699b5bfaed2754b048966027 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/6] postgis-postgresql13: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 23f8d6cfa447277809ffc7c9cc72a16b30d41ca1 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/6] OpenOrienteering-Mapper: revbump for libgdal-3.5.2
---
srcpkgs/OpenOrienteering-Mapper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..afdd0cbb0a7b 100644
--- a/srcpkgs/OpenOrienteering-Mapper/template
+++ b/srcpkgs/OpenOrienteering-Mapper/template
@@ -1,13 +1,13 @@
# Template file for 'OpenOrienteering-Mapper'
pkgname=OpenOrienteering-Mapper
version=0.9.5
-revision=1
+revision=2
wrksrc="mapper-${version}"
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
qt5-tools-devel sqlite-devel cups-devel $(vopt_if location qt5-location-devel)
- $(vopt_if sensors qt5-sensors-devel)
+ qt5-serialbus-devel $(vopt_if sensors qt5-sensors-devel)
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
short_desc="Orienteering mapmaking program"
maintainer="John <me@johnnynator.dev>"
From b80df42cc4beaf57211ab703ffc808bb6f54488b Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/6] grass: revbump for libgdal-3.5.2, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (7 preceding siblings ...)
2022-10-31 12:51 ` [PR PATCH] [Updated] " kruceter
@ 2022-10-31 12:55 ` kruceter
2022-11-01 6:06 ` kruceter
` (18 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-10-31 12:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 23561 bytes --]
From 41021884956876c60d32ff9c511922125e68a7d3 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/6] libgdal: update to 3.5.2.
cmake does not find python3-devel's headers in $XBPS_CROSS_BASE nor
/usr from masterdir.
Despite that factor, the package successfully builds with
python3-devel assigned to hostmakedepends.
armadillo-devel does seem to get disabled in crossbuilds because of
failing test during the configuration phase:
-- Performing Test ARMADILLO_TEST_PROGRAM_WITH_LAPACK_COMPILES - Failed
CMake Warning at cmake/helpers/CheckDependentLibraries.cmake:588 (message):
Armadillo found, but test program does not build. Disabling it.
Call Stack (most recent call first):
gdal.cmake:254 (include)
CMakeLists.txt:218 (include)
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 -----
srcpkgs/libgdal/template | 48 +++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 95 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index 7bd563a89134..ae3b96bf5ebf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2502,7 +2502,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.2_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..780f1ffff09f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,51 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.2
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON"
+hostmakedepends="pkg-config bison swig python3-numpy python3-devel"
+makedepends="armadillo-devel freexl-devel c-blosc-devel cfitsio-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel
+ libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel
+ libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
+ }
+}
+
libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +55,10 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 5e11377ddfd29a6f0349cd8102c420ab3b2b0469 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/6] osg: revbump for libgdal-3.5.2
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From ff8ff42b229cc98c3239fd57e53f4d69bd58e5be Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/6] postgis-postgresql14: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From feceed788330df9b699b5bfaed2754b048966027 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/6] postgis-postgresql13: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 5d13ae46d63c8ba44be9f8b1b9d14afcb05e8564 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/6] OpenOrienteering-Mapper: revbump for libgdal-3.5.2
qt5-serialbus-devel was added due to failing test related to
sensors.
---
srcpkgs/OpenOrienteering-Mapper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..afdd0cbb0a7b 100644
--- a/srcpkgs/OpenOrienteering-Mapper/template
+++ b/srcpkgs/OpenOrienteering-Mapper/template
@@ -1,13 +1,13 @@
# Template file for 'OpenOrienteering-Mapper'
pkgname=OpenOrienteering-Mapper
version=0.9.5
-revision=1
+revision=2
wrksrc="mapper-${version}"
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
qt5-tools-devel sqlite-devel cups-devel $(vopt_if location qt5-location-devel)
- $(vopt_if sensors qt5-sensors-devel)
+ qt5-serialbus-devel $(vopt_if sensors qt5-sensors-devel)
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
short_desc="Orienteering mapmaking program"
maintainer="John <me@johnnynator.dev>"
From 9fbe45469dd84307ab5d14a95b4582046639b37e Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/6] grass: revbump for libgdal-3.5.2, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (8 preceding siblings ...)
2022-10-31 12:55 ` kruceter
@ 2022-11-01 6:06 ` kruceter
2022-11-01 6:32 ` kruceter
` (17 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-01 6:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
#### Issues
The following problems persist at present time:
* cmake does not find python3-devel's headers when crossbuilding; it can build successfully provided that this dependency is present in `hostmakedepends` regardless of what cmake has to output.
* armadillo-devel gets disabled in crossbuilds due to failing tests in the configure phase. Its headers are present in `$XBPS_CROSS_BASE` (even cmake recognizes them). Attempts to remove tests for this library lead to gcc complaining about non-existent header files (if I remember correctly) as the result.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 23767 bytes --]
From ecd7408cd2c24565acdfdb9b340f9a18170fb28f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/6] libgdal: update to 3.5.2.
cmake does not find python3-devel's headers in $XBPS_CROSS_BASE nor
/usr from masterdir.
Despite that factor, the package successfully builds with
python3-devel assigned to hostmakedepends.
armadillo-devel does seem to get disabled in crossbuilds because of
failing test during the configuration phase:
-- Performing Test ARMADILLO_TEST_PROGRAM_WITH_LAPACK_COMPILES - Failed
CMake Warning at cmake/helpers/CheckDependentLibraries.cmake:588 (message):
Armadillo found, but test program does not build. Disabling it.
Call Stack (most recent call first):
gdal.cmake:254 (include)
CMakeLists.txt:218 (include)
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 -----
srcpkgs/libgdal/template | 48 +++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 95 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..d6f19ad9d202 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2508,7 +2508,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.2_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..780f1ffff09f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,51 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.2
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON"
+hostmakedepends="pkg-config bison swig python3-numpy python3-devel"
+makedepends="armadillo-devel freexl-devel c-blosc-devel cfitsio-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel
+ libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel
+ libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
+ }
+}
+
libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +55,10 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 27a7f6bcc7bba028931a917251547dc69bacb362 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/6] osg: revbump for libgdal-3.5.2
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From c6ef3e119ca76181e5ae73c36382b95d584b78f7 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/6] postgis-postgresql14: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From c3c2980e272771b46c15508efd2635e1e7907e29 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/6] postgis-postgresql13: revbump for libgdal-3.5.2
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From cc09bbbb104abdaae92d77a42e66a6b2cf4f789c Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/6] OpenOrienteering-Mapper: revbump for libgdal-3.5.2,
disable checks
Checks are disabled due to the failing "sensor" test.
---
srcpkgs/OpenOrienteering-Mapper/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..e8775bb517fc 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
@@ -15,6 +15,11 @@ license="GPL-3.0-or-later"
homepage="https://www.openorienteering.org/apps/mapper/"
distfiles="https://github.com/OpenOrienteering/mapper/archive/v${version}.tar.gz"
checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00
+# FAIL! : SensorsTest::nmeaPositionSourceSimulatedTest() Compared values are not the same
+# Actual (int(source->error())) : 3
+# Expected (int(QGeoPositionInfoSource::AccessError)): 0
+# Loc: [/builddir/mapper-0.9.5/test/sensors_t.cpp(150)]
+make_check=no
build_options="location sensors"
build_options_default="location sensors"
From a227e430ffb8c850497bb3f4d23783bade8752f0 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/6] grass: revbump for libgdal-3.5.2, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (9 preceding siblings ...)
2022-11-01 6:06 ` kruceter
@ 2022-11-01 6:32 ` kruceter
2022-11-01 6:33 ` kruceter
` (16 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-01 6:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1835 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1298086936
Comment:
CI builds indicate that OpenOrienteering-Mapper fails "sensor" test.
My attempts to "dig" into the issue itself brought more problems,
leading to the failing pre-build test on my side.
```
-- CMAKE_CXX_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -Wall -Wpedantic -Wextra
-- CMAKE_CXX_FLAGS_NONE:
-- CMAKE_C_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -std=c99 -Wall -Wpedantic
-- CMAKE_C_FLAGS_NONE:
-- Configuring done
CMake Error: AUTOMOC for target cove: Test run of "moc" executable "/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc" failed.
/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc -h
No such file or directory
CMake Generate step failed. Build files cannot be regenerated correctly.
=> ERROR: OpenOrienteering-Mapper-0.9.5_2: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR: in do_configure() at common/build-style/cmake.sh:75
```
`chroot`ing into masterdir/usr/x86_64-linux-gnu and ensuring that the
"failing" binary executes correctly convince me that the problem might
be with laying my setup, although I am not sure what exactly is wrong.
Since I do not believe that I can solve it myself, I disabled checks
for the time being to see what other issues the CI builder may show.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (10 preceding siblings ...)
2022-11-01 6:32 ` kruceter
@ 2022-11-01 6:33 ` kruceter
2022-11-01 6:34 ` [PR REVIEW] " classabbyamp
` (15 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-01 6:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1835 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1298086936
Comment:
CI builds indicate that OpenOrienteering-Mapper fails "sensor" test.
My attempts to "dig" into the issue itself brought more problems,
leading to the failing pre-build test on my side.
```
-- CMAKE_CXX_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -Wall -Wpedantic -Wextra
-- CMAKE_CXX_FLAGS_NONE:
-- CMAKE_C_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -std=c99 -Wall -Wpedantic
-- CMAKE_C_FLAGS_NONE:
-- Configuring done
CMake Error: AUTOMOC for target cove: Test run of "moc" executable "/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc" failed.
/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc -h
No such file or directory
CMake Generate step failed. Build files cannot be regenerated correctly.
=> ERROR: OpenOrienteering-Mapper-0.9.5_2: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR: in do_configure() at common/build-style/cmake.sh:75
```
`chroot`ing into masterdir/usr/x86_64-linux-gnu and ensuring that the
"failing" binary executes correctly convince me that the problem might
be laying with my setup, although I am not sure what exactly is wrong.
Since I do not believe that I can solve it myself, I disabled checks
for the time being to see what other issues the CI builder may show.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR REVIEW] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (11 preceding siblings ...)
2022-11-01 6:33 ` kruceter
@ 2022-11-01 6:34 ` classabbyamp
2022-11-01 7:15 ` kruceter
` (14 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2022-11-01 6:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2404 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#discussion_r1010111716
Comment:
just for fun, I had a go at updating grass:
```patch
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a81..98b733528b 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,30 @@
# Template file for 'grass'
pkgname=grass
-version=7.6.1
-revision=4
+version=8.2.0
+revision=1
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
-configure_args="--prefix=\${DESTDIR}/usr/share --bindir=\${DESTDIR}/usr/bin
+configure_args="--prefix=/usr/share --bindir=/usr/bin
--with-freetype-includes=${XBPS_CROSS_BASE}/usr/include/freetype2"
-hostmakedepends="flex libgdal-tools pkg-config python-numpy tar"
+hostmakedepends="flex libgdal-tools pkg-config python3-numpy tar"
makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel
- fftw-devel cairo-devel glu-devel wxPython-devel"
-depends="python-numpy wxPython"
+ fftw-devel cairo-devel glu-devel wxPython4 python3-six"
+depends="python3-numpy wxPython4 python3-six"
short_desc="Geographic Resources Analysis Support System - GIS"
maintainer="Alex Jarosch <research@alexj.at>"
license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
-checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+checksum=621c3304a563be19c0220ae28f931a5e9ba74a53218c5556cd3f7fbfcca33a80
+python_version=3
nocross="tries to execute target binaries"
post_install() {
- # move grass76 libraries from /usr/share to /usr/lib
+ # move grass libraries from /usr/share to /usr/lib
vmkdir usr/lib
- mv ${DESTDIR}/usr/share/grass* ${DESTDIR}/usr/lib
+ mv ${DESTDIR}/usr/share/grass${_binver} ${DESTDIR}/usr/lib
# fixes a todo in GISBASE
- sed -i ${DESTDIR}/usr/bin/grass${_binver} \
- -e "105s;\(gisbase =\).*;\1 \"/usr/lib/grass-${version}\";"
+ sed -i ${DESTDIR}/usr/bin/grass \
+ -e "91s;\(GISBASE =\).*;\1 \'/usr/lib/grass${_binver}\';"
}
```
seems to compile fine (there were some errors in the log but idk it still builds), **however** it does not run because we need at least wxPython4.1, it seems 🙃 (https://github.com/OSGeo/grass/issues/2019)
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (12 preceding siblings ...)
2022-11-01 6:34 ` [PR REVIEW] " classabbyamp
@ 2022-11-01 7:15 ` kruceter
2022-11-01 11:14 ` kruceter
` (13 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-01 7:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1298086936
Comment:
CI builds indicate that OpenOrienteering-Mapper fails "sensor" test.
My attempts to "dig" into the issue itself brought more problems,
leading to the failing pre-build test on my side.
```
-- CMAKE_CXX_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -Wall -Wpedantic -Wextra
-- CMAKE_CXX_FLAGS_NONE:
-- CMAKE_C_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -std=c99 -Wall -Wpedantic
-- CMAKE_C_FLAGS_NONE:
-- Configuring done
CMake Error: AUTOMOC for target cove: Test run of "moc" executable "/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc" failed.
/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc -h
No such file or directory
CMake Generate step failed. Build files cannot be regenerated correctly.
=> ERROR: OpenOrienteering-Mapper-0.9.5_2: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR: in do_configure() at common/build-style/cmake.sh:75
```
`chroot`ing into masterdir/usr/x86_64-linux-gnu and ensuring that the
"failing" binary executes correctly convince me that the problem might
be laying with my setup, although I am not sure what exactly is wrong.
Since I do not believe that I can solve it myself, I have disabled checks
for the time being to see what other issues the CI builder may show.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (13 preceding siblings ...)
2022-11-01 7:15 ` kruceter
@ 2022-11-01 11:14 ` kruceter
2022-11-01 11:35 ` [PR PATCH] [Updated] " kruceter
` (12 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-01 11:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 677 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1298369581
Comment:
@classabbyamp, libgdal seems to refuse to build with armv6l (`error: static assertion failed: OFF_T should be 64 bits !`).
Comparing the source code of 3.0.4 and 3.5.2 (frmts/fits/fitsdataset.cpp), there was no such assertion in the old version.
Am I right to assume that this package and its reverse dependencies should be limited to aarch64*, i686*, and x86_64 since it cannot be built for 32-bit processors explicitly?
The same cannot be said of armv7l, but `unrecognized -mtune target: generic` ruined the building phase.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.2
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (14 preceding siblings ...)
2022-11-01 11:14 ` kruceter
@ 2022-11-01 11:35 ` kruceter
2022-11-01 17:59 ` [PR PATCH] [Updated] libgdal: update to 3.5.3 kruceter
` (11 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-01 11:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
#### Issues
The following problems persist at present time:
* cmake does not find python3-devel's headers when crossbuilding; it can build successfully provided that this dependency is present in `hostmakedepends` regardless of what cmake has to output.
* armadillo-devel gets disabled in crossbuilds due to failing tests in the configure phase. Its headers are present in `$XBPS_CROSS_BASE` (even cmake recognizes them). Attempts to remove tests for this library lead to gcc complaining about non-existent header files (if I remember correctly) as the result.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 24748 bytes --]
From 247dcaf86868eac587b56f10a9fe18414ab0123c Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/8] libgdal: update to 3.5.3.
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 -----
srcpkgs/libgdal/template | 51 ++++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 98 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..031d347a1778 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2508,7 +2508,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.3_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..9246325b2dd1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,54 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+# armv7l-musl: "unrecognized -mtune target: generic"
+# armv6l-musl: "error: static assertion failed: OFF_T should be 64 bits !"
+#archs="x86_64* i686* aarch64*"
+version=3.5.3
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON"
+hostmakedepends="pkg-config bison swig python3-numpy python3-devel"
+makedepends="armadillo-devel freexl-devel c-blosc-devel cfitsio-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel
+ libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel
+ libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
+ }
+}
+
libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +58,10 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 1cedc641c3b52d0196d0b1dab5c81460205fd18f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/8] osg: revbump for libgdal-3.5.3
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From 0a351a47f94c4dc57cab7535921a3a18c27b9f19 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/8] postgis-postgresql14: revbump for libgdal-3.5.3
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 465bd293209f4961d25a8216de761090608c0aa5 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/8] postgis-postgresql13: revbump for libgdal-3.5.3
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From d7283eff899376c99932684de5f41bc43c750ba5 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/8] OpenOrienteering-Mapper: revbump for libgdal-3.5.3,
disable checks
Checks have been disabled due to the failing "sensor" test.
---
srcpkgs/OpenOrienteering-Mapper/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..e8775bb517fc 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
@@ -15,6 +15,11 @@ license="GPL-3.0-or-later"
homepage="https://www.openorienteering.org/apps/mapper/"
distfiles="https://github.com/OpenOrienteering/mapper/archive/v${version}.tar.gz"
checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00
+# FAIL! : SensorsTest::nmeaPositionSourceSimulatedTest() Compared values are not the same
+# Actual (int(source->error())) : 3
+# Expected (int(QGeoPositionInfoSource::AccessError)): 0
+# Loc: [/builddir/mapper-0.9.5/test/sensors_t.cpp(150)]
+make_check=no
build_options="location sensors"
build_options_default="location sensors"
From aee817bd46567ab2fcb14e0f35ac4d081ef7d651 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/8] grass: revbump for libgdal-3.5.3, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
From 8cf856efed70da1b9c26457a0872327c7273c4a8 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:01 +0300
Subject: [PATCH 7/8] merkaartor: revbump for libgdal-3.5.3
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index cffcfba1cf01..6603376111f2 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=1
+revision=2
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 91e92e3f04e7ab2bb78d916c2373931f16c60e0c Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:59 +0300
Subject: [PATCH 8/8] sumo: revbump for libgdal-3.5.3
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (15 preceding siblings ...)
2022-11-01 11:35 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-01 17:59 ` kruceter
2022-11-02 13:29 ` kruceter
` (10 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-01 17:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
#### Issues
The following problems persist at present time:
* cmake does not find python3-devel's headers when crossbuilding; it can build successfully provided that this dependency is present in `hostmakedepends` regardless of what cmake has to output.
* armadillo-devel gets disabled in crossbuilds due to failing tests in the configure phase. Its headers are present in `$XBPS_CROSS_BASE` (even cmake recognizes them). Attempts to remove tests for this library lead to gcc complaining about non-existent header files (if I remember correctly) as the result.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 24587 bytes --]
From 7658308ba3f7abaf81f068b998a3b8f215e5f810 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/8] libgdal: update to 3.5.3.
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 -----
srcpkgs/libgdal/template | 52 ++++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 99 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..031d347a1778 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2508,7 +2508,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.3_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..3269aa4e4750 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,29 +1,38 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+# armv7l-musl: "unrecognized -mtune target: generic"
+# armv6l-musl: "error: static assertion failed: OFF_T should be 64 bits !"
+#archs="~armv6l-* ~armv7l-*"
+version=3.5.3
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+build_helper=python3
+configure_args="-DGDAL_USE_OPENCL=ON"
+hostmakedepends="pkg-config bison swig python3-numpy"
+makedepends="python3-devel armadillo-devel freexl-devel c-blosc-devel cfitsio-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel
+ libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel
+ libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
@@ -31,6 +40,8 @@ libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +51,18 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
+
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 0706a8dacbcd7f7d2fab553ef1e2c7244baf1cd7 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/8] osg: revbump for libgdal
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From 8749032d4f8ab935e0d7c326b2d2c79deb5f85cf Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/8] postgis-postgresql14: revbump for libgdal
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 9f6fe6deefa1af752aa47c50117c0b00dfd0512e Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/8] postgis-postgresql13: revbump for libgdal
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 5c46f6fe3a83407ff901cf03764a6f8a67d38dda Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/8] OpenOrienteering-Mapper: revbump for libgdal, disable the
sensors check
---
srcpkgs/OpenOrienteering-Mapper/template | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..fe114ce24e8e 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
@@ -18,3 +18,13 @@ checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00
build_options="location sensors"
build_options_default="location sensors"
+
+do_check() {
+ cd build
+
+ # FAIL! : SensorsTest::nmeaPositionSourceSimulatedTest() Compared values are not the same
+ # Actual (int(source->error())) : 3
+ # Expected (int(QGeoPositionInfoSource::AccessError)): 0
+ # Loc: [/builddir/mapper-0.9.5/test/sensors_t.cpp(150)]
+ ctest -E 'sensors_t'
+}
From 7942d76621487272340c60c796cb66230d9caffe Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/8] grass: revbump for libgdal, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
From 3852514ff82a0226fb98d6cb37d9bb82a2c7afe8 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:01 +0300
Subject: [PATCH 7/8] merkaartor: revbump for libgdal
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index cffcfba1cf01..6603376111f2 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=1
+revision=2
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From e343a799cb935f3c7363a8fe713d5b97bb95b7e2 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:59 +0300
Subject: [PATCH 8/8] sumo: revbump for libgdal
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (16 preceding siblings ...)
2022-11-01 17:59 ` [PR PATCH] [Updated] libgdal: update to 3.5.3 kruceter
@ 2022-11-02 13:29 ` kruceter
2022-11-03 7:11 ` kruceter
` (9 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-02 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
#### Issues
The following problems persist at present time:
* cmake does not find python3-devel's headers when crossbuilding; it can build successfully provided that this dependency is present in `hostmakedepends` regardless of what cmake has to output.
* armadillo-devel gets disabled in crossbuilds due to failing tests in the configure phase. Its headers are present in `$XBPS_CROSS_BASE` (even cmake recognizes them). Attempts to remove tests for this library lead to gcc complaining about non-existent header files (if I remember correctly) as the result.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 24618 bytes --]
From 9c58de17425f93d7a0edb6eed40211be984dc3a0 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/8] libgdal: update to 3.5.3.
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 ------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 ----
srcpkgs/libgdal/template | 55 +++++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 102 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..031d347a1778 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2508,7 +2508,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.3_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..f92be665ae6e 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,29 +1,41 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.3
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON
+ -DPython_NumPy_INCLUDE_DIR=/${py3_sitelib}/numpy/core/include/numpy"
+hostmakedepends="pkg-config bison swig python3-numpy"
+makedepends="python3-devel armadillo-devel freexl-devel c-blosc-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel libcurl-devel
+ libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel libqhull-devel
+ libwebp-devel libxml2-devel liblzma-devel zlib-devel libzstd-devel
+ libdeflate-devel netcdf-devel opencl2-headers pcre2-devel proj-devel
+ sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
+case "$XBPS_TARGET_MACHINE" in
+ # "error: static assertion failed: OFF_T should be 64 bits !"
+ armv6l-*) ;;
+ *) makedepends+=" cfitsio-devel" ;;
+esac
+
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
@@ -31,6 +43,8 @@ libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +54,18 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
+
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 65c335098ebe411df1de026fd7615b2b8aa6f5c4 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/8] osg: revbump for libgdal
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From 6aa630188b87c5b907a36f62d2e11208bd8f04fd Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/8] postgis-postgresql14: revbump for libgdal
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 11a761fed35fe0559b6946925eccdaa7bd928acd Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/8] postgis-postgresql13: revbump for libgdal
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From d4bc2e20cf3881df8348f10e03878281b1070ef1 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/8] OpenOrienteering-Mapper: revbump for libgdal, disable the
sensors check
---
srcpkgs/OpenOrienteering-Mapper/template | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..fe114ce24e8e 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
@@ -18,3 +18,13 @@ checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00
build_options="location sensors"
build_options_default="location sensors"
+
+do_check() {
+ cd build
+
+ # FAIL! : SensorsTest::nmeaPositionSourceSimulatedTest() Compared values are not the same
+ # Actual (int(source->error())) : 3
+ # Expected (int(QGeoPositionInfoSource::AccessError)): 0
+ # Loc: [/builddir/mapper-0.9.5/test/sensors_t.cpp(150)]
+ ctest -E 'sensors_t'
+}
From a5d7d30db91ff5b02a4951938e3b57174cffbf06 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/8] grass: revbump for libgdal, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
From bd953d1c745a0dfe954ffc3426dc62fa52eaae61 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:01 +0300
Subject: [PATCH 7/8] merkaartor: revbump for libgdal
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index cffcfba1cf01..6603376111f2 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=1
+revision=2
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From e5740793b9da4a86cae2ab92be48eee83450fbac Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:59 +0300
Subject: [PATCH 8/8] sumo: revbump for libgdal
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (17 preceding siblings ...)
2022-11-02 13:29 ` kruceter
@ 2022-11-03 7:11 ` kruceter
2022-11-03 8:01 ` kruceter
` (8 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-03 7:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
#### Issues
The following problems persist at present time:
* cmake does not find python3-devel's headers when crossbuilding; it can build successfully provided that this dependency is present in `hostmakedepends` regardless of what cmake has to output.
* armadillo-devel gets disabled in crossbuilds due to failing tests in the configure phase. Its headers are present in `$XBPS_CROSS_BASE` (even cmake recognizes them). Attempts to remove tests for this library lead to gcc complaining about non-existent header files (if I remember correctly) as the result.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 24632 bytes --]
From 9c58de17425f93d7a0edb6eed40211be984dc3a0 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/8] libgdal: update to 3.5.3.
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 ------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/patches/missing-include.patch | 12 ----
srcpkgs/libgdal/template | 55 +++++++++++++------
srcpkgs/libgdal/update | 2 +-
10 files changed, 102 insertions(+), 114 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..031d347a1778 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2508,7 +2508,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.3_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..f92be665ae6e 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,29 +1,41 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.3
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+configure_args="-DGDAL_USE_OPENCL=ON
+ -DPython_NumPy_INCLUDE_DIR=/${py3_sitelib}/numpy/core/include/numpy"
+hostmakedepends="pkg-config bison swig python3-numpy"
+makedepends="python3-devel armadillo-devel freexl-devel c-blosc-devel
+ geos-devel expat-devel jasper-devel giflib-devel json-c-devel libcurl-devel
+ libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel libqhull-devel
+ libwebp-devel libxml2-devel liblzma-devel zlib-devel libzstd-devel
+ libdeflate-devel netcdf-devel opencl2-headers pcre2-devel proj-devel
+ sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
+case "$XBPS_TARGET_MACHINE" in
+ # "error: static assertion failed: OFF_T should be 64 bits !"
+ armv6l-*) ;;
+ *) makedepends+=" cfitsio-devel" ;;
+esac
+
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
@@ -31,6 +43,8 @@ libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +54,18 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
+
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From a8df2ee10333d1bd0a751918266d9058d34898bc Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/8] osg: revbump for libgdal-devel
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From ea866150493899f467b29ad199bf901e62d6332a Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/8] postgis-postgresql14: revbump for libgdal-devel
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From ea8d6ce4840725bac9e190d90c640ada8901c59f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/8] postgis-postgresql13: revbump for libgdal-devel
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 9db0887468ab9dd4c3d6a68dd3d26709a70d02b3 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/8] OpenOrienteering-Mapper: revbump for libgdal-devel
---
srcpkgs/OpenOrienteering-Mapper/template | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..fe114ce24e8e 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
@@ -18,3 +18,13 @@ checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00
build_options="location sensors"
build_options_default="location sensors"
+
+do_check() {
+ cd build
+
+ # FAIL! : SensorsTest::nmeaPositionSourceSimulatedTest() Compared values are not the same
+ # Actual (int(source->error())) : 3
+ # Expected (int(QGeoPositionInfoSource::AccessError)): 0
+ # Loc: [/builddir/mapper-0.9.5/test/sensors_t.cpp(150)]
+ ctest -E 'sensors_t'
+}
From 5c3b459e8169b8dc2a69e73449debd08794f1eda Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/8] grass: revbump for libgdal-devel, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
From fabac8f4fd69a0b959cccd4bf1ddfeb4ba8a7b32 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:01 +0300
Subject: [PATCH 7/8] merkaartor: revbump for libgdal-devel
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index cffcfba1cf01..6603376111f2 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=1
+revision=2
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From bb91df9443cb2e001bd212a8216a0efb4c91c7e1 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:59 +0300
Subject: [PATCH 8/8] sumo: revbump for libgdal-devel
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (18 preceding siblings ...)
2022-11-03 7:11 ` kruceter
@ 2022-11-03 8:01 ` kruceter
2022-11-03 20:34 ` [PR PATCH] [Updated] " kruceter
` (7 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-03 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1298369581
Comment:
@classabbyamp, libgdal seems to refuse to build with armv6l (`error: static assertion failed: OFF_T should be 64 bits !`).
Comparing the source code of 3.0.4 and 3.5.2 (frmts/fits/fitsdataset.cpp), there was no such assertion in the old version.
~Am I right to assume that this package and its reverse dependencies should be limited to aarch64*, i686*, and x86_64 since it cannot be built for 32-bit processors explicitly?~
The same cannot be said of armv7l, but `unrecognized -mtune target: generic` ruined the building phase.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (19 preceding siblings ...)
2022-11-03 8:01 ` kruceter
@ 2022-11-03 20:34 ` kruceter
2022-11-03 20:40 ` kruceter
` (6 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-03 20:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 932 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages libgdal
https://github.com/void-linux/void-packages/pull/40225
libgdal: update to 3.5.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
#### Issues
The following problems persist at present time:
* compilers for armv6l-musl and armv7l-musl occassionally refuse to build files due to `unrecognized -mtune target: generic` and other related errors.
While the latter architecture manages to pull through, the former one dies on moving python 3 bindings because they did not compile(?) properly.
A patch file from https://github.com/void-linux/void-packages/pull/40225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-40225.patch --]
[-- Type: text/x-diff, Size: 26200 bytes --]
From a1badcb10ab4cb418e54b8bc7b8026fdd6aafa8d Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:35:32 +0300
Subject: [PATCH 1/8] libgdal: update to 3.5.3.
---
common/shlibs | 2 +-
srcpkgs/libgdal-python3 | 1 +
srcpkgs/libgdal/patches/10-atoll.patch | 34 +++++++++++
.../patches/20-userfaultfd-detection.patch | 13 +++++
srcpkgs/libgdal/patches/30-license.patch | 13 +++++
.../libgdal/patches/40-fix-setup-py-cc.patch | 19 +++++++
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -----------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 ----------
srcpkgs/libgdal/patches/missing-include.patch | 12 ----
srcpkgs/libgdal/template | 57 +++++++++++++------
srcpkgs/libgdal/update | 2 +-
11 files changed, 122 insertions(+), 115 deletions(-)
create mode 120000 srcpkgs/libgdal-python3
create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
create mode 100644 srcpkgs/libgdal/patches/30-license.patch
create mode 100644 srcpkgs/libgdal/patches/40-fix-setup-py-cc.patch
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch
diff --git a/common/shlibs b/common/shlibs
index 15943b843377..c2647473d923 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2509,7 +2509,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.26 libgdal-3.0.4_9
+libgdal.so.31 libgdal-3.5.3_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/libgdal-python3
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
new file mode 100644
index 000000000000..a114098612c5
--- /dev/null
+++ b/srcpkgs/libgdal/patches/10-atoll.patch
@@ -0,0 +1,34 @@
+Author: Holger Jaekel <holger.jaekel@gmx.de>
+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/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
new file mode 100644
index 000000000000..1496581453b7
--- /dev/null
+++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch
@@ -0,0 +1,13 @@
+userfaultfd is disabled in musl
+
+--- a/cmake/helpers/configure.cmake
++++ b/cmake/helpers/configure.cmake
+@@ -337,8 +337,6 @@
+ set(DONT_DEPRECATE_SPRINTF 1)
+ add_definitions(-DDONT_DEPRECATE_SPRINTF)
+ endif ()
+-
+- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H)
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch
new file mode 100644
index 000000000000..5c310c8c8e86
--- /dev/null
+++ b/srcpkgs/libgdal/patches/30-license.patch
@@ -0,0 +1,13 @@
+LICENSE.txt is placed separately to /usr/share/licenses.
+There is no need to duplicate it to /usr/share.
+
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -576,7 +576,6 @@
+ PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h)
+
+ set(GDAL_DATA_FILES
+- LICENSE.TXT
+ data/GDALLogoBW.svg
+ data/GDALLogoColor.svg
+ data/GDALLogoGS.svg
diff --git a/srcpkgs/libgdal/patches/40-fix-setup-py-cc.patch b/srcpkgs/libgdal/patches/40-fix-setup-py-cc.patch
new file mode 100644
index 000000000000..cc9078d9a50c
--- /dev/null
+++ b/srcpkgs/libgdal/patches/40-fix-setup-py-cc.patch
@@ -0,0 +1,19 @@
+--- a/swig/python/setup.py.in
++++ b/swig/python/setup.py.in
+@@ -29,14 +29,12 @@
+ if os.environ['CXX'].strip().startswith('ccache ') and os.environ['CXX'].strip()[len('ccache '):].find(' ') < 0:
+ os.environ['CXX'] = os.environ['CXX'].strip()[len('ccache '):]
+ else:
+- print('WARNING: "CXX=%s" was defined in the environment and contains more than one word. Unsetting it since that is incompatible of setuptools' % os.environ['CXX'])
+- del os.environ['CXX']
++ os.environ['CXX'] = os.environ['CXX'].split(' ', 1)[0]
+ if 'CC' in os.environ and os.environ['CC'].strip().find(' ') >= 0:
+ if os.environ['CC'].strip().startswith('ccache ') and os.environ['CC'].strip()[len('ccache '):].find(' ') < 0:
+ os.environ['CC'] = os.environ['CC'].strip()[len('ccache '):]
+ else:
+- print('WARNING: "CC=%s" was defined in the environment and contains more than one word. Unsetting it since that is incompatible of setuptools' % os.environ['CC'])
+- del os.environ['CC']
++ os.environ['CC'] = os.environ['CC'].split(' ', 1)[0]
+
+ # ---------------------------------------------------------------------------
+ # Switches
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 968edeb32c77..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 643eac882f6f..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch
deleted file mode 100644
index 71d194406838..000000000000
--- a/srcpkgs/libgdal/patches/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-===================================================================
---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index ce58be57dc87..f10280ce4f54 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,29 +1,41 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=12
+version=3.5.3
+revision=1
wrksrc="gdal-${version}"
-build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+build_style=cmake
+build_helper=python3
+configure_args="-DGDAL_USE_OPENCL=ON
+ -DPython_NumPy_INCLUDE_DIR=/${py3_sitelib}/numpy/core/include/numpy"
+hostmakedepends="pkg-config bison swig python3-numpy"
+makedepends="python3-devel freexl-devel c-blosc-devel geos-devel expat-devel
+ jasper-devel giflib-devel json-c-devel libcurl-devel libopenexr-devel
+ libjpeg-turbo-devel libpng-devel tiff-devel libqhull-devel libwebp-devel
+ libxml2-devel liblzma-devel zlib-devel libzstd-devel libdeflate-devel
+ netcdf-devel opencl2-headers pcre2-devel proj-devel sqlite-devel
+ ocl-icd-devel libxerces-c-devel libspatialite-devel
+ postgresql-libs-devel"
+checkdepends="python3-pytest"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+homepage="https://www.gdal.org"
+changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
+checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+subpackages="libgdal-devel libgdal-tools libgdal-python3"
+python_version=3
if [ -z "$CROSS_BUILD" ]; then
- makedepends+=" hdf5-devel"
+ makedepends+=" hdf5-devel armadillo-devel"
+fi
+
+# "error: static assertion failed: OFF_T should be 64 bits !"
+if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+ makedepends+=" cfitsio-devel"
fi
post_install() {
- vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
}
@@ -31,6 +43,8 @@ libgdal-tools_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools"
pkg_install() {
+ vmove usr/share/man/man1
+ vmove usr/share/bash-completion
vmove usr/bin
}
}
@@ -40,9 +54,18 @@ libgdal-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gdal-config
+ vmove usr/share/man/man1/gdal-config.1
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
+
+libgdal-python3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - python3 bindings"
+ pkg_install() {
+ vmove ${py3_sitelib}
}
}
diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update
index 489f765d4370..64898fa33ad2 100644
--- a/srcpkgs/libgdal/update
+++ b/srcpkgs/libgdal/update
@@ -1,2 +1,2 @@
-site=http://trac.osgeo.org/gdal/wiki/DownloadSource
+site=https://download.osgeo.org/gdal
pattern='gdal-\K[\d]+\.[\d]+\.[\d]+'
From 9945a0cf31052ece119a492e4a450738e880a994 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:46:48 +0300
Subject: [PATCH 2/8] osg: revbump for libgdal
Additionally:
* fixed license to comply with xlint.
* replaced "http" with "https" in homepage.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..6f2cb49b9cba 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
-homepage="http://www.openscenegraph.org"
+license="custom:OSGPL-0.0-or-later"
+homepage="https://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From bda1b281b0b7c3018aed21879daa34d2d5193b7d Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:42 +0300
Subject: [PATCH 3/8] postgis-postgresql14: revbump for libgdal
---
srcpkgs/postgis-postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a7540659ab5a..a58109d65246 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=2
+revision=3
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From 7577f36190dbc0a0d1dd0b55a73b652e0477f98b Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 4/8] postgis-postgresql13: revbump for libgdal
---
srcpkgs/postgis-postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index f17ace2f9fb4..ea024d3093a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
version=3.2.1
-revision=1
+revision=2
wrksrc="postgis-${version}"
build_style=gnu-configure
configure_args="
From b2fa8a34cb34a97d3752ce97b1b6a71f14637546 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 05:54:43 +0300
Subject: [PATCH 5/8] OpenOrienteering-Mapper: revbump for libgdal
---
srcpkgs/OpenOrienteering-Mapper/template | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..fe114ce24e8e 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=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
@@ -18,3 +18,13 @@ checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00
build_options="location sensors"
build_options_default="location sensors"
+
+do_check() {
+ cd build
+
+ # FAIL! : SensorsTest::nmeaPositionSourceSimulatedTest() Compared values are not the same
+ # Actual (int(source->error())) : 3
+ # Expected (int(QGeoPositionInfoSource::AccessError)): 0
+ # Loc: [/builddir/mapper-0.9.5/test/sensors_t.cpp(150)]
+ ctest -E 'sensors_t'
+}
From 4fbc3d540c93492ad81ceeef7e7d6e0b37e3495a Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 30 Oct 2022 06:07:26 +0300
Subject: [PATCH 6/8] grass: revbump for libgdal, fix build
"#unverified" near python_version has been removed due to confirmed
use of python 2.
According to REQUIREMENTS.html from the distributed tarball, python 3
support should be present in version >=7.8.0.
Updating this package to the latest release is challenging, meaning
that it will take more time to do that.
---
srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++
srcpkgs/grass/template | 4 +-
2 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/grass/patches/c99-bool.patch
diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch
new file mode 100644
index 000000000000..ce0cdfcd6928
--- /dev/null
+++ b/srcpkgs/grass/patches/c99-bool.patch
@@ -0,0 +1,157 @@
+From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001
+From: nilason <n_larsson@yahoo.com>
+Date: Wed, 19 May 2021 11:38:49 +0200
+Subject: [PATCH] libgis: Enable the C99 bool type (#1567)
+
+Enables globally the C99 'bool' type with its values 'true' and 'false'.
+
+The old boolean constants 'TRUE' and 'FALSE' are still valid but
+redefined to 'true' and 'false' to emphasize their equivalence.
+
+(Re-)definitions of TRUE/FALSE in modules are removed.
+
+This change was originally triggered by a conflict of v.hull -- defining
+a local bool type -- with GDAL 3.3 which introduced the inclusion of
+stdbool.h (#1563).
+---
+ lib/lidar/lidar.h | 3 ---
+ raster/r.param.scale/param.h | 2 --
+ raster/r.surf.idw/main.h | 2 --
+ raster3d/r3.showdspf/Ball.c | 2 --
+ raster3d/r3.showdspf/togif.c | 3 ---
+ vector/v.hull/chull.c | 20 ++++++++------------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR 1
+ #define P_BICUBIC 0
+- /* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+ /*----------------------------------------------------------------------------------------------------------*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window. */
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+
+ #define SHORT short
+-#define TRUE 1
+-#define FALSE 0
+
+ #define MELEMENT struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+ *
+ *****************************************************************************/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULL BTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULL true
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+- bool vis = BFALSE;
++ bool vis = false;
+
+
+ /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+
+ if (vol < 0) {
+ f->visible = VISIBLE;
+- vis = BTRUE;
++ vis = true;
+ }
+ f = f->next;
+ } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+ /* If no faces are visible from p, then p is inside the hull. */
+ if (!vis) {
+ p->onhull = !ONHULL;
+- return BFALSE;
++ return false;
+ }
+
+ /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ e->newface = MakeConeFace(e, p);
+ e = temp;
+ } while (e != edges);
+- return BTRUE;
++ return true;
+ }
+
+ /*---------------------------------------------------------------------
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5863a61a300d 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=7.6.1
-revision=4
+revision=5
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+python_version=2
nocross="tries to execute target binaries"
post_install() {
From 2d8b2d4db2780baa07f6c1bb069920d707265c1c Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:01 +0300
Subject: [PATCH 7/8] merkaartor: revbump for libgdal
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index cffcfba1cf01..6603376111f2 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=1
+revision=2
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From abc5956a90ec27097c165e4dd6cfec68835e8b47 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Tue, 1 Nov 2022 14:33:59 +0300
Subject: [PATCH 8/8] sumo: revbump for libgdal
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index f3cc1c4490ae..39c47a46b44c 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (20 preceding siblings ...)
2022-11-03 20:34 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-03 20:40 ` kruceter
2022-11-03 22:51 ` kruceter
` (5 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-03 20:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1894 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1298086936
Comment:
CI builds indicate that OpenOrienteering-Mapper fails "sensor" test.
My attempts to "dig" into the issue itself brought more problems,
leading to the failing pre-build test on my side.
```
-- CMAKE_CXX_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -Wall -Wpedantic -Wextra
-- CMAKE_CXX_FLAGS_NONE:
-- CMAKE_C_FLAGS: -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -mtune=generic -I/usr/x86_64-linux-gnu/usr/include -fdebug-prefix-map=/builddir/mapper-0.9.5/build=. -std=c99 -Wall -Wpedantic
-- CMAKE_C_FLAGS_NONE:
-- Configuring done
CMake Error: AUTOMOC for target cove: Test run of "moc" executable "/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc" failed.
/usr/x86_64-linux-gnu/usr/lib/qt5/bin/moc -h
No such file or directory
CMake Generate step failed. Build files cannot be regenerated correctly.
=> ERROR: OpenOrienteering-Mapper-0.9.5_2: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR: in do_configure() at common/build-style/cmake.sh:75
```
~`chroot`ing into masterdir/usr/x86_64-linux-gnu and ensuring that the
"failing" binary executes correctly convince me that the problem might
be laying with my setup, although I am not sure what exactly is wrong.~
~Since I do not believe that I can solve it myself, I have disabled checks
for the time being to see what other issues the CI builder may show.~
The "sensors" check has been disabled for now.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (21 preceding siblings ...)
2022-11-03 20:40 ` kruceter
@ 2022-11-03 22:51 ` kruceter
2022-11-03 23:05 ` kruceter
` (4 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-03 22:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 987 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1298369581
Comment:
@classabbyamp, libgdal seems to refuse to build with armv6l (`error: static assertion failed: OFF_T should be 64 bits !`).
~Comparing the source code of 3.0.4 and 3.5.2 (frmts/fits/fitsdataset.cpp), there was no such assertion in the old version.~
~Am I right to assume that this package and its reverse dependencies should be limited to aarch64*, i686*, and x86_64 since it cannot be built for 32-bit processors explicitly?~
~The same cannot be said of armv7l, but `unrecognized -mtune target: generic` ruined the building phase.~
OFF_T assertion was fixed by fencing the particular library with `XBPS_TARGET_WORDSIZE`.
libgdal's setup.py script for python 3 bindings forcibly unset `CC` if its value contained >1 "word" and set `gcc`
which is not suited for crossbuildings, it seems. This issue was addressed in the new patch.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (22 preceding siblings ...)
2022-11-03 22:51 ` kruceter
@ 2022-11-03 23:05 ` kruceter
2022-11-04 9:05 ` kruceter
` (3 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-03 23:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1302773899
Comment:
"Failed" builds may be safely ignored (they try to search postgis-postgresql12-3.1.4_1 which does not exist anymore).
@ar-jan, would you be willing to test this package with its dependencies? I noticed that you have your own pull request, but too late for me, I suppose.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (23 preceding siblings ...)
2022-11-03 23:05 ` kruceter
@ 2022-11-04 9:05 ` kruceter
2022-11-04 12:36 ` kruceter
` (2 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-04 9:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1302773899
Comment:
"Failed" builds may be safely ignored (they try to search for postgis-postgresql12-3.1.4_1 which does not exist anymore).
@ar-jan, would you be willing to test this package with its dependencies? I noticed that you have your own pull request, but too late for me, I suppose.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (24 preceding siblings ...)
2022-11-04 9:05 ` kruceter
@ 2022-11-04 12:36 ` kruceter
2022-11-05 3:23 ` the-maldridge
2022-11-05 3:27 ` [PR PATCH] [Merged]: " classabbyamp
27 siblings, 0 replies; 29+ messages in thread
From: kruceter @ 2022-11-04 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1303446669
Comment:
Tested every revbumped package briefly except for postgis-postgresql-13 and postgis-postgresql14.
@classabbyamp, is there anything else I have to do with suggested changes?
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (25 preceding siblings ...)
2022-11-04 12:36 ` kruceter
@ 2022-11-05 3:23 ` the-maldridge
2022-11-05 3:27 ` [PR PATCH] [Merged]: " classabbyamp
27 siblings, 0 replies; 29+ messages in thread
From: the-maldridge @ 2022-11-05 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/40225#issuecomment-1304390041
Comment:
CI fails have been cleared, github is dumb though and hasn't updated the status icons here.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PR PATCH] [Merged]: libgdal: update to 3.5.3
2022-10-30 5:27 [PR PATCH] libgdal: update to 3.5.2 kruceter
` (26 preceding siblings ...)
2022-11-05 3:23 ` the-maldridge
@ 2022-11-05 3:27 ` classabbyamp
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2022-11-05 3:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 456 bytes --]
There's a merged pull request on the void-packages repository
libgdal: update to 3.5.3
https://github.com/void-linux/void-packages/pull/40225
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Since python 2 packages are excluded in this update, issue #38229 is related.
#### Issues
None spotted at present time.
^ permalink raw reply [flat|nested] 29+ messages in thread