From 2c1e43f0044d67d32b3cc4bfdaf1b68d01d5d576 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 13 Feb 2022 23:18:43 +0100 Subject: [PATCH 01/11] proj: update to 7.2.1. --- common/shlibs | 2 +- srcpkgs/proj/template | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 17263fadc71a..c0409295396c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3060,7 +3060,7 @@ libwithsctp.so.1 lksctp-tools-1.0.17_1 libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4 libunshield.so.0 libunshield-0.6_1 libMyGUIEngine.so.3.4.1 libmygui-3.4.1_1 -libproj.so.18 proj-6.3.0_1 +libproj.so.19 proj-7.2.1_1 libnlopt.so.0 nlopt-2.4.2_1 libeb.so.16 libeb-4.3.3_1 libchipcard.so.6 libchipcard-5.0.4_1 diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template index 51c4638234bd..e3fbd43903c7 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,17 +1,19 @@ # Template file for 'proj' pkgname=proj -version=6.3.2 +version=7.2.1 revision=1 build_style=cmake -configure_args="-DPROJ_TESTS=OFF" +configure_args="-DBUILD_TESTING=OFF" hostmakedepends="python3" -makedepends="sqlite-devel" +makedepends="libcurl-devel + sqlite-devel + tiff-devel" short_desc="Cartographic Projections Library" maintainer="John " license="MIT" -homepage="https://proj4.org" +homepage="https://proj.org" distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz" -checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311 +checksum=b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14 post_install() { vlicense COPYING @@ -22,7 +24,6 @@ proj-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/share/man/man3 vmove usr/lib/cmake vmove "usr/lib/*.so" } From 0c207cbe4e5108d3bbd8c1d1395ba8f2c076ada6 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 14 Feb 2022 13:07:51 +0100 Subject: [PATCH 02/11] libgdal: update to 3.4.3 and rebuild against proj --- common/shlibs | 2 +- ...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 --------- ...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 ------ srcpkgs/libgdal/template | 101 +++++++++++++++--- srcpkgs/python3-gdal | 1 + 5 files changed, 91 insertions(+), 97 deletions(-) delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch create mode 120000 srcpkgs/python3-gdal diff --git a/common/shlibs b/common/shlibs index c0409295396c..38c0bb3d174b 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.30 libgdal-3.4.1_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/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 -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(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(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(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 -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(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/template b/srcpkgs/libgdal/template index ce58be57dc87..12f7800f2a28 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,30 +1,96 @@ # Template file for 'libgdal' pkgname=libgdal -version=3.0.4 -revision=12 +version=3.4.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" +configure_args=" + --with-expat=yes + --with-hdf5=yes + --with-kml=no + --with-liblzma=yes + --with-opencl=yes + --with-pg=yes + --with-podofo=yes + --with-python=yes + --with-spatialite=yes + --with-sqlite3=yes + --with-webp=yes + --with-zstd=yes" +hostmakedepends="gettext-devel + json-c-devel + pkg-config + python3-numpy + swig" +makedepends="boost-devel + expat-devel + 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 + ocl-icd-devel + opencl2-headers + pcre2-devel + proj-devel + python3-devel + sqlite-devel + postgresql-libs-devel" short_desc="Geospatial Data Abstraction Library" maintainer="Orphaned " 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://gdal.org/" +distfiles="https://github.com/OSGeo/gdal/releases/download/v${version}/gdal-${version}.tar.gz" +checksum=7244962628c82921b4a4903dbb721c7222b7d82ed5928fef55a52f87f68ad1fe +subpackages="python3-gdal libgdal-devel libgdal-tools" if [ -z "$CROSS_BUILD" ]; then makedepends+=" hdf5-devel" fi +CFLAGS="-pthread -I${XBPS_CROSS_BASE}/${py3_inc}" +LDFLAGS="-L${XBPS_CROSS_BASE}/${py3_lib}" + +post_build() { + if [ "$CROSS_BUILD" ]; then + export PYPREFIX="$XBPS_CROSS_BASE" + export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + f=${f##*/} + export _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done + fi + export LDSHARED="${CC} $CFLAGS -shared $LDFLAGS" + + rm -f swig/python/*_wrap.cpp + make -C swig/python generate + cd swig/python + python3 setup.py build +} + post_install() { vinstall gdal.pc 644 usr/lib/pkgconfig vlicense LICENSE.TXT + if [ "$CROSS_BUILD" ]; then + export PYPREFIX="$XBPS_CROSS_BASE" + export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + f=${f##*/} + export _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done + fi + export LDSHARED="${CC} $CFLAGS -shared $LDFLAGS" + + cd swig/python + python3 setup.py install --prefix=/usr --root=$DESTDIR } libgdal-tools_package() { @@ -46,3 +112,14 @@ libgdal-devel_package() { vmove usr/lib/*.so } } + +python3-gdal_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - Python3 bindings" + pkg_install() { + vmove "usr/bin/*.py" + vmove "usr/lib/python*" + vdoc swig/python/README.rst + vmkdir usr/share/python3-gdal + } +} diff --git a/srcpkgs/python3-gdal b/srcpkgs/python3-gdal new file mode 120000 index 000000000000..377d50dfc2b8 --- /dev/null +++ b/srcpkgs/python3-gdal @@ -0,0 +1 @@ +libgdal \ No newline at end of file From 635fbf6bbf15edbdf2e51b1ff36441c14db58d8c Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 14 Feb 2022 13:22:59 +0100 Subject: [PATCH 03/11] postgis-postgresql13: update to 3.2.3; rebuild against libgdal and proj libgdal-3.4.1 proj-7.2.1 --- srcpkgs/postgis-postgresql13/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template index f17ace2f9fb4..b70e36d9a1a1 100644 --- a/srcpkgs/postgis-postgresql13/template +++ b/srcpkgs/postgis-postgresql13/template @@ -1,6 +1,6 @@ # Template file for 'postgis-postgresql13' pkgname=postgis-postgresql13 -version=3.2.1 +version=3.2.3 revision=1 wrksrc="postgis-${version}" build_style=gnu-configure @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://postgis.net/" changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS" distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz" -checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e +checksum=1b4d8b5c756e5aba59efbc1833b22efe4d6562778eeca56fa497feb2eb13668c nocross="FIXME: Cannot run test program to determine PROJ version" pre_configure() { From dcd06051822f6bd20a715e170549c8eb8d914bce Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 14 Feb 2022 13:26:59 +0100 Subject: [PATCH 04/11] postgis-postgresql14: update to 3.2.3; rebuild against libgdal and proj libgdal-3.4.1 proj-7.2.1 --- srcpkgs/postgis-postgresql14/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template index a7540659ab5a..8ec071981262 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 +version=3.2.3 +revision=1 wrksrc="postgis-${version}" build_style=gnu-configure configure_args=" @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://postgis.net/" changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS" distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz" -checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e +checksum=1b4d8b5c756e5aba59efbc1833b22efe4d6562778eeca56fa497feb2eb13668c nocross="FIXME: Cannot run test program to determine PROJ version" pre_configure() { From 5ab6c4dec4b9da7f40b2b145c3371b8579ddd1d3 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 27 Jun 2021 22:18:46 +0200 Subject: [PATCH 05/11] merkaartor: rebuild against libgdal and proj --- 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 8d832163b7b3498662777ab8cbd0213bf55e0df6 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 00:21:27 +0200 Subject: [PATCH 06/11] OpenOrienteering-Mapper: rebuild against libgdal and proj --- srcpkgs/OpenOrienteering-Mapper/template | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template index fd29a08e75b6..6a652a6a7b97 100644 --- a/srcpkgs/OpenOrienteering-Mapper/template +++ b/srcpkgs/OpenOrienteering-Mapper/template @@ -1,14 +1,15 @@ # 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-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds + tiff-devel libcurl-devel" short_desc="Orienteering mapmaking program" maintainer="John " license="GPL-3.0-or-later" @@ -18,3 +19,9 @@ checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00 build_options="location sensors" build_options_default="location sensors" + +do_check() { + # sensors_t test fails on test runner + cd build + ctest -E 'sensors_t' +} From 7c084b02327f264e9ba1170cdc2e309eec65d01d Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 00:38:35 +0200 Subject: [PATCH 07/11] osg: rebuild against libgdal, fix license --- srcpkgs/osg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index 08bf6d4b6591..f51535c5719d 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,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev depends="xrandr" short_desc="OpenSceneGraph: high performance real-time graphics toolkit" maintainer="Orphaned " -license="OSGPL-2.0-or-later" +license="custom:OpenSceneGraph-Public-License-0.0" homepage="http://www.openscenegraph.org" distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz" checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5 From f6d04385b63252c54408e6c5516c271fc2c9f3c6 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 18:43:05 +0200 Subject: [PATCH 08/11] vtk: rebuild against proj --- srcpkgs/vtk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template index 858aa31b9c03..553cf9198465 100644 --- a/srcpkgs/vtk/template +++ b/srcpkgs/vtk/template @@ -1,7 +1,7 @@ # Template file for 'vtk' pkgname=vtk version=9.0.1 -revision=7 +revision=8 wrksrc=VTK-${version} build_style=cmake # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON" From 943c4f911b62de6c2f2c2af206dfff2ba8e97b85 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 19:26:57 +0200 Subject: [PATCH 09/11] XyGrib: rebuild against proj; fix build Do not use ninja ("unknown target" error) --- srcpkgs/XyGrib/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template index e4aa3a2e0265..995ec3eeeabb 100644 --- a/srcpkgs/XyGrib/template +++ b/srcpkgs/XyGrib/template @@ -1,8 +1,9 @@ # Template file for 'XyGrib' pkgname=XyGrib version=1.2.6.1 -revision=3 +revision=4 build_style=cmake +make_cmd=make hostmakedepends="qt5-devel pkg-config" makedepends="jasper-devel libnova-devel nettle-devel proj-devel qt5-devel qwt-devel libopenjpeg2-devel" @@ -13,6 +14,8 @@ homepage="https://opengribs.org/" distfiles="https://github.com/opengribs/XyGrib/archive/v${version}.tar.gz" checksum=2dc6099293ae6f7a4bfbfc0cab590cf7ad48241d608e6d7a76e35961b9fc2157 +export CMAKE_GENERATOR="Unix Makefiles" + if [ "$CROSS_BUILD" ]; then make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++" fi From 776527337f7fa1936c63bbee191c48cdaae0b0a8 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Wed, 16 Feb 2022 20:51:16 +0100 Subject: [PATCH 10/11] grass: rebuild against libgdal and proj --- .../v.hull-bool-GDAL-compatibility.patch | 84 +++++++++++++++++++ srcpkgs/grass/template | 4 +- 2 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/grass/patches/v.hull-bool-GDAL-compatibility.patch diff --git a/srcpkgs/grass/patches/v.hull-bool-GDAL-compatibility.patch b/srcpkgs/grass/patches/v.hull-bool-GDAL-compatibility.patch new file mode 100644 index 000000000000..c5e018aaaac2 --- /dev/null +++ b/srcpkgs/grass/patches/v.hull-bool-GDAL-compatibility.patch @@ -0,0 +1,84 @@ +From b86314c7f3b8aea961d380dbb836087b3990d7af Mon Sep 17 00:00:00 2001 +From: nilason +Date: Thu, 6 May 2021 22:27:48 +0200 +Subject: [PATCH] v.hull: use standard C boolean type + +Fixes #1563 +--- + vector/v.hull/chull.c | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c +index 1ad97396fa..41b627c50f 100644 +--- a/vector/v.hull/chull.c ++++ b/vector/v.hull/chull.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -29,10 +30,6 @@ + + #include "globals.h" + +-/*Define Boolean type */ +-typedef enum +-{ BFALSE, BTRUE } bool; +- + /* Define vertex indices. */ + #define X 0 + #define Y 1 +@@ -76,10 +73,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 +433,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 +443,7 @@ bool AddOne(tVertex p) + + if (vol < 0) { + f->visible = VISIBLE; +- vis = BTRUE; ++ vis = true; + } + f = f->next; + } while (f != faces); +@@ -454,7 +451,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 +467,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 33839ba1ed228e6de9aa31cb06ff2617e7435c30 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 24 Apr 2022 15:30:21 +0200 Subject: [PATCH 11/11] sumo: rebuild against libgdal and proj --- 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