From nobody Wed Feb 21 15:20:31 2024 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 4Tg0Mh5dwcz59ffq; Wed, 21 Feb 2024 15:20:32 +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 4Tg0Mg5Rvcz42cF; Wed, 21 Feb 2024 15:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528831; 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=WlCiYniDHlbiq0R/nX4Xh61Ih1aNzjacRhMeosGO5Us=; b=blCT40N2qKlMvHT6+gDqPjwqSdsj3n6uRGqx+CVqSVEDdM0h0lSI4wELlNXQ1oRL/pT49w ZGDedMYCGQxGXSqr9mE0Hyuc9dZST9/0KZXMAcAxtwziGUhMTdfRAUdwoow/WzeWYftNI4 b0g6IC45nxQZAeA7/8nV7oS4wyPhqxomrUjTHPtUZfZ049myxdD29N/G5JZOT4FVn4ft+7 buagNGY/w7LM8ExcE6VVDePSUDIxmyH6CQ1+WdFagWDBZrvboygsYwSXRVc9ewE0g27RYC JRL5Zyl9ZQNm/Mju7UFo/SR21UXfBZHIDyhcI7gIXYnFeoM0ra3RB50IlKEEnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528831; 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=WlCiYniDHlbiq0R/nX4Xh61Ih1aNzjacRhMeosGO5Us=; b=dcRpkL9rdbr5FhKaP9L4Bz4UFQXwFFQCGdn6aMnkIstfhoyHdOTRso4f5vm5QllISqNYek ZmzcmX7D/0XtFNLf9L/ebIrF3iiZIenTLg5yETOUCwGJlpFSVsy/JNZda+k77m8Ch/ALsZ toZV+7mo87EGDGZPluzZZgl53verglnZof229uxgCQzvylMu3tETUc2QYD+uGw3ciYQRz7 cne0CYhx4OHysizIM0KC7R4TdYbxBbpXRdPNN9DD/LvsZKdtBfNnEb1oKuvMVEb4S9+JNh A7PsXXrMBg7cPQJNbMKZrWXo04KeVEpqLMMbqYpUgi0wtAQMZnuv7zFDArAJdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708528831; a=rsa-sha256; cv=none; b=Hgsi5B2/DqIIt6BOp5SZ1Os6K5LuSCHBjbJ7Vd4DHrKdUhrle9+txPR5gmOhfmV/Ki7j6q M3vQ8hS2CSZbipen6hnkvltWRu0KUURe+34H0gn7bq6mJBoF3rxT2fJ8d08lwp6Msuk8Vn HZ0DrSjszSKsS9sxGoWJtfPUcHOhqB9wo2bZcMvzUC8mmDBrqCdECBzbJkuTzXrMz/9lvl JivqGpbCVOpFmW6zGzI3rgOFMPO9i2Rjz0HWpSV5JupYgRC7VztVypvFSGbGoIaXYhAtcn lD2sP/gOj1LCwCnI5l43mC6mKfbt5HWx48rYtfK5Z//v6NRzKmHYmBLcmJIPpQ== 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 4Tg0Mg3PwLz172V; Wed, 21 Feb 2024 15:20:31 +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 41LFKVZM028301; Wed, 21 Feb 2024 15:20:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFKV7t028298; Wed, 21 Feb 2024 15:20:31 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:20:31 GMT Message-Id: <202402211520.41LFKV7t028298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9b1ac6167139 - main - graphics/s2: Update to 0.11.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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b1ac61671399c2eed1da042e1c2c665666bf891 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b1ac61671399c2eed1da042e1c2c665666bf891 commit 9b1ac61671399c2eed1da042e1c2c665666bf891 Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 14:30:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-02-21 15:06:52 +0000 graphics/s2: Update to 0.11.0 Changes: https://github.com/google/s2geometry/releases --- graphics/s2/Makefile | 9 ++++----- graphics/s2/distinfo | 6 +++--- graphics/s2/files/patch-CMakeLists.txt | 11 ----------- graphics/s2/files/patch-gflags | 17 ----------------- .../patch-src_s2_util_math_exactfloat_exactfloat.cc | 13 ------------- graphics/s2/pkg-plist | 13 ++++++++++++- 6 files changed, 19 insertions(+), 50 deletions(-) diff --git a/graphics/s2/Makefile b/graphics/s2/Makefile index 6e2d9d9faea5..bb7c57aa5e2a 100644 --- a/graphics/s2/Makefile +++ b/graphics/s2/Makefile @@ -1,7 +1,6 @@ PORTNAME= s2 -PORTVERSION= 0.10.0 +PORTVERSION= 0.11.1 DISTVERSIONPREFIX= v -PORTREVISION= 5 CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org @@ -15,13 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= is currently 64-bit only -LIB_DEPENDS= libabsl_base.so:devel/abseil \ - libgtest.so:devel/googletest +LIB_DEPENDS= libabsl_base.so:devel/abseil USES= cmake compiler:c++17-lang localbase ssl +CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 +CMAKE_OFF= BUILD_TESTS S2_USE_SYSTEM_INCLUDES WITH_PYTHON CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= WITH_PYTHON USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/graphics/s2/distinfo b/graphics/s2/distinfo index 904934a03b44..47966dbe5f20 100644 --- a/graphics/s2/distinfo +++ b/graphics/s2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650970063 -SHA256 (google-s2geometry-v0.10.0_GH0.tar.gz) = 1c17b04f1ea20ed09a67a83151ddd5d8529716f509dde49a8190618d70532a3d -SIZE (google-s2geometry-v0.10.0_GH0.tar.gz) = 1110687 +TIMESTAMP = 1708448986 +SHA256 (google-s2geometry-v0.11.1_GH0.tar.gz) = bdbeb8ebdb88fa934257caf81bb44b55711617a3ab4fdec2c3cfd6cc31b61734 +SIZE (google-s2geometry-v0.11.1_GH0.tar.gz) = 1180820 diff --git a/graphics/s2/files/patch-CMakeLists.txt b/graphics/s2/files/patch-CMakeLists.txt deleted file mode 100644 index 914e384ef56c..000000000000 --- a/graphics/s2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2022-04-01 11:53:29 UTC -+++ CMakeLists.txt -@@ -19,7 +19,7 @@ endif() - # undefined symbol errors since ABSL_HAVE_STD_STRING_VIEW etc will - # end up defined differently. There is probably a better way to achieve - # this than assuming what absl used. --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - # No compiler-specific extensions, i.e. -std=c++11, not -std=gnu++11. - set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/graphics/s2/files/patch-gflags b/graphics/s2/files/patch-gflags deleted file mode 100644 index ca5e9a7a610f..000000000000 --- a/graphics/s2/files/patch-gflags +++ /dev/null @@ -1,17 +0,0 @@ ---- src/s2/base/commandlineflags.h.orig 2022-04-01 11:53:29 UTC -+++ src/s2/base/commandlineflags.h -@@ -44,10 +44,10 @@ - - // gflags has its own int32 definitions. - namespace absl { --inline int32 GetFlag(google::int32 flag) { return flag; } --inline int64 GetFlag(google::int64 flag) { return flag; } --inline void SetFlag(google::int32* f, google::int32 v) { *f = v; } --inline void SetFlag(google::int64* f, google::int64 v) { *f = v; } -+inline int32 GetFlag(gflags::int32 flag) { return flag; } -+inline int64 GetFlag(gflags::int64 flag) { return flag; } -+inline void SetFlag(gflags::int32* f, gflags::int32 v) { *f = v; } -+inline void SetFlag(gflags::int64* f, gflags::int64 v) { *f = v; } - } // namespace absl - - #else // !defined(S2_USE_GFLAGS) diff --git a/graphics/s2/files/patch-src_s2_util_math_exactfloat_exactfloat.cc b/graphics/s2/files/patch-src_s2_util_math_exactfloat_exactfloat.cc deleted file mode 100644 index 111df840b8f0..000000000000 --- a/graphics/s2/files/patch-src_s2_util_math_exactfloat_exactfloat.cc +++ /dev/null @@ -1,13 +0,0 @@ -Reference: https://github.com/google/s2geometry/commit/7a40135059545396237a0199c558d749fe3be0b1 - ---- src/s2/util/math/exactfloat/exactfloat.cc.orig 2022-05-24 22:12:24 UTC -+++ src/s2/util/math/exactfloat/exactfloat.cc -@@ -141,7 +141,7 @@ inline static uint64 BN_ext_get_uint64(const BIGNUM* b - #ifdef IS_LITTLE_ENDIAN - S2_CHECK_EQ(BN_bn2lebinpad(bn, reinterpret_cast(&r), - sizeof(r)), sizeof(r)); --#elif IS_BIG_ENDIAN -+#elif defined(IS_BIG_ENDIAN) - S2_CHECK_EQ(BN_bn2binpad(bn, reinterpret_cast(&r), - sizeof(r)), sizeof(r)); - #else diff --git a/graphics/s2/pkg-plist b/graphics/s2/pkg-plist index 0ff8f9d4bad7..05ce02b516ed 100644 --- a/graphics/s2/pkg-plist +++ b/graphics/s2/pkg-plist @@ -1,6 +1,7 @@ include/s2/_fp_contract_off.h include/s2/base/casts.h include/s2/base/commandlineflags.h +include/s2/base/commandlineflags_declare.h include/s2/base/integral_types.h include/s2/base/log_severity.h include/s2/base/logging.h @@ -40,6 +41,9 @@ include/s2/s2cap.h include/s2/s2cell.h include/s2/s2cell_id.h include/s2/s2cell_index.h +include/s2/s2cell_iterator.h +include/s2/s2cell_iterator_join.h +include/s2/s2cell_range_iterator.h include/s2/s2cell_union.h include/s2/s2centroids.h include/s2/s2closest_cell_query.h @@ -48,6 +52,7 @@ include/s2/s2closest_edge_query.h include/s2/s2closest_edge_query_base.h include/s2/s2closest_point_query.h include/s2/s2closest_point_query_base.h +include/s2/s2coder.h include/s2/s2contains_point_query.h include/s2/s2contains_vertex_query.h include/s2/s2convex_hull_query.h @@ -66,6 +71,7 @@ include/s2/s2edge_tessellator.h include/s2/s2edge_vector_shape.h include/s2/s2error.h include/s2/s2furthest_edge_query.h +include/s2/s2hausdorff_distance_query.h include/s2/s2latlng.h include/s2/s2latlng_rect.h include/s2/s2latlng_rect_bounder.h @@ -106,6 +112,7 @@ include/s2/s2shape_index.h include/s2/s2shape_index_buffered_region.h include/s2/s2shape_index_region.h include/s2/s2shape_measures.h +include/s2/s2shape_nesting_query.h include/s2/s2shapeutil_build_polygon_boundaries.h include/s2/s2shapeutil_coding.h include/s2/s2shapeutil_contains_brute_force.h @@ -113,7 +120,6 @@ include/s2/s2shapeutil_conversion.h include/s2/s2shapeutil_count_edges.h include/s2/s2shapeutil_edge_iterator.h include/s2/s2shapeutil_get_reference_point.h -include/s2/s2shapeutil_range_iterator.h include/s2/s2shapeutil_shape_edge.h include/s2/s2shapeutil_shape_edge_id.h include/s2/s2shapeutil_testing.h @@ -124,7 +130,9 @@ include/s2/s2wedge_relations.h include/s2/s2winding_operation.h include/s2/s2wrapped_shape.h include/s2/sequence_lexicon.h +include/s2/testing/gtest_prod.h include/s2/thread_testing.h +include/s2/util/bitmap/bitmap.h include/s2/util/bits/bits.h include/s2/util/coding/coder.h include/s2/util/coding/varint.h @@ -147,3 +155,6 @@ lib/libs2.so.0 lib/libs2.so.%%PORTVERSION%% %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point_index.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/term_index.cc +%%DATADIR%%/s2Config.cmake +%%DATADIR%%/s2Targets-%%CMAKE_BUILD_TYPE%%.cmake +%%DATADIR%%/s2Targets.cmake