From nobody Tue Mar 12 20:41:20 2024 X-Original-To: dev-commits-ports-main@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 4TvQXd3LRwz5FS58; Tue, 12 Mar 2024 20:41:21 +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 4TvQXc49v8z4Y4N; Tue, 12 Mar 2024 20:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710276080; 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=bk3t5+bx6idEruJ02eOtNNBFR8glfC0XW5r9qrnxCh8=; b=vT5WFQGegRhdrIQexjYiLAF3VvAsLfyM8b5qHgES1dQGJf+N84OasrwuG5HXZNmH2c8Z7N J5nHeI9EHJEUhXwUD0FoM+wRkFPw7cLWB0WmlLCGYlevcR2v7XcDlEFdYUHnwdscVjD28E kG19UPizo/CH5Wlu41w/K3O4IZA4ovrpthbj49DEpDARslfZy9CZNOQ5iMsJooo2RDHnGy mIFa85+mggBpThPUT2aqfwpnmJec6mbTb/XFEXA6jwGxPWO25g62wbE+HF2GxjPKksyS51 i1mAy5/rbQtQZEifgntQC9v6SRRtixhHMjCKj+rRSjW1oKkDx+u5Td2gMjLjpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710276080; a=rsa-sha256; cv=none; b=mKqI+VlMMKGwOF8ICzZsi0+CTSFzYaopPD+lz60sipqT6livJ4ocgV9x9lIjgCnmeizowy fUFP2Hf9htO5+TZOdi3FJSEjQW8qUzlep/UlRfURgmvlCJsd7c7NUKDQ+h/kmmVNE2hj18 5GwTxxKHz1eO0jv9NbT5seveUPwnyiixorr4C6foi/Ad/9DftLoP0Vx4LkhJTItOHThFsa nkvZuYbPbnD/lm64eiMy7AcDWSPGDJn7+YYVJyMy+5uu/CshYDN9vfdp8JCHFO/2I2rjJj KVNYJtTMBiLQjQ/E55zEV7MdDrJmGwUPvFxSkUxEMSEkUFtI4EcMZ3vhiwyBJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710276080; 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=bk3t5+bx6idEruJ02eOtNNBFR8glfC0XW5r9qrnxCh8=; b=eQoi4adSuLTXJJTSs1wiuwupNISxOWwKZrUe6NrJJH938yzMWjZQIe/yfpZR2QmmNwawy/ Qg6LnEKco9gpyT0VhZz/3q+448PLNdRHbSAvmQDA3lnQb8DrVtFAnJLPX3ZSqg3hDDofgc J6olpBl+MU4D5xohQlsQLQ19r5TJL1xsr/A95Jo0YDhTdW5qTNE/AWpzkS1lZPzXTMCWK1 ksdYVQ4HpHlKvGsRa2953zOtBJFCd66K4Oqf2P3dF5cVHJsnr7XSe+bTsSwu0UUZ+H6aey mT6afTolZyxclIvaC45j45vqCbrtsODoVighMBEEJMnz3mvxEs0YlXyqrgKQeQ== 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 4TvQXc3nzXzDk2; Tue, 12 Mar 2024 20:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42CKfKGU086294; Tue, 12 Mar 2024 20:41:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42CKfK50086291; Tue, 12 Mar 2024 20:41:20 GMT (envelope-from git) Date: Tue, 12 Mar 2024 20:41:20 GMT Message-Id: <202403122041.42CKfK50086291@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: 11bc1fbfd944 - main - astro/libosmpbf: update 1.5.0 =?utf-8?Q?=E2=86=92?= 1.5.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 11bc1fbfd94400438926acaa1f8a99692a2cf1da Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=11bc1fbfd94400438926acaa1f8a99692a2cf1da commit 11bc1fbfd94400438926acaa1f8a99692a2cf1da Author: Dmitry Marakasov AuthorDate: 2024-03-12 17:28:32 +0000 Commit: Dmitry Marakasov CommitDate: 2024-03-12 20:41:06 +0000 astro/libosmpbf: update 1.5.0 → 1.5.1 --- astro/libosmpbf/Makefile | 11 ++++------- astro/libosmpbf/distinfo | 6 +++--- astro/libosmpbf/files/patch-osmpbf_CMakeLists.txt | 18 ++++++++++++++++++ astro/libosmpbf/files/patch-protobuf | 11 ----------- astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp | 14 -------------- 5 files changed, 25 insertions(+), 35 deletions(-) diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile index 9f44c474b3a5..d7fc8f4aa2c6 100644 --- a/astro/libosmpbf/Makefile +++ b/astro/libosmpbf/Makefile @@ -1,23 +1,20 @@ PORTNAME= libosmpbf -PORTVERSION= 1.5.0 +PORTVERSION= 1.5.1 DISTVERSIONPREFIX= v -PORTREVISION= 6 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org COMMENT= Library for handling binary OpenStreetMap data -WWW= https://github.com/scrosby/OSM-binary +WWW= https://github.com/openstreetmap/OSM-binary LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libprotobuf.so:devel/protobuf +USES= cmake compiler:c++17-lang USE_GITHUB= yes -GH_ACCOUNT= scrosby +GH_ACCOUNT= openstreetmap GH_PROJECT= OSM-binary -USES= cmake compiler:c++17-lang -USE_CXXSTD= c++17 - .include diff --git a/astro/libosmpbf/distinfo b/astro/libosmpbf/distinfo index add620c80b51..b4a15943754c 100644 --- a/astro/libosmpbf/distinfo +++ b/astro/libosmpbf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611339100 -SHA256 (scrosby-OSM-binary-v1.5.0_GH0.tar.gz) = 2abf3126729793732c3380763999cc365e51bffda369a008213879a3cd90476c -SIZE (scrosby-OSM-binary-v1.5.0_GH0.tar.gz) = 47543 +TIMESTAMP = 1710262124 +SHA256 (openstreetmap-OSM-binary-v1.5.1_GH0.tar.gz) = 183ad76c5905c7abd35d938824320ffb82d9ca8987796018f2da8380b51cdac2 +SIZE (openstreetmap-OSM-binary-v1.5.1_GH0.tar.gz) = 47100 diff --git a/astro/libosmpbf/files/patch-osmpbf_CMakeLists.txt b/astro/libosmpbf/files/patch-osmpbf_CMakeLists.txt new file mode 100644 index 000000000000..a752f13d9fe8 --- /dev/null +++ b/astro/libosmpbf/files/patch-osmpbf_CMakeLists.txt @@ -0,0 +1,18 @@ +--- osmpbf/CMakeLists.txt.orig 2024-03-11 08:26:22 UTC ++++ osmpbf/CMakeLists.txt +@@ -1,13 +1,13 @@ add_library(osmpbf STATIC ${CPPS}) + protobuf_generate_cpp(CPPS HS fileformat.proto osmformat.proto) + + add_library(osmpbf STATIC ${CPPS}) +-target_compile_features(osmpbf PUBLIC cxx_std_11) ++target_compile_features(osmpbf PUBLIC cxx_std_17) + target_link_libraries(osmpbf PRIVATE protobuf::libprotobuf) + target_include_directories(osmpbf SYSTEM PUBLIC ${Protobuf_INCLUDE_DIRS}) + install(TARGETS osmpbf ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + add_library(osmpbf_shared SHARED ${CPPS}) +-target_compile_features(osmpbf_shared PUBLIC cxx_std_11) ++target_compile_features(osmpbf_shared PUBLIC cxx_std_17) + target_link_libraries(osmpbf_shared PRIVATE protobuf::libprotobuf) + target_include_directories(osmpbf_shared SYSTEM PUBLIC ${Protobuf_INCLUDE_DIRS}) + set_target_properties(osmpbf_shared PROPERTIES OUTPUT_NAME osmpbf diff --git a/astro/libosmpbf/files/patch-protobuf b/astro/libosmpbf/files/patch-protobuf deleted file mode 100644 index 499906ee3407..000000000000 --- a/astro/libosmpbf/files/patch-protobuf +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2021-01-06 13:47:22 UTC -+++ CMakeLists.txt -@@ -4,7 +4,7 @@ project(osmpbf VERSION 1.5.0) - - include(GNUInstallDirs) - --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - - find_package(Protobuf REQUIRED) - diff --git a/astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp b/astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp deleted file mode 100644 index e9af1e2226d6..000000000000 --- a/astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/osmpbf-outline.cpp.orig 2021-01-06 13:47:22 UTC -+++ tools/osmpbf-outline.cpp -@@ -10,6 +10,11 @@ - // zlib compression is used inside the pbf blobs - #include - -+#ifndef WIN32 -+ // used for isatty -+ #include -+#endif -+ - // netinet or winsock2 provides the network-byte-order conversion function - #ifdef D_HAVE_WINSOCK - #include