From nobody Tue Apr 26 15:04:36 2022 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 70A74199D1DE; Tue, 26 Apr 2022 15:04:39 +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 4KnlXj1Q51z3Qy3; Tue, 26 Apr 2022 15:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650985479; 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=GMlY1qH7VJEcP3myg2hDbRSZMy5HXtz73pkjRWgfdl8=; b=H5EMoq4VfBf+eO8cZHYbobPE4QjnT5ckCGtYOXlXyOsoxsdU9e4FLhFmS7bcyi5ysT2IIA dHBXOkG2XvOvk5Ucy+B3uDBzBCC1kdLVlA/2a8tg45sc5dhDT8n+DFmf58WLl595vtWSxL 8JhMe/0FXJ+ZbYEib3x9/JJvLOXw6FsmWCp1+49E9AqLcx1kAFZQoc/Wkx1L1ZMRXJm0/u afIhZ67GTiOLysHtZ/ZhQYutTnjBjJqhpAHqHqlcUKYpLNpnFFG+4aKfbfZCUT7jP9eVyk Q68aWa1DjNFx982SJm0w2uGF0Rnngb2FZ3Cu0//E0D0PEqAlu9n++QacegY5Aw== 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 F319F11471; Tue, 26 Apr 2022 15:04:36 +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 23QF4aR0037884; Tue, 26 Apr 2022 15:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QF4at0037883; Tue, 26 Apr 2022 15:04:36 GMT (envelope-from git) Date: Tue, 26 Apr 2022 15:04:36 GMT Message-Id: <202204261504.23QF4at0037883@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: a8569ebf8447 - main - graphics/s2: Update to 0.10.0 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8569ebf844723fb3805b730eeac8971c523b692 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650985479; 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=GMlY1qH7VJEcP3myg2hDbRSZMy5HXtz73pkjRWgfdl8=; b=Q0Mzn+GXuGDVpCHOl0/biYkFxd+JnE/x93NwSiSWgaYRS+BwUEFt/m/YFUMfBh8s346by/ GpUSZ6oxaKpCDjXv2CYo7Vfyxbn9DQgFX8CSaxgntL9bftkGkZP/7/So4D82qfrWB9ul9N Ketry6ebmQQz57n5xRVuYEnkgXAm3uyCV1JoRVatV0iMthY+GjgviLm6TyzOE3fq9ZjK9v LOnCtn2yMWBczxSK+htmMF5WvV3Ukk2CJS96Mx6KXIWP7DW1ER4w6F+80t9M0wbZRbG86t FJqyB1N8S076WU1jgnau6GK2qZMd3myoMKPeIYnXEmodk2vD9BRfDuTC5MINdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650985479; a=rsa-sha256; cv=none; b=fETjzVMyiTeA3+/T2hJwjeZzpReKVUuHRxgll0wGpeSf8YoXqX4iWOL/CkWb80x6idhdUj 9VtIrEPodc8ON1w/NVE7lGq86/1Vr6bfFgh5LwnmdYuqPpnOHJQzuQIUnlDknL/eY+/Ilp 91fiG07eFVCu55J9qIqXVVrn8QoYZJDAaWipAtElDFIJpdJH6640/xqmrlXasecQOGvNHp daPzzNcykjqlKAVpfp1E4P5EpjMvQLrm+QxnYZjy2iy3/reLt11x8DBAIbMPPrNzxVXEzh s/+xiv1RAomuLl6fvRyjDb+1KZqgAOe9qDqJH/E5CCcuK2fhACr/7CGHmsZTog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8569ebf844723fb3805b730eeac8971c523b692 commit a8569ebf844723fb3805b730eeac8971c523b692 Author: Po-Chuan Hsieh AuthorDate: 2022-04-26 14:53:04 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-26 15:01:16 +0000 graphics/s2: Update to 0.10.0 Changes: https://github.com/google/s2geometry/releases --- graphics/s2/Makefile | 11 +++-- graphics/s2/distinfo | 6 +-- graphics/s2/files/patch-CMakeLists.txt | 30 ------------ graphics/s2/files/patch-gflags | 17 +++++++ ...ird_party-absl-base-internal-unaligned_access.h | 22 --------- graphics/s2/pkg-plist | 54 ++++++---------------- 6 files changed, 40 insertions(+), 100 deletions(-) diff --git a/graphics/s2/Makefile b/graphics/s2/Makefile index 6f00c3c4821c..23223ad64079 100644 --- a/graphics/s2/Makefile +++ b/graphics/s2/Makefile @@ -1,9 +1,8 @@ # Created by: Po-Chuan Hsieh PORTNAME= s2 -PORTVERSION= 0.9.0 +PORTVERSION= 0.10.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org @@ -15,13 +14,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= is currently 64-bit only -LIB_DEPENDS= libgtest.so:devel/googletest +LIB_DEPENDS= libabsl_base.so:devel/abseil \ + libgtest.so:devel/googletest USES= cmake compiler:c++11-lang localbase ssl CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= WITH_PYTHON +USE_CXXSTD= c++11 USE_LDCONFIG= yes +PLIST_SUB= PORTVERSION=${PORTVERSION} + GH_ACCOUNT= google GH_PROJECT= s2geometry USE_GITHUB= yes @@ -45,7 +49,6 @@ CXXFLAGS+= -mcpu=power7 post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/examples/point_index ${INSTALL_WRKSRC}/examples/term_index ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/examples/point_index.cc ${WRKSRC}/doc/examples/term_index.cc ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/graphics/s2/distinfo b/graphics/s2/distinfo index 5a5d086bbe8b..904934a03b44 100644 --- a/graphics/s2/distinfo +++ b/graphics/s2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1599729119 -SHA256 (google-s2geometry-v0.9.0_GH0.tar.gz) = 54c09b653f68929e8929bffa60ea568e26f3b4a51e1b1734f5c3c037f1d89062 -SIZE (google-s2geometry-v0.9.0_GH0.tar.gz) = 1124554 +TIMESTAMP = 1650970063 +SHA256 (google-s2geometry-v0.10.0_GH0.tar.gz) = 1c17b04f1ea20ed09a67a83151ddd5d8529716f509dde49a8190618d70532a3d +SIZE (google-s2geometry-v0.10.0_GH0.tar.gz) = 1110687 diff --git a/graphics/s2/files/patch-CMakeLists.txt b/graphics/s2/files/patch-CMakeLists.txt deleted file mode 100644 index ac0f59421c56..000000000000 --- a/graphics/s2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ ---- CMakeLists.txt.orig 2019-03-04 16:53:16 UTC -+++ CMakeLists.txt -@@ -61,9 +61,6 @@ endif() - find_package(OpenSSL REQUIRED) - # pthreads isn't used directly, but this is still required for std::thread. - find_package(Threads REQUIRED) --find_package(SWIG) --find_package(PythonInterp) --find_package(PythonLibs) - - if (WIN32) - # Use unsigned characters -@@ -86,7 +83,7 @@ endif() - # OPENSSL_ROOT_DIR=/usr/local/opt/openssl cmake .. - include_directories( - ${GFLAGS_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} -- ${PYTHON_INCLUDE_DIRS}) -+) - include_directories(src) - - add_library(s2 -@@ -529,8 +526,4 @@ endif() - - if (BUILD_EXAMPLES) - add_subdirectory("doc/examples" examples) --endif() -- --if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND}) -- add_subdirectory("src/python" python) - endif() diff --git a/graphics/s2/files/patch-gflags b/graphics/s2/files/patch-gflags new file mode 100644 index 000000000000..ca5e9a7a610f --- /dev/null +++ b/graphics/s2/files/patch-gflags @@ -0,0 +1,17 @@ +--- 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-third_party-absl-base-internal-unaligned_access.h b/graphics/s2/files/patch-src-s2-third_party-absl-base-internal-unaligned_access.h deleted file mode 100644 index 840e7c6f4c66..000000000000 --- a/graphics/s2/files/patch-src-s2-third_party-absl-base-internal-unaligned_access.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/s2/third_party/absl/base/internal/unaligned_access.h.orig 2020-11-11 19:42:32 UTC -+++ src/s2/third_party/absl/base/internal/unaligned_access.h -@@ -286,8 +286,8 @@ inline uint32_t UnalignedLoad32(const void *p) { - return t; - } - --inline uint64 UnalignedLoad64(const void *p) { -- uint64 t; -+inline uint64_t UnalignedLoad64(const void *p) { -+ uint64_t t; - memcpy(&t, p, sizeof t); - return t; - } -@@ -296,7 +296,7 @@ inline void UnalignedStore16(void *p, uint16_t v) { me - - inline void UnalignedStore32(void *p, uint32_t v) { memcpy(p, &v, sizeof v); } - --inline void UnalignedStore64(void *p, uint64 v) { memcpy(p, &v, sizeof v); } -+inline void UnalignedStore64(void *p, uint64_t v) { memcpy(p, &v, sizeof v); } - - } // namespace base_internal - } // namespace absl diff --git a/graphics/s2/pkg-plist b/graphics/s2/pkg-plist index f4a3d7a0b732..0ff8f9d4bad7 100644 --- a/graphics/s2/pkg-plist +++ b/graphics/s2/pkg-plist @@ -4,7 +4,6 @@ include/s2/base/commandlineflags.h include/s2/base/integral_types.h include/s2/base/log_severity.h include/s2/base/logging.h -include/s2/base/mutex.h include/s2/base/port.h include/s2/base/spinlock.h include/s2/encoded_s2cell_id_vector.h @@ -21,13 +20,16 @@ include/s2/s1angle.h include/s2/s1chord_angle.h include/s2/s1interval.h include/s2/s2boolean_operation.h +include/s2/s2buffer_operation.h include/s2/s2builder.h include/s2/s2builder_graph.h include/s2/s2builder_layer.h include/s2/s2builderutil_closed_set_normalizer.h include/s2/s2builderutil_find_polygon_degeneracies.h +include/s2/s2builderutil_get_snapped_winding_delta.h include/s2/s2builderutil_graph_shape.h include/s2/s2builderutil_lax_polygon_layer.h +include/s2/s2builderutil_lax_polyline_layer.h include/s2/s2builderutil_s2point_vector_layer.h include/s2/s2builderutil_s2polygon_layer.h include/s2/s2builderutil_s2polyline_layer.h @@ -58,6 +60,7 @@ include/s2/s2earth.h include/s2/s2edge_clipping.h include/s2/s2edge_crosser.h include/s2/s2edge_crossings.h +include/s2/s2edge_crossings_internal.h include/s2/s2edge_distances.h include/s2/s2edge_tessellator.h include/s2/s2edge_vector_shape.h @@ -73,6 +76,7 @@ include/s2/s2loop.h include/s2/s2loop_measures.h include/s2/s2max_distance_targets.h include/s2/s2measures.h +include/s2/s2memory_tracker.h include/s2/s2metrics.h include/s2/s2min_distance_targets.h include/s2/s2padded_cell.h @@ -89,6 +93,7 @@ include/s2/s2polyline_alignment.h include/s2/s2polyline_measures.h include/s2/s2polyline_simplifier.h include/s2/s2predicates.h +include/s2/s2predicates_internal.h include/s2/s2projections.h include/s2/s2r2rect.h include/s2/s2region.h @@ -104,6 +109,7 @@ include/s2/s2shape_measures.h include/s2/s2shapeutil_build_polygon_boundaries.h include/s2/s2shapeutil_coding.h include/s2/s2shapeutil_contains_brute_force.h +include/s2/s2shapeutil_conversion.h include/s2/s2shapeutil_count_edges.h include/s2/s2shapeutil_edge_iterator.h include/s2/s2shapeutil_get_reference_point.h @@ -115,63 +121,29 @@ include/s2/s2shapeutil_visit_crossing_edge_pairs.h include/s2/s2testing.h include/s2/s2text_format.h include/s2/s2wedge_relations.h +include/s2/s2winding_operation.h +include/s2/s2wrapped_shape.h include/s2/sequence_lexicon.h -include/s2/strings/ostringstream.h -include/s2/third_party/absl/algorithm/algorithm.h -include/s2/third_party/absl/base/attributes.h -include/s2/third_party/absl/base/casts.h -include/s2/third_party/absl/base/config.h -include/s2/third_party/absl/base/dynamic_annotations.h -include/s2/third_party/absl/base/internal/identity.h -include/s2/third_party/absl/base/internal/inline_variable.h -include/s2/third_party/absl/base/internal/invoke.h -include/s2/third_party/absl/base/internal/throw_delegate.h -include/s2/third_party/absl/base/internal/unaligned_access.h -include/s2/third_party/absl/base/log_severity.h -include/s2/third_party/absl/base/macros.h -include/s2/third_party/absl/base/optimization.h -include/s2/third_party/absl/base/policy_checks.h -include/s2/third_party/absl/base/port.h -include/s2/third_party/absl/base/thread_annotations.h -include/s2/third_party/absl/container/inlined_vector.h -include/s2/third_party/absl/container/internal/compressed_tuple.h -include/s2/third_party/absl/container/internal/container_memory.h -include/s2/third_party/absl/container/internal/layout.h -include/s2/third_party/absl/memory/memory.h -include/s2/third_party/absl/meta/type_traits.h -include/s2/third_party/absl/numeric/int128.h -include/s2/third_party/absl/numeric/int128_have_intrinsic.inc -include/s2/third_party/absl/numeric/int128_no_intrinsic.inc -include/s2/third_party/absl/strings/numbers.h -include/s2/third_party/absl/strings/str_cat.h -include/s2/third_party/absl/strings/string_view.h -include/s2/third_party/absl/types/span.h -include/s2/third_party/absl/utility/utility.h +include/s2/thread_testing.h include/s2/util/bits/bits.h include/s2/util/coding/coder.h include/s2/util/coding/varint.h include/s2/util/endian/endian.h -include/s2/util/gtl/btree.h -include/s2/util/gtl/btree_container.h -include/s2/util/gtl/btree_map.h -include/s2/util/gtl/btree_set.h include/s2/util/gtl/compact_array.h include/s2/util/gtl/container_logging.h include/s2/util/gtl/dense_hash_set.h include/s2/util/gtl/densehashtable.h include/s2/util/gtl/hashtable_common.h -include/s2/util/gtl/layout.h include/s2/util/hash/mix.h +include/s2/util/math/exactfloat/exactfloat.h include/s2/util/math/mathutil.h include/s2/util/math/matrix3x3.h include/s2/util/math/vector.h -include/s2/util/math/vector3_hash.h include/s2/util/units/length-units.h include/s2/util/units/physical-units.h include/s2/value_lexicon.h lib/libs2.so -lib/libs2testing.a -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point_index +lib/libs2.so.0 +lib/libs2.so.%%PORTVERSION%% %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point_index.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/term_index %%PORTEXAMPLES%%%%EXAMPLESDIR%%/term_index.cc