From nobody Thu Jan 19 23:24:27 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nydxl5bsFz2t0p8; Thu, 19 Jan 2023 23:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nydxl46BWz3Csg; Thu, 19 Jan 2023 23:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674170667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ij9UoikMNrRCqCgwNOumjUvlQ2ODXNNAwGHfSnL96cQ=; b=NTkbNB9gqDJooYeOlninwKmNoZodBiN/lKPtHlsjwcYg53t1Y6XKlkpv34ZID0UqujxAnQ pzs3yTipMglTT2umxdAhnWsgaC4N+tv8fQI5WObAk1JzFMDi4eZbjC0aCMWuPD2qpVG+7D NSFF8mhSJwD2XtzGIlMX2GVzsgItfAxNpi0rCJMK2KlQJR6aY9sAWxEXTka+Vd351XcU7f wX0rL59OtvP5b4S4e86iMNt7/C8U3pfFlBhPD5xqWNIAdmubs8z4WfGr6+MjKAH9SUJQV5 lKIeOchgk9Lm/EWNT9HyrwFhALQ479ySowV56zHV05dQtvo0RGMk84kRB9zlfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674170667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ij9UoikMNrRCqCgwNOumjUvlQ2ODXNNAwGHfSnL96cQ=; b=AxmNbWQKDL1FhfSAycJwK6VAUESo2iLujqLdw/9CYWisPWYM4a419zn7+YJWEmlA+7DQsf BaJMengxJoTJm/RLhUBQAbQNix6CYWzinJwdZ7JjYNCcweFGYeRyUC126nr40kuFOprlmg guGVvonUPEn+oK4PjGSdFPFFfaPkve7pALtD2vQsqMLbEXuL+thPz1nZ9HoBzmOXJb1ZYQ rf1+bDoNrjSy/cK4ia20vaYSzbis+1RZmVuHFbAKfxWAeITM9Aiu9pT73O5FMMWpgk59D5 62VJxwnS644sJM5YFQIHpMncCDQCnkZfnnWpIoiwPMv1PrOWiNnoGLPQdF139w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674170667; a=rsa-sha256; cv=none; b=felZ3PEgKL8AV6mx1tdZvputp9yKyC3UqBUuZnMR23QnypjW0h8k2XjuEyQLcqp5RqxFHA RGLZKwuMkpq3tChMNvdqz3+b6bfYpq3AM1cp+z9+U9iKqmKrlwdT647rzea44hDmLFAy/O mDE/rhsfe2LQC7V1CEj4rqqftb6/OirHpqYRLq8dhJwZaZyqyTQr0lMrTyTwYRn5btTaKL D+9FY1he4YxP1M5Ag8Seyq2/MwcaymgzVrbQWzFmwlIp3dxrKl0SOUosN7bSQd+OPvth6+ C2Qk7DTrjhCQyLCKBVRPTpq8EJWkE414mdXZJPHthjsaPB1XdvNbRagumTsVvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nydxl30P3z18Dw; Thu, 19 Jan 2023 23:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30JNORex097340; Thu, 19 Jan 2023 23:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30JNORWQ097339; Thu, 19 Jan 2023 23:24:27 GMT (envelope-from git) Date: Thu, 19 Jan 2023 23:24:27 GMT Message-Id: <202301192324.30JNORWQ097339@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 150ecc38226d - main - =?utf-8?Q?astro/libosmium:=20update=202.18.0=20=E2=86=92=202.19.0?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 150ecc38226d63e0ff84daad01e7bffa5060078a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=150ecc38226d63e0ff84daad01e7bffa5060078a commit 150ecc38226d63e0ff84daad01e7bffa5060078a Author: Dmitry Marakasov AuthorDate: 2023-01-19 17:30:47 +0000 Commit: Dmitry Marakasov CommitDate: 2023-01-19 23:24:09 +0000 astro/libosmium: update 2.18.0 → 2.19.0 --- astro/libosmium/Makefile | 12 +-------- astro/libosmium/distinfo | 6 ++--- .../files/patch-include_osmium_thread_util.hpp | 29 ---------------------- astro/libosmium/pkg-plist | 1 - 4 files changed, 4 insertions(+), 44 deletions(-) diff --git a/astro/libosmium/Makefile b/astro/libosmium/Makefile index bffc1d3c5cc0..6d7312472a70 100644 --- a/astro/libosmium/Makefile +++ b/astro/libosmium/Makefile @@ -1,7 +1,6 @@ PORTNAME= libosmium DISTVERSIONPREFIX= v -DISTVERSION= 2.18.0 -PORTREVISION= 1 +DISTVERSION= 2.19.0 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org @@ -38,15 +37,6 @@ OPTIONS_DEFAULT= TEST TEST_TEST_TARGET= test TEST_CMAKE_BOOL= BUILD_TESTING -post-patch: - @${FIND} ${WRKSRC} -type f \( -name "*.cpp" -o -name "*.hpp" \) \ - -not -name "memory_mapping.hpp" \ - -not -name "test_memory_mapping.cpp" \ - -not -name "test_memory.cpp" \ - -exec ${REINPLACE_CMD} \ - -e 's,^#ifdef __linux__,#if defined(__linux__) || defined(__FreeBSD__),' \ - -e 's,^#ifndef __linux__,#if !defined(__linux__) && !defined(__FreeBSD__),' {} \; - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} diff --git a/astro/libosmium/distinfo b/astro/libosmium/distinfo index ef8ec6ea88d1..a10f7d4c782f 100644 --- a/astro/libosmium/distinfo +++ b/astro/libosmium/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647270667 -SHA256 (osmcode-libosmium-v2.18.0_GH0.tar.gz) = c05a3e95c9c811521ebad8637e90f43ab8fb053b310875acce741cc4c17d6f59 -SIZE (osmcode-libosmium-v2.18.0_GH0.tar.gz) = 565862 +TIMESTAMP = 1674129193 +SHA256 (osmcode-libosmium-v2.19.0_GH0.tar.gz) = 6911a8ca8e81d49205357177982df908af11376919f93b814cccf02f1d4d63e3 +SIZE (osmcode-libosmium-v2.19.0_GH0.tar.gz) = 565486 diff --git a/astro/libosmium/files/patch-include_osmium_thread_util.hpp b/astro/libosmium/files/patch-include_osmium_thread_util.hpp deleted file mode 100644 index fd7360b76bc0..000000000000 --- a/astro/libosmium/files/patch-include_osmium_thread_util.hpp +++ /dev/null @@ -1,29 +0,0 @@ ---- include/osmium/thread/util.hpp.orig 2022-02-07 12:59:17 UTC -+++ include/osmium/thread/util.hpp -@@ -38,8 +38,10 @@ DEALINGS IN THE SOFTWARE. - #include - #include - --#ifdef __linux__ -+#if defined(__linux__) - # include -+#elif defined(__FreeBSD__) -+# include - #endif - - namespace osmium { -@@ -72,9 +74,13 @@ namespace osmium { - /** - * Set name of current thread for debugging. This only works on Linux. - */ --#ifdef __linux__ -+#if defined(__linux__) - inline void set_thread_name(const char* name) noexcept { - prctl(PR_SET_NAME, name, 0, 0, 0); -+ } -+#elif defined(__FreeBSD__) -+ inline void set_thread_name(const char* name) noexcept { -+ pthread_setname_np(pthread_self(), name); - } - #else - inline void set_thread_name(const char*) noexcept { diff --git a/astro/libosmium/pkg-plist b/astro/libosmium/pkg-plist index 6b7f4389812b..b2506aaaae57 100644 --- a/astro/libosmium/pkg-plist +++ b/astro/libosmium/pkg-plist @@ -47,7 +47,6 @@ include/osmium/handler/disk_store.hpp include/osmium/handler/dump.hpp include/osmium/handler/node_locations_for_ways.hpp include/osmium/handler/object_relations.hpp -include/osmium/index/bool_vector.hpp include/osmium/index/detail/create_map_with_fd.hpp include/osmium/index/detail/mmap_vector_anon.hpp include/osmium/index/detail/mmap_vector_base.hpp