From 002d1eafdadca5791f32dbe759272179ef80d0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=BDx?= Date: Tue, 11 May 2021 07:00:33 +0200 Subject: [PATCH 01/15] 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 8a7eef8df8c3..3ed651a6596b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3053,7 +3053,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.0 libmygui-3.4.0_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..94995256d81d 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="sqlite-devel tiff-devel libcurl-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 59ca31c69baf1ca54ea99ae3bd3efb0f6dd03ba9 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Sun, 20 Dec 2020 14:49:30 +0100 Subject: [PATCH 02/15] New package: libspatialite-5.0.0 SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. i686/i686 : ok x86_64-musl/x86_64-musl : ok aarch64/x86_64 : ok aarch64-musl/x86_64-musl: ok armv7l/x86_64 : ok armv6l-musl/x86_64-musl : ok --- common/shlibs | 16 +++++++++ srcpkgs/libspatialite-devel | 1 + .../patches/disable_check_sql.patch | 29 +++++++++++++++ srcpkgs/libspatialite/template | 36 +++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 120000 srcpkgs/libspatialite-devel create mode 100644 srcpkgs/libspatialite/patches/disable_check_sql.patch create mode 100644 srcpkgs/libspatialite/template diff --git a/common/shlibs b/common/shlibs index 3ed651a6596b..214fb7195103 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4013,3 +4013,19 @@ libbasu.so.0 basu-0.2.0_1 libXcomp.so.3 nx-libs-3.5.99.24_1 libXcompshad.so.3 nx-libs-3.5.99.24_1 libNX_X11.so.6 nx-libs-3.5.99.24_1 +libkmlbase.so.1 libkml-1.3.0_1 +libkmldom.so.1 libkml-1.3.0_1 +libkmlengine.so.1 libkml-1.3.0_1 +libkmlregionator.so.1 libkml-1.3.0_1 +libkmlxsd.so.1 libkml-1.3.0_1 +libspatialite.so.7 libspatialite-5.0.0_1 +libspatialindex.so.6 libspatialindex-1.9.3_1 +libgrass_gis.7.8.so grass-7.8.5_1 +libgrass_raster.7.8.so grass-7.8.5_1 +libgrass_gproj.7.8.so grass-7.8.5_1 +libgrass_dbmiclient.7.8.so grass-7.8.5_1 +libgrass_vector.7.8.so grass-7.8.5_1 +libgrass_dbmibase.7.8.so grass-7.8.5_1 +libgrass_imagery.7.8.so grass-7.8.5_1 +libkmlconvenience.so.1 libkml-1.3.0_1 +mod_spatialite.so.7 libspatialite-5.0.0_1 diff --git a/srcpkgs/libspatialite-devel b/srcpkgs/libspatialite-devel new file mode 120000 index 000000000000..588ba2ad7c00 --- /dev/null +++ b/srcpkgs/libspatialite-devel @@ -0,0 +1 @@ +libspatialite \ No newline at end of file diff --git a/srcpkgs/libspatialite/patches/disable_check_sql.patch b/srcpkgs/libspatialite/patches/disable_check_sql.patch new file mode 100644 index 000000000000..951c1ac1724d --- /dev/null +++ b/srcpkgs/libspatialite/patches/disable_check_sql.patch @@ -0,0 +1,29 @@ +disable check_sql_stmt test + +https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext + +--- a/test/Makefile.am 2020-08-23 18:46:23.000000000 +0200 ++++ b/test/Makefile.am 2020-12-22 14:45:10.206085515 +0100 +@@ -31,10 +31,6 @@ + check_gaia_utf8 \ + check_extension \ + check_recover_geom \ +- check_sql_stmt \ +- check_sql_stmt_tiny \ +- check_sql_stmt_legacy \ +- check_sql_stmt_extension \ + check_multithread \ + check_virtualtable1 \ + check_virtualtable2 \ +--- a/test/Makefile.in 2020-08-23 18:46:23.000000000 +0200 ++++ b/test/Makefile.in 2020-12-22 14:41:06.416335737 +0100 +@@ -102,9 +102,6 @@ + check_xls_load$(EXEEXT) check_math_funcs$(EXEEXT) \ + check_gaia_util$(EXEEXT) check_gaia_utf8$(EXEEXT) \ + check_extension$(EXEEXT) check_recover_geom$(EXEEXT) \ +- check_sql_stmt$(EXEEXT) check_sql_stmt_tiny$(EXEEXT) \ +- check_sql_stmt_legacy$(EXEEXT) \ +- check_sql_stmt_extension$(EXEEXT) check_multithread$(EXEEXT) \ + check_virtualtable1$(EXEEXT) check_virtualtable2$(EXEEXT) \ + check_virtualtable3$(EXEEXT) check_virtualtable4$(EXEEXT) \ + check_virtualtable5$(EXEEXT) check_virtualtable6$(EXEEXT) \ diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template new file mode 100644 index 000000000000..da7a9439da7e --- /dev/null +++ b/srcpkgs/libspatialite/template @@ -0,0 +1,36 @@ +# Template file for 'libspatialite' +pkgname=libspatialite +version=5.0.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config libxml2" +makedepends="sqlite-devel minizip-devel zlib-devel proj-devel freexl-devel + geos-devel libxml2-devel" +depends="sqlite" +short_desc="Geospatial extension for SQLite" +maintainer="Orphaned " +license="MPL-1.0" +homepage="https://www.gaia-gis.it/fossil/libspatialite/index" +distfiles="http://www.gaia-gis.it/gaia-sins/${pkgname}-${version}.tar.gz" +checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac + +CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" libtool geos-devel" +fi + +post_install() { + vlicense COPYING +} + +libspatialite-devel_package() { + depends="$pkgname>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} From 9492d87af385dd643484ed7cfef826760dd0a48b Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Thu, 26 Nov 2020 18:47:25 +0100 Subject: [PATCH 03/15] New package: libkml-1.3.0 libkml is a library to process Google-KML GEO files. It can be used in GDAL (libgdal), OSSIM, OTB and osgEarth --- srcpkgs/libkml-devel | 1 + srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++++ srcpkgs/libkml/template | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 120000 srcpkgs/libkml-devel create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch create mode 100644 srcpkgs/libkml/template diff --git a/srcpkgs/libkml-devel b/srcpkgs/libkml-devel new file mode 120000 index 000000000000..cf12be102f42 --- /dev/null +++ b/srcpkgs/libkml-devel @@ -0,0 +1 @@ +libkml \ No newline at end of file diff --git a/srcpkgs/libkml/patches/NOUNCRYPT.patch b/srcpkgs/libkml/patches/NOUNCRYPT.patch new file mode 100644 index 000000000000..5b7e016c0e02 --- /dev/null +++ b/srcpkgs/libkml/patches/NOUNCRYPT.patch @@ -0,0 +1,17 @@ +minizip/crypt.h was removed from the packet minizip-1.2.11_2. + +with "#define NOUNCRYPT" libkml can be built without "crypt.h" +https://github.com/void-linux/void-packages/commit/952ac913cf +https://github.com/madler/zlib/pull/229 + +--- a/src/kml/base/contrib/minizip/unzip.c 2015-12-21 18:23:05.000000000 +0100 ++++ b/src/kml/base/contrib/minizip/unzip.c 2020-11-26 15:45:55.033835816 +0100 +@@ -42,7 +42,7 @@ + #include //RR + #include "unzip.h" + #include "iomem_simple.h" +-#undef NOUNCRYPT ++#define NOUNCRYPT + + #ifdef STDC + # include diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template new file mode 100644 index 000000000000..d2abee573fe1 --- /dev/null +++ b/srcpkgs/libkml/template @@ -0,0 +1,23 @@ +# Template file for 'libkml' +pkgname=libkml +version=1.3.0 +revision=1 +build_style=cmake +makedepends="zlib-devel expat-devel boost-devel minizip-devel uriparser-devel" +short_desc="Library to manipulate KML OGC files" +maintainer="Orphaned " +license="GPL-3.0-or-later" +homepage="https://github.com/libkml/libkml" +distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz" +checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963 + +libkml-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} From 41b7ec139a46806acec2a0ceac525ed811061a3f Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Fri, 27 Nov 2020 07:02:22 +0100 Subject: [PATCH 04/15] libgdal: update to 3.2.3. - update to 3.2.3. - --with-expat / --with-spatialite added (OSM support) - postgresql and kml support added - python3-gdal module added --- common/shlibs | 2 +- ...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 ------------ ...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 ------- srcpkgs/libgdal/template | 83 ++++++++++++++++--- srcpkgs/python3-gdal | 1 + 5 files changed, 73 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 214fb7195103..a4d36eae29e8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2498,7 +2498,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.28 libgdal-3.2.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/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 72c96ff67605..f71d947b0aea 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,30 +1,77 @@ # Template file for 'libgdal' pkgname=libgdal -version=3.0.4 -revision=9 +version=3.2.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-liblzma=yes + --with-opencl=yes + --with-podofo=yes + --with-spatialite=yes + --with-sqlite3=yes + --with-webp=yes + --with-zstd=yes + $(vopt_if kml libkml) + $(vopt_with postgresql pg)" +hostmakedepends="gettext-devel pkg-config python3-numpy json-c-devel 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 libspatialite-devel libwebp-devel + libxml2-devel libzstd-devel netcdf-devel ocl-icd-devel opencl-headers + pcre2-devel proj-devel python3-devel sqlite-devel + $(vopt_if kml libkml-devel) + $(vopt_if postgresql 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=86a35aad60a1eb87c2c0c145f9bccd83a47c4781254544ed5246f64d55ee1f18 +subpackages="python3-gdal libgdal-devel libgdal-tools" + +build_options="kml postgresql" +build_options_default="kml" 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 +93,15 @@ 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 + vcopy swig/python/samples usr/share/python3-gdal/examples + } +} 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 629cd4edc9a5353297d0592a3ed8e8e548b1e5ff Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 27 Jun 2021 19:16:34 +0200 Subject: [PATCH 05/15] postgis: rebuild against libgdal-3.2.3 and proj-7.2.1 --- srcpkgs/postgis/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template index e73a8e6d351a..63478eba6b73 100644 --- a/srcpkgs/postgis/template +++ b/srcpkgs/postgis/template @@ -1,7 +1,7 @@ # Template file for 'postgis' pkgname=postgis version=3.1.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr --with-projdir=${XBPS_CROSS_BASE}/usr From 41250b9361c55d0aeffa45192f808d02ba653cc7 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 27 Jun 2021 22:07:47 +0200 Subject: [PATCH 06/15] postgis-postgresql12: rebuild against libgdal-3.2.3 and proj-7.2.1 --- srcpkgs/postgis-postgresql12/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template index abefe9159680..1df61d2d05d3 100644 --- a/srcpkgs/postgis-postgresql12/template +++ b/srcpkgs/postgis-postgresql12/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql12' pkgname=postgis-postgresql12 version=3.1.2 -revision=1 +revision=2 wrksrc="postgis-${version}" build_style=gnu-configure configure_args=" From 58e3117ff63b3e3fcb80f80896287a048b8443b4 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 27 Jun 2021 22:10:31 +0200 Subject: [PATCH 07/15] postgis-postgresql13: rebuild against libgdal-3.2.3 and 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 21e894f61e98..b92c8b463fab 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.1.2 -revision=1 +revision=2 wrksrc="postgis-${version}" build_style=gnu-configure configure_args=" From a46e6f507eb706768a351e94fac95a50aab1489e Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 27 Jun 2021 22:18:46 +0200 Subject: [PATCH 08/15] merkaartor: rebuild against libgdal-3.2.3 and 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 17c8d5dc361d..72c59006e968 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -1,7 +1,7 @@ # Template file for 'merkaartor' pkgname=merkaartor version=0.18.4 -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 ce0fe67aaba7d3c0508f209144a4a8599a5bad5e Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 00:21:27 +0200 Subject: [PATCH 09/15] OpenOrienteering-Mapper: rebuild against libgdal-3.2.3 and proj-7.2.1 --- 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 dcf6ccee85d67bb8d0dbf0565db34dee2fa03b5f Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 00:38:35 +0200 Subject: [PATCH 10/15] osg: rebuild against libgdal-3.2.3, 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 c836581679c3232429bec86bde896d4321d080d2 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 17:35:47 +0200 Subject: [PATCH 11/15] sumo: update to 1.9.2 / rebuild against libgdal-3.2.3 and proj-7.2.1 - Build TraaS.jar using Maven (fixes tests) - Add Eigen3 dependency --- common/shlibs | 2 ++ srcpkgs/sumo/template | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index a4d36eae29e8..9f1689b4f95c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4029,3 +4029,5 @@ libgrass_dbmibase.7.8.so grass-7.8.5_1 libgrass_imagery.7.8.so grass-7.8.5_1 libkmlconvenience.so.1 libkml-1.3.0_1 mod_spatialite.so.7 libspatialite-5.0.0_1 +libsumocpp.so sumo-1.9.2_1 +libtracicpp.so sumo-1.9.2_1 diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template index 4c1eb6876a46..5406fcd58f51 100644 --- a/srcpkgs/sumo/template +++ b/srcpkgs/sumo/template @@ -1,18 +1,28 @@ # Template file for 'sumo' pkgname=sumo -version=1.5.0 -revision=3 +version=1.9.2 +revision=1 build_style=cmake python_version=3 -hostmakedepends="libgdal-tools pkg-config swig python3-setuptools" -makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel libxerces-c-devel osg-devel proj-devel" +hostmakedepends="libgdal-tools pkg-config swig python3-setuptools + apache-maven openjdk11 git" +makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel + libxerces-c-devel osg-devel proj-devel eigen" +checkdepends="gtest" short_desc="SUMO (Simulation of Urban MObility) and included applications" maintainer="Warrior Graph " license="EPL-2.0" homepage="https://sumo.dlr.de" distfiles="https://sumo.dlr.de/releases/${version}/sumo-src-${version}.tar.gz" -checksum=dcf5339fdda0659fa44fcfd69fe3f4e03009aa9a59849624f2a3cfe72eda9f8e +checksum=193a8ab14bb305d3967625d76cd291f5c55bb906817465f2a12c2e69f4b80813 + +pre_build() { + cd tools/contributed/traas + mvn package + mv target/traas*.jar ${wrksrc}/bin/TraaS.jar +} post_install() { rm -f ${DESTDIR}/usr/share/sumo/tools/libsumo/*.so + rm -f ${DESTDIR}/usr/share/sumo/tools/libtraci/_libtraci.so } From dac2f731a87b85666e41496d51bb3cf35444d3f3 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 18:43:05 +0200 Subject: [PATCH 12/15] vtk: rebuild against 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 4c1710087f83..8811247ae7e5 100644 --- a/srcpkgs/vtk/template +++ b/srcpkgs/vtk/template @@ -1,7 +1,7 @@ # Template file for 'vtk' pkgname=vtk version=9.0.1 -revision=5 +revision=6 wrksrc=VTK-${version} build_style=cmake # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON" From 6ce255d12b3f564b0e6d7c12b921930575fc1021 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 19:24:43 +0200 Subject: [PATCH 13/15] osm2pgsql: rebuild against 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 d4aae84f375d..91c6e8dbd5fe 100644 --- a/srcpkgs/osm2pgsql/template +++ b/srcpkgs/osm2pgsql/template @@ -1,7 +1,7 @@ # Template file for 'osm2pgsql' pkgname=osm2pgsql version=1.4.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="boost python3 python3-psycopg2" makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel From a03bd95db966f4b1b4b49351bda9241e5e848b79 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 19:26:57 +0200 Subject: [PATCH 14/15] XyGrib: rebuild against proj-7.2.1 --- srcpkgs/XyGrib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template index e4aa3a2e0265..641dd730c786 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 From ed07388fd2769e83f5a56c67c61acbd007e117ad Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 29 Jun 2021 21:53:09 +0200 Subject: [PATCH 15/15] paraview: rebuild against libgdal-3.2.3 --- .../paraview/patches/cmake-build-type-none.patch | 16 ++++++++++++++++ srcpkgs/paraview/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/paraview/patches/cmake-build-type-none.patch diff --git a/srcpkgs/paraview/patches/cmake-build-type-none.patch b/srcpkgs/paraview/patches/cmake-build-type-none.patch new file mode 100644 index 000000000000..53dfb4edba77 --- /dev/null +++ b/srcpkgs/paraview/patches/cmake-build-type-none.patch @@ -0,0 +1,16 @@ +Required to keep using build type None and not override debug flags etc. + +--- a/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt ++++ b/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt +@@ -22,11 +22,6 @@ if (NOT CMAKE_BUILD_TYPE) + endif() + + string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower) +-if( NOT cmake_build_type_tolower STREQUAL "debug" +- AND NOT cmake_build_type_tolower STREQUAL "release" +- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo") +- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).") +-endif() + + + ############################################################################# diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 20a7f5589677..49ad9e48c2c0 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -1,7 +1,7 @@ # Template file for 'paraview' pkgname=paraview version=5.8.1 -revision=3 +revision=4 wrksrc=ParaView-v${version} build_style=cmake configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr