graphics/py-s2: Update to 0.11.1

- Build and install python bytecode Changes: https://github.com/google/s2geometry/releases
freebsd · Feb 21, 2024 · 2a3dadc · 2a3dadc
1 parent 9b1ac61
commit 2a3dadc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git 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 <bsd.port.mk>
diff --git 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
@@ -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
@@ -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