diff --git a/graphics/py-h3/Makefile b/graphics/py-h3/Makefile index 46ed36c36fbb..6b86f3885776 100644 --- a/graphics/py-h3/Makefile +++ b/graphics/py-h3/Makefile @@ -1,42 +1,41 @@ PORTNAME= h3 -PORTVERSION= 3.7.7 -PORTREVISION= 2 +PORTVERSION= 4.4.2 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Python binding of H3 library WWW= https://uber.github.io/h3-py/ \ https://github.com/uber/h3-py LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= h3>=3.7.2:graphics/h3 \ - ${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +BUILD_DEPENDS= h3>=4.4.1:graphics/h3 \ + ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0:devel/py-scikit-build-core@${PY_FLAVOR} +# ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} +# ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libh3.so:graphics/h3 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} USES= cmake:indirect localbase:ldflags ninja:build python USE_PYTHON= autoplist concurrent cython pep517 pytest CFLAGS+= -I${LOCALBASE}/include/h3 TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} OPTIONS_DEFINE= NUMPY OPTIONS_DEFAULT=NUMPY NUMPY_DESC= NumPy support NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} post-patch: # Clean up bundled libraries @${RM} -r ${WRKSRC}/src/h3lib/ post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + .include diff --git a/graphics/py-h3/distinfo b/graphics/py-h3/distinfo index 9d2271b731bb..145ead92a82e 100644 --- a/graphics/py-h3/distinfo +++ b/graphics/py-h3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710712506 -SHA256 (h3-3.7.7.tar.gz) = 33d141c3cef0725a881771fd8cb80c06a0db84a6e4ca5c647ce095ae07c61e94 -SIZE (h3-3.7.7.tar.gz) = 192246 +TIMESTAMP = 1777252544 +SHA256 (h3-4.4.2.tar.gz) = b25ab9f339e40b10dcb5e2e6988d07672e780a4950d79c25380d308cdf14f82f +SIZE (h3-4.4.2.tar.gz) = 171891 diff --git a/graphics/py-h3/files/patch-CMakeLists.txt b/graphics/py-h3/files/patch-CMakeLists.txt index 232444f5b742..33ecd460b966 100644 --- a/graphics/py-h3/files/patch-CMakeLists.txt +++ b/graphics/py-h3/files/patch-CMakeLists.txt @@ -1,31 +1,38 @@ ---- CMakeLists.txt.orig 2022-11-24 19:38:22 UTC +--- CMakeLists.txt.orig 2022-11-09 12:37:21 UTC +++ CMakeLists.txt -@@ -6,28 +6,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) - # Always make a release build - set(CMAKE_BUILD_TYPE Release) +@@ -11,35 +11,6 @@ find_package( + COMPONENTS Interpreter Development.Module + REQUIRED) -# Avoid building tooling we won't need for release -# See all options with `cmake -LA` in an `h3/build` directory, -# or at https://h3geo.org/docs/next/core-library/compilation-options/ -macro(turn_off option_name) - set(${option_name} OFF CACHE BOOL "" FORCE) -endmacro() -turn_off(BUILD_ALLOC_TESTS) -turn_off(BUILD_BENCHMARKS) -turn_off(BUILD_FILTERS) -turn_off(BUILD_FUZZERS) -turn_off(BUILD_GENERATORS) -turn_off(BUILD_TESTING) -turn_off(ENABLE_COVERAGE) -turn_off(ENABLE_DOCS) -turn_off(ENABLE_FORMAT) -turn_off(ENABLE_LIBFUZZER) -turn_off(ENABLE_LINTING) - -# Build the core library as static -set(BUILD_SHARED_LIBS OFF) -add_subdirectory(src/h3lib) - # Build the rest (other than the core library dependency) as shared set(BUILD_SHARED_LIBS ON) add_subdirectory(src/h3) +- +-# Include built h3api.h for Cython API +-install( +- FILES +- "${CMAKE_CURRENT_BINARY_DIR}/src/h3lib/src/h3lib/include/h3api.h" +- DESTINATION +- ${SKBUILD_PROJECT_NAME}/_cy) diff --git a/graphics/py-h3/files/patch-pyproject.toml b/graphics/py-h3/files/patch-pyproject.toml deleted file mode 100644 index 52147e92455e..000000000000 --- a/graphics/py-h3/files/patch-pyproject.toml +++ /dev/null @@ -1,8 +0,0 @@ ---- pyproject.toml.orig 2024-03-09 18:55:18 UTC -+++ pyproject.toml -@@ -2,5 +2,4 @@ requires = [ - requires = [ - 'scikit-build', - 'cython', -- 'cmake', - ]