On Wed, May 19, 2021 17:17, Landry Breuil wrote:
> Le Wed, May 19, 2021 at 05:12:27PM +0300, Kirill Bychkov a ?crit :
>> On Mon, May 17, 2021 19:36, Landry Breuil wrote:
>> > Le Sun, May 16, 2021 at 08:20:03AM -0400, Josh Grosse a ?crit :
>> >> The attached patch updates mapnik from 3.0.10 to 3.1.0.
>> >>
>> >> * This resolves the undefined unicode string that broke
>> >> earlier releases of mapnik.
>> >>
>> >> * I am unable to figure out how to set the XMLPARSER to
>> >> libxml2 so that OpenStreetMap map files can be parsed
>> >> by mapnik-render. I've tried setting it in MODSCONS_FLAGS,
>> >> and in this patch set it is currently set in MODSCONS_ENV.
>> >> The XML parsing issue is described at:
>> >
>> > Fwiw setting XMLPARSER=libxml2 in MODSCONS_FLAGS seems to work here, at
>> > least that's what ends up in the generated config.py. Dunno if support
>> > for osm files works at runtime though.
>> >
>> > pretty sure MODGCC4_ARCHS can go :) not sure about py2 by default too..
>> >
>> > im looking a bit at this update, seems proj>6 support is not there yet
>> > (cf https://github.com/mapnik/mapnik/issues/4036) but i wont block the
>> > fix for that :D
>> >
>> > as for SHARED_LIBS bump im unsure a minor is enough.. will do a bit more
>> > tests, thanks for that work !
>> >
>> > Landry
>> >
>> >
>>
>> Hi!
>> Attached is a diff based on what I've send Landry about a year ago.
>
> i probably totally forgot about it or lost track.. sorry
>
>> I've added XMLPARSER=libxml2 to MODSCONS_FLAGS and regen WANTLIB.
>> From some point upstream doesn't ship data for tests. It could be
>> fetched as a separate tarball from github using GH_* variables since
>> no archives are present in assets. It would be easier to host them
>> ourselves and use MASTER_SITES0 probably.
>> Fetching test data as zip archive and extracting it to WRKBUILD before
>> running 'make regress' works for me (except tests which needs PROJ):
>> test cases: 64 | 61 passed | 3 failed
>> assertions: 21422 | 21418 passed | 4 failed
>> Most of visual tests are requiring PROJ so they fail too.
>> No other test were run except automatic ones.
>> It also looks like that mapnik does not require python. All python bindings
>> were moved to separate package long time ago. So we can get one less
>> python2 consumer.
>> Comments?
>
> if it works for you, sure okay. Just put a comment somewhere in the
> makefile to reenable proj support in the next update .. also, if you or
> Josh want to take maintainership, dont hesitate ! I dont use it.
>
> Landry
>
Josh, would you like to take maintainership?
Landry, OK for update and test comments?
Tests are 14MB + 137MB archive so I'm not sure if we should burden our mirrors.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/mapnik/Makefile,v
retrieving revision 1.37
diff -u -p -u -r1.37 Makefile
--- Makefile 23 Feb 2021 19:39:25 -0000 1.37
+++ Makefile 19 May 2021 14:46:48 -0000
@@ -1,43 +1,37 @@
# $OpenBSD: Makefile,v 1.37 2021/02/23 19:39:25 sthen Exp $
-BROKEN = undefined reference to '_ZN6icu_5613UnicodeStringC1EOS0_'
-
-# out of memory, renderer_common/process_group_symbolizer.cpp
-# powerpc &sparc64 OOM's on expression_grammar.cpp
-ONLY_FOR_ARCHS = amd64
-
COMMENT = toolkit for developing mapping applications
-DISTNAME = mapnik-v3.0.10
+# Check if next release incorporates support for new PROJ
^^^^^^^^^^^^^^^^^^
+V = 3.1.0
+DISTNAME = mapnik-v${V}
PKGNAME = ${DISTNAME:S/v//}
EXTRACT_SUFX = .tar.bz2
-REVISION = 5
-SHARED_LIBS = mapnik 3.0 #3.0
+SHARED_LIBS = mapnik 4.0 #3.0
CATEGORIES = graphics geo
-HOMEPAGE = http://mapnik.org/
+HOMEPAGE = https://mapnik.org/
MAINTAINER = Landry Breuil <[email protected]>
DPB_PROPERTIES = nojunk
# LGPLv2.1
PERMIT_PACKAGE = Yes
-WANTLIB += X11 Xau Xdmcp Xext Xrender boost_filesystem-mt
-WANTLIB += boost_program_options-mt boost_regex-mt harfbuzz webp
-WANTLIB += boost_system-mt c cairo expat fontconfig freetype
-WANTLIB += gdal glib-2.0 gobject-2.0 iconv icuuc intl jpeg m pcre pixman-1
-WANTLIB += png>=17.0 pq proj pthread sqlite3 tiff
-WANTLIB += xcb xcb-render xcb-shm z ${COMPILER_LIBCXX}
+WANTLIB += X11 Xau Xdmcp Xext Xrender boost_filesystem
+WANTLIB += boost_program_options boost_regex harfbuzz webp
+WANTLIB += boost_system c cairo expat ffi fontconfig freetype
+WANTLIB += gdal glib-2.0 gobject-2.0 icudata icui18n icuuc
+WANTLIB += intl jpeg m pcre pixman-1 png>=17.0 pq pthread
+WANTLIB += sqlite3 tiff xcb xcb-render xcb-shm xml2 z ${COMPILER_LIBCXX}
-MASTER_SITES = http://mapnik.s3.amazonaws.com/dist/v3.0.10/
+MASTER_SITES = https://github.com/mapnik/mapnik/releases/download/v${V}/
MODULES = devel/scons \
lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
-# clang doesnt ship cstdint ?
+# C++14
COMPILER = base-clang ports-gcc
-MODGCC4_ARCHS = amd64 i386 powerpc sparc64
TEST_DEPENDS = shells/bash \
${BUILD_PKGPATH}
@@ -46,7 +40,6 @@ LIB_DEPENDS = devel/boost>=1.58 \
databases/sqlite3 \
graphics/cairo \
graphics/libwebp \
- devel/proj \
devel/harfbuzz \
geo/gdal \
textproc/icu4c
@@ -60,8 +53,13 @@ MODSCONS_FLAGS = PREFIX="${TRUEPREFIX}"
HB_LIBS=${LOCALBASE}/lib \
WARNING_CXXFLAGS="-I${X11BASE}/include/freetype2" \
SYSTEM_FONTS=${X11BASE}/lib/X11/fonts/TTF/ \
+ CUSTOM_LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
FAST=yes \
- INPUT_PLUGINS=raster,postgis,shape,gdal,ogr,sqlite
+ INPUT_PLUGINS=raster,postgis,shape,gdal,ogr,sqlite \
+ XMLPARSER=libxml2
+
+# Test data cuold be fetched from github and extracted to test subdir.
+TEST_IS_INTERACTIVE = Yes
^^^^^^^^^^^^^^^^^^^^^
pre-configure:
# subst shlib version
