From 461108ddbba5408b3cfd0e77a68a7ab346bd5495 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 15:08:33 +0100 Subject: [PATCH 01/12] proj: update to 7.2.1. --- common/shlibs | 2 +- srcpkgs/proj/template | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5136df346db0..fbee1be164fc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3068,7 +3068,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..2adf17d18d77 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,17 +1,17 @@ # 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 +22,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 47d1641f8417dee2d56a3552150bd7029e5dab94 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 15:40:25 +0100 Subject: [PATCH 02/12] libgdal: rebuild for proj 7.2.1 --- srcpkgs/libgdal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index 526b2b944999..de4f0fef1254 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal version=3.5.3 -revision=1 +revision=2 build_style=cmake build_helper=python3 configure_args="-DGDAL_USE_OPENCL=ON From ff2be94a80e70d3b6946dabb7105b13a438ae8ae Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:12:34 +0100 Subject: [PATCH 03/12] libspatialite: rebuild for proj 7.2.1 --- srcpkgs/libspatialite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template index 54885e5e8b8c..0333e6807d7b 100644 --- a/srcpkgs/libspatialite/template +++ b/srcpkgs/libspatialite/template @@ -1,9 +1,9 @@ # Template file for 'libspatialite' pkgname=libspatialite version=5.0.1 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="pkg-config geos-devel" +hostmakedepends="pkg-config geos-devel librttopo" makedepends="sqlite-devel zlib-devel proj-devel freexl-devel geos-devel librttopo-devel libxml2-devel minizip-devel" short_desc="SQLite extension for Spatial SQL capabilities" From 08202134cb42311eae4e6f94156f33a33d4db867 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:21:32 +0100 Subject: [PATCH 04/12] postgis-postgresql14: rebuild for proj 7.2.1 --- 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 c1d68a3c9dee..5b07a5bd027d 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=3 +revision=4 build_style=gnu-configure configure_args=" --with-projdir=${XBPS_CROSS_BASE}/usr From a2e8da951f9f90d9efb71e0906b9bca329e1f7d9 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:24:22 +0100 Subject: [PATCH 05/12] postgis-postgresql13: rebuild for proj 7.2.1 --- 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 6a6cedb505e7..b95707840357 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=2 +revision=3 build_style=gnu-configure configure_args=" --with-projdir=${XBPS_CROSS_BASE}/usr From 64e94687ce860d6951c4436e0a7d115edbf6c9e5 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:25:01 +0100 Subject: [PATCH 06/12] grass: rebuild for proj 7.2.1 --- srcpkgs/grass/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template index 5863a61a300d..a8fc7640d869 100644 --- a/srcpkgs/grass/template +++ b/srcpkgs/grass/template @@ -1,7 +1,7 @@ # Template file for 'grass' pkgname=grass version=7.6.1 -revision=5 +revision=6 _binver=${version//./} _binver=${_binver:0:2} build_style=gnu-configure From 6daae30b73b335b36fca02559be71053684016e9 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:25:40 +0100 Subject: [PATCH 07/12] merkaartor: rebuild for proj 7.2.1 --- srcpkgs/merkaartor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template index 6603376111f2..f1f4b270b4e7 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -1,7 +1,7 @@ # Template file for 'merkaartor' pkgname=merkaartor version=0.19.0 -revision=2 +revision=3 build_style=qmake configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5" hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools" From 17ee635fbf7bd94808c475dff19d838247006d43 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:27:14 +0100 Subject: [PATCH 08/12] XyGrib: rebuild for proj 7.2.1 --- srcpkgs/XyGrib/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template index e4aa3a2e0265..b2a1272d5a9f 100644 --- a/srcpkgs/XyGrib/template +++ b/srcpkgs/XyGrib/template @@ -1,7 +1,7 @@ # Template file for 'XyGrib' pkgname=XyGrib version=1.2.6.1 -revision=3 +revision=4 build_style=cmake hostmakedepends="qt5-devel pkg-config" makedepends="jasper-devel libnova-devel nettle-devel proj-devel qt5-devel @@ -13,10 +13,6 @@ homepage="https://opengribs.org/" distfiles="https://github.com/opengribs/XyGrib/archive/v${version}.tar.gz" checksum=2dc6099293ae6f7a4bfbfc0cab590cf7ad48241d608e6d7a76e35961b9fc2157 -if [ "$CROSS_BUILD" ]; then - make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++" -fi - post_patch() { vsed -i -e '\!/usr/include/openjpeg-2.3!i /usr/include/openjpeg-2.4' \ CMakeLists.txt From 3aa2bea53c677335ddc9bbd8d92b81da11d297bf Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:29:13 +0100 Subject: [PATCH 09/12] sumo: rebuild for proj 7.2.1 --- srcpkgs/sumo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template index dfc342f19a51..595a4d4e4c4e 100644 --- a/srcpkgs/sumo/template +++ b/srcpkgs/sumo/template @@ -1,7 +1,7 @@ # Template file for 'sumo' pkgname=sumo version=1.12.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="libgdal-tools pkg-config swig python3-setuptools" makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel From 1d06f568f404afef9722b85a6930831c6d52cbb5 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:30:00 +0100 Subject: [PATCH 10/12] OpenOrienteering-Mapper: rebuild for proj 7.2.1 --- srcpkgs/OpenOrienteering-Mapper/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template index e725ac02dff9..3ccdcb55285f 100644 --- a/srcpkgs/OpenOrienteering-Mapper/template +++ b/srcpkgs/OpenOrienteering-Mapper/template @@ -1,13 +1,14 @@ # Template file for 'OpenOrienteering-Mapper' pkgname=OpenOrienteering-Mapper version=0.9.5 -revision=2 +revision=3 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" From 938fac8d5672c26bf37f22958a82e8619399d5e1 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 16:30:58 +0100 Subject: [PATCH 11/12] vtk: rebuild for proj 7.2.1 --- srcpkgs/vtk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template index eff6e114c7b6..59c664d082e8 100644 --- a/srcpkgs/vtk/template +++ b/srcpkgs/vtk/template @@ -1,7 +1,7 @@ # Template file for 'vtk' pkgname=vtk version=9.0.1 -revision=8 +revision=9 build_style=cmake # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON" # Build only the core modules plus python bindings for now From 398fd228000fb82cd17001b71b913b1219a27625 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 8 Nov 2022 17:39:17 +0100 Subject: [PATCH 12/12] osm2pgsql: rebuild for proj 7.2.1 --- srcpkgs/osm2pgsql/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template index 1d5f71b70140..e67e67513b8f 100644 --- a/srcpkgs/osm2pgsql/template +++ b/srcpkgs/osm2pgsql/template @@ -1,7 +1,7 @@ # Template file for 'osm2pgsql' pkgname=osm2pgsql version=1.6.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="boost" makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel