From nobody Wed Feb 21 15:20:32 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 4Tg0Mj3KZwz59fjB; Wed, 21 Feb 2024 15:20:33 +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 4Tg0Mh5fTdz42Yc; Wed, 21 Feb 2024 15:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528832; 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=L9B8kgi/5EKi9wkAYb2v0YXNVwz/5guisCQBQb0m9G8=; b=ZEFnfVGYeMT9uv9oTQXiWnB9Idv/8RuwR63k2gXutySuvljsT+do+lwfnNtwwmuD2sAPad h05zA3RyZMG0Q93kEPLuSkPHBUVjgiZZXsDzxuhbkFM0l4DveFmnT89soO+ksnQF8uIgdp YjHWl5EeqBbSpuSLb3GwQpDjR7ouacoBV6m+M3Il+qTgj/CFaW5icZgx7dqNo4iXLakRaC bN2qLNQN26eUzynju9dRZSNcWk4GecJyHdKqcJhUSxlPZqLvIf/514OLab/rP/kGQdK/Ko g5+Oh0sbsKPOd5uhKhWk2FtwulOz46o3ryKAVCL8bYoqkVcUPuINcd4eBZVVpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528832; 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=L9B8kgi/5EKi9wkAYb2v0YXNVwz/5guisCQBQb0m9G8=; b=vKds1mpot0nWaO35yhnz3QPfcSUHpGk1vV5zGhOXbGIAV7+Cl9XPQk/ZxpElt5agFJceKp sYnrEsfmq6XRKweDZspYJsgJfBH0KTjwqc48MDoDgOM1cqtmex5B6RCD4MgYccUM6X7ILM Qg1PBuG3tC1vMIfoiZe4KmaONGXgESyQt+y5yDwW7MyDzPyuInM81aZMq5rPvPc4WMg48J XR0jriq65jlAC7qqh7uI2jSEeFiivC+KlBouFrTkmnWvGbH6Yvf5P1VZ+RJuXG1z2OMgnz H4IUHS4zETnp0SOqaU6DEycwaeJasv7HmM91HPaS9m1a5FL/vj7AjK6Gh+C10Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708528832; a=rsa-sha256; cv=none; b=ZJley8kOxyu6pNyNFHpiV+2yJvgPsc8JD78BJnKe+H6WHgbZtq+BMlGRtZ/zW0pxcQ4HON a5GEOp62ETskplIlosLDlZyXxFMdgZaIbWdPryImNs1rxyL1XYOXAOSdQnZ5siDCxAMLgE J486yt1HOc3x2AdsJiIbYEMr4hYOeYXwguw/ECx6wj2+R+RijeZsnNnz14vQm+F38nS4ua 8UlmsN66TXWbA0ncVLhtDrrbXVHsLFXzI4nQ1jaqO4bMTDDvUOGyzE3tLomW0ElNgFu52w e2oX0SeWAgKGu9JOFDtnFI/V6hYB31rdd4SUYHXtl9DUe8kv7ur9qMAIIvzKUQ== 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 4Tg0Mh4k3Gz172W; Wed, 21 Feb 2024 15:20:32 +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 41LFKWfA028340; Wed, 21 Feb 2024 15:20:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFKW46028337; Wed, 21 Feb 2024 15:20:32 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:20:32 GMT Message-Id: <202402211520.41LFKW46028337@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: 2a3dadc897f1 - main - graphics/py-s2: Update to 0.11.1 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: 2a3dadc897f15ee5570e80ee8b14cb78d22840da Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a3dadc897f15ee5570e80ee8b14cb78d22840da commit 2a3dadc897f15ee5570e80ee8b14cb78d22840da Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 14:30:18 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-02-21 15:06:52 +0000 graphics/py-s2: Update to 0.11.1 - Build and install python bytecode Changes: https://github.com/google/s2geometry/releases --- graphics/py-s2/Makefile | 7 +++++-- graphics/py-s2/distinfo | 6 +++--- graphics/py-s2/files/patch-CMakeLists.txt | 23 +++++++++++++---------- graphics/py-s2/pkg-plist | 6 ++++-- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/graphics/py-s2/Makefile b/graphics/py-s2/Makefile index ed2b5f492119..e807fad2b857 100644 --- a/graphics/py-s2/Makefile +++ b/graphics/py-s2/Makefile @@ -1,6 +1,5 @@ PORTNAME= s2 -PORTVERSION= 0.10.0 -PORTREVISION= 1 +PORTVERSION= 0.11.1 DISTVERSIONPREFIX= v CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -34,4 +33,8 @@ USE_GITHUB= yes CXXFLAGS+= -mcpu=power7 .endif +post-install: + ${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} -f ${STAGEDIR}${PYTHON_SITELIBDIR} + ${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} -f ${STAGEDIR}${PYTHON_SITELIBDIR} + .include diff --git a/graphics/py-s2/distinfo b/graphics/py-s2/distinfo index 9ac8ed9cf19f..6d1792af7141 100644 --- a/graphics/py-s2/distinfo +++ b/graphics/py-s2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650970065 -SHA256 (google-s2geometry-v0.10.0_GH0.tar.gz) = 1c17b04f1ea20ed09a67a83151ddd5d8529716f509dde49a8190618d70532a3d -SIZE (google-s2geometry-v0.10.0_GH0.tar.gz) = 1110687 +TIMESTAMP = 1708448988 +SHA256 (google-s2geometry-v0.11.1_GH0.tar.gz) = bdbeb8ebdb88fa934257caf81bb44b55711617a3ab4fdec2c3cfd6cc31b61734 +SIZE (google-s2geometry-v0.11.1_GH0.tar.gz) = 1180820 diff --git a/graphics/py-s2/files/patch-CMakeLists.txt b/graphics/py-s2/files/patch-CMakeLists.txt index 8d599c991b79..5b135afcc010 100644 --- a/graphics/py-s2/files/patch-CMakeLists.txt +++ b/graphics/py-s2/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2022-04-01 11:53:29 UTC +--- CMakeLists.txt.orig 2024-02-03 08:01:27 UTC +++ CMakeLists.txt -@@ -1,5 +1,18 @@ +@@ -1,3 +1,16 @@ +cmake_minimum_required(VERSION 3.12) + +project(s2-geometry) @@ -14,21 +14,24 @@ +# being found by default. +find_package(Python3 COMPONENTS Interpreter Development) + + # Generate standard target names. + cmake_policy(SET CMP0078 NEW) + # Honor SWIG_MODULE_NAME via -module flag. +@@ -15,7 +28,7 @@ include(${SWIG_USE_FILE}) + endif() + include(${SWIG_USE_FILE}) -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") -@@ -13,9 +26,9 @@ add_test(NAME pywraps2_test COMMAND + set_property(SOURCE s2.i PROPERTY SWIG_FLAGS "-module" "s2geometry") +@@ -29,7 +42,7 @@ set_property(TEST s2geometry_test PROPERTY ENVIRONMENT ${Python3_EXECUTABLE} - "${PROJECT_SOURCE_DIR}/src/python/pywraps2_test.py") - set_property(TEST pywraps2_test PROPERTY ENVIRONMENT + "${PROJECT_SOURCE_DIR}/src/python/s2geometry_test.py") + set_property(TEST s2geometry_test PROPERTY ENVIRONMENT - "PYTHONPATH=$ENV{PYTHONPATH}:${PROJECT_BINARY_DIR}/python") + "PYTHONPATH=$ENV{PYTHONPATH}:${PROJECT_BINARY_DIR}") # Install the wrapper. - install(TARGETS _pywraps2 DESTINATION ${Python3_SITELIB}) --install(FILES "${PROJECT_BINARY_DIR}/python/pywraps2.py" -+install(FILES "${PROJECT_BINARY_DIR}/pywraps2.py" - DESTINATION ${Python3_SITELIB}) + install(TARGETS s2geometry DESTINATION ${S2GEOMETRY_INSTALL_PREFIX}) diff --git a/graphics/py-s2/pkg-plist b/graphics/py-s2/pkg-plist index ad8b76a37b2f..b53302d7266f 100644 --- a/graphics/py-s2/pkg-plist +++ b/graphics/py-s2/pkg-plist @@ -1,2 +1,4 @@ -%%PYTHON_SITELIBDIR%%/_pywraps2.so -%%PYTHON_SITELIBDIR%%/pywraps2.py +%%PYTHON_SITELIBDIR%%/__init__.py +%%PYTHON_SITELIBDIR%%/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/_s2geometry.so