cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

geo/libosmium: update to 2.16.0

Browse Source 
drops dependency on devel/proj, cf
https://github.com/osmcode/libosmium/issues/277

add a patch to build with our zlib (needs gzclose_r/w, gzclose is
enough), hint from sthen@.

ok bentley@
This commit is contained in:
landry 2021-03-07 17:28:55 +00:00
parent 6834ff13c2
commit f8a6c7f407
5 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
geo/libosmium/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2019/07/12 20:46:29 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2021/03/07 17:28:55 landry Exp $
COMMENT = fast, flexible library for working with OpenStreetMap data
GH_ACCOUNT = osmcode
GH_PROJECT = libosmium
GH_TAGNAME = v2.14.0
REVISION = 0
GH_TAGNAME = v2.16.0
CATEGORIES = geo
@ -19,15 +18,11 @@ COMPILER = base-clang ports-gcc ports-clang
MODULES = devel/cmake
BUILD_DEPENDS = devel/boost \
devel/cppcheck \
devel/proj \
devel/protozero \
devel/sparsehash \
geo/gdal \
geo/geos
# https://github.com/osmcode/libosmium/issues/277
CXXFLAGS+=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
# include/osmium/io/detail/opl_parser_functions.hpp
# #include <utf8.h>
RUN_DEPENDS = devel/utfcpp

4
geo/libosmium/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libosmium-2.14.0.tar.gz) = rDhcE7GYnPYPny4DlanY9z6lV/voo1yrsOXwt0z0O0k=
SIZE (libosmium-2.14.0.tar.gz) = 489137
SHA256 (libosmium-2.16.0.tar.gz) = QrvvlyJtfbfOPutHRgPlsfLw+GzshUmIaOlBbnzfW9U=
SIZE (libosmium-2.16.0.tar.gz) = 508536

14
geo/libosmium/patches/patch-include_osmium_io_bzip2_compression_hpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-include_osmium_io_bzip2_compression_hpp,v 1.1.1.1 2018/07/05 05:17:52 bentley Exp $
From upstream 07985a68e49dec0c541b799656dbde77f4c05ab5.
Index: include/osmium/io/bzip2_compression.hpp
--- include/osmium/io/bzip2_compression.hpp.orig
+++ include/osmium/io/bzip2_compression.hpp
@@ -148,7 +148,7 @@ namespace osmium {
m_bzfile = nullptr;
if (m_file) {
if (do_fsync()) {
- osmium::io::detail::reliable_fsync(::fileno(m_file));
+ osmium::io::detail::reliable_fsync(fileno(m_file));
}
if (fclose(m_file) != 0) {
throw std::system_error{errno, std::system_category(), "Close failed"};

23
geo/libosmium/patches/patch-include_osmium_io_gzip_compression_hpp Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-include_osmium_io_gzip_compression_hpp,v 1.1 2021/03/07 17:28:55 landry Exp $
Index: include/osmium/io/gzip_compression.hpp
--- include/osmium/io/gzip_compression.hpp.orig
+++ include/osmium/io/gzip_compression.hpp
@@ -155,7 +155,7 @@ namespace osmium {
#ifdef _MSC_VER
osmium::detail::disable_invalid_parameter_handler diph;
#endif
- const int result = ::gzclose_w(m_gzfile);
+ const int result = ::gzclose(m_gzfile);
m_gzfile = nullptr;
if (result != Z_OK) {
throw gzip_error{"gzip error: write close failed", result};
@@ -238,7 +238,7 @@ namespace osmium {
#ifdef _MSC_VER
osmium::detail::disable_invalid_parameter_handler diph;
#endif
- const int result = ::gzclose_r(m_gzfile);
+ const int result = ::gzclose(m_gzfile);
m_gzfile = nullptr;
if (result != Z_OK) {
throw gzip_error{"gzip error: read close failed", result};

5
geo/libosmium/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/07/05 05:17:52 bentley Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/03/07 17:28:55 landry Exp $
include/osmium/
include/osmium/area/
include/osmium/area/assembler.hpp
@ -101,6 +101,7 @@ include/osmium/io/debug_output.hpp
include/osmium/io/detail/
include/osmium/io/detail/debug_output_format.hpp
include/osmium/io/detail/input_format.hpp
include/osmium/io/detail/lz4.hpp
include/osmium/io/detail/o5m_input_format.hpp
include/osmium/io/detail/opl_input_format.hpp
include/osmium/io/detail/opl_output_format.hpp
@ -132,6 +133,7 @@ include/osmium/io/opl_input.hpp
include/osmium/io/opl_output.hpp
include/osmium/io/output_iterator.hpp
include/osmium/io/overwrite.hpp
include/osmium/io/pbf.hpp
include/osmium/io/pbf_input.hpp
include/osmium/io/pbf_output.hpp
include/osmium/io/reader.hpp
@ -155,6 +157,7 @@ include/osmium/osm/area.hpp
include/osmium/osm/box.hpp
include/osmium/osm/changeset.hpp
include/osmium/osm/crc.hpp
include/osmium/osm/crc_zlib.hpp
include/osmium/osm/diff_object.hpp
include/osmium/osm/entity.hpp
include/osmium/osm/entity_bits.hpp