From nobody Tue Apr 26 15:04:38 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 9D635199D3C2; Tue, 26 Apr 2022 15:04:38 +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 4KnlXk2G23z3Qsc; Tue, 26 Apr 2022 15:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650985478; 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=+m3FdkpGW/eQOifh5T1UE7T7SoX/zHAQF/BAqPQmh6A=; b=dv5DWMIfjaUkQHe1bEavHXdRJWK7oIW08bCvhpoUqwjB+WIsop/jROlj+3Ft//fKFuAoqH ljIf8iGxyPC6JeoEvSPM+thbRPkg3RkEgF83rjnaDmxt74QM7/t34DRu0c1wMBySAaQv1g ZyFD/s5XPatu1As2KNGHBk0QTqd8kaYvdbsCkOBqP00ViNV/C3LSm6RGsIZSVqodEbbLjn VTuV1Qfizl8AGBYqm3KW+KB5CXkX50CoD4GyW7T/CCVURV6LjOJrnBJIN2GoMjcHhUZlL5 Zdbvz41XltjSbDg2sliexpV+EcgLLa103jLK7Dz8TVVvK1gaWmahuHzwQmQJnA== 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 1F1CE11472; Tue, 26 Apr 2022 15:04:38 +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 23QF4cDM037908; Tue, 26 Apr 2022 15:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QF4cEM037907; Tue, 26 Apr 2022 15:04:38 GMT (envelope-from git) Date: Tue, 26 Apr 2022 15:04:38 GMT Message-Id: <202204261504.23QF4cEM037907@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: 476d3a4e0e31 - main - graphics/py-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: 476d3a4e0e31ad2d8422d85d7ab42740191500f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650985478; 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=+m3FdkpGW/eQOifh5T1UE7T7SoX/zHAQF/BAqPQmh6A=; b=FbZPKgWSo1ZAa/lcC3b9hbnm1iNLUEdHaF00YBVC76jDO5rM9MB22qsSB5B0SqttEnJDPV yJIXleJ1exhGra37V8ro9+UaW0fYyNd23ie9PMOPq7P0GI2EwU4czZRAz6rmExmb7U4mHg anpspvZWK2oLnJ4uBkEgZOiP3YXhRDg/FAe2LeByPVs604fiVcoORA160ak5QtMxFPTv+D 9McVciWMWDJhIQt2CIkGjLJy9KIkvDe/ZBziPllipebTvp4aO7MTwsXWodYmLal6bicdED PYBgrZM5syy29/0XNDFlOBTQxRhrk8P20FKNSNevY8VMMv8KC7QYmM694JIaSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650985478; a=rsa-sha256; cv=none; b=FspaYL1yzUl95Be66kcSVbvkY0/pWycGiGD59yrZ79KwabTCYvAv4yNzdG9V4NMWFWDrOl uaz5BxR3d2zo8oN/WL6noHDMoUW0as3U1X98JNGt57pu5WJXHkrjRlvN68NzJskpocLQ+u 0/k3dSO7RO2QTsvvNpcs0Fz9qzTBYoUz+9fxVUvOIZQYRadwj/a5b0869hsv1XG7mezmr4 JS6fuSnVLXvL5iKkEMjyoDisi6V6GFAmcNvEZSfyZBOnLML7e3vCO3a44arlC7LgrCiX++ o0AD/GTWs1l2BlteKLtWGfzj8f+gDU2JMTx4ja7IaBWAj/8B2vVoS/W5uqNNcQ== 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=476d3a4e0e31ad2d8422d85d7ab42740191500f2 commit 476d3a4e0e31ad2d8422d85d7ab42740191500f2 Author: Po-Chuan Hsieh AuthorDate: 2022-04-26 14:53:06 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-26 15:01:17 +0000 graphics/py-s2: Update to 0.10.0 Changes: https://github.com/google/s2geometry/releases --- graphics/py-s2/Makefile | 6 +++--- graphics/py-s2/distinfo | 6 +++--- graphics/py-s2/files/patch-CMakeLists.txt | 33 +++++++++++++++---------------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/graphics/py-s2/Makefile b/graphics/py-s2/Makefile index 854e830cb985..a204257139ab 100644 --- a/graphics/py-s2/Makefile +++ b/graphics/py-s2/Makefile @@ -1,8 +1,7 @@ # Created by: Po-Chuan Hsieh PORTNAME= s2 -PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTVERSION= 0.10.0 DISTVERSIONPREFIX= v CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,11 +13,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/../../LICENSE BUILD_DEPENDS= s2>=${PORTVERSION}:graphics/s2 \ - swig:devel/swig + swig>=4:devel/swig LIB_DEPENDS= libs2.so:graphics/s2 USES= cmake compiler:c++11-lang localbase:ldflags python +CMAKE_ON= WITH_PYTHON WRKSRC_SUBDIR= src/python GH_ACCOUNT= google diff --git a/graphics/py-s2/distinfo b/graphics/py-s2/distinfo index 5a5d086bbe8b..9ac8ed9cf19f 100644 --- a/graphics/py-s2/distinfo +++ b/graphics/py-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 = 1650970065 +SHA256 (google-s2geometry-v0.10.0_GH0.tar.gz) = 1c17b04f1ea20ed09a67a83151ddd5d8529716f509dde49a8190618d70532a3d +SIZE (google-s2geometry-v0.10.0_GH0.tar.gz) = 1110687 diff --git a/graphics/py-s2/files/patch-CMakeLists.txt b/graphics/py-s2/files/patch-CMakeLists.txt index d6cf99fe37dc..8d599c991b79 100644 --- a/graphics/py-s2/files/patch-CMakeLists.txt +++ b/graphics/py-s2/files/patch-CMakeLists.txt @@ -1,35 +1,34 @@ ---- CMakeLists.txt.orig 2019-03-04 16:53:16 UTC +--- CMakeLists.txt.orig 2022-04-01 11:53:29 UTC +++ CMakeLists.txt -@@ -1,5 +1,15 @@ -+cmake_minimum_required(VERSION 3.5) +@@ -1,5 +1,18 @@ ++cmake_minimum_required(VERSION 3.12) + +project(s2-geometry) + +find_path(S2_INCLUDE_DIR s2/s2cell.h) + -+find_package(SWIG) -+find_package(PythonInterp) -+find_package(PythonLibs) ++# Should be easy to make it work with swig3, but some args to %pythonprepend ++# seem to be different and were changed. ++find_package(SWIG 4.0) ++# Use Python3_ROOT_DIR to help find python3, if the correct location is not ++# being found by default. ++find_package(Python3 COMPONENTS Interpreter Development) + include(${SWIG_USE_FILE}) --include_directories(${PYTHON_INCLUDE_PATH}) -+include_directories(${S2_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH}) +-include_directories(${Python3_INCLUDE_DIRS}) ++include_directories(${S2_INCLUDE_DIR} ${Python3_INCLUDE_DIRS}) set(CMAKE_SWIG_FLAGS "") set_property(SOURCE s2.i PROPERTY SWIG_FLAGS "-module" "pywraps2") -@@ -18,7 +28,7 @@ add_test(NAME pywraps2_test COMMAND - ${PYTHON_EXECUTABLE} - "${PROJECT_SOURCE_DIR}/src/python/pywraps2_test.py") +@@ -13,9 +26,9 @@ add_test(NAME pywraps2_test COMMAND + ${Python3_EXECUTABLE} + "${PROJECT_SOURCE_DIR}/src/python/pywraps2_test.py") set_property(TEST pywraps2_test PROPERTY ENVIRONMENT - "PYTHONPATH=$ENV{PYTHONPATH}:${PROJECT_BINARY_DIR}/python") + "PYTHONPATH=$ENV{PYTHONPATH}:${PROJECT_BINARY_DIR}") - execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "if True: - from distutils import sysconfig as sc; -@@ -28,5 +38,5 @@ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "if - # Install the wrapper. - install(TARGETS _pywraps2 DESTINATION ${PYTHON_SITE}) + install(TARGETS _pywraps2 DESTINATION ${Python3_SITELIB}) -install(FILES "${PROJECT_BINARY_DIR}/python/pywraps2.py" +install(FILES "${PROJECT_BINARY_DIR}/pywraps2.py" - DESTINATION ${PYTHON_SITE}) + DESTINATION ${Python3_SITELIB})