git: 8475e06812f3 - main - misc/openvdb: Remove PYTHON option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Nov 2022 10:36:15 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8475e06812f3a9772627290752ad5b4fced402ac
commit 8475e06812f3a9772627290752ad5b4fced402ac
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-11-01 10:32:58 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-11-01 10:36:07 +0000
misc/openvdb: Remove PYTHON option
The Python binding will be in a separate port.
---
misc/openvdb/Makefile | 12 +++---------
.../files/patch-openvdb_openvdb_python_CMakeLists.txt | 11 -----------
misc/openvdb/pkg-plist | 2 --
3 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile
index ab9acf79f69b..0ff7e9bb0557 100644
--- a/misc/openvdb/Makefile
+++ b/misc/openvdb/Makefile
@@ -1,6 +1,7 @@
PORTNAME= openvdb
DISTVERSIONPREFIX= v
DISTVERSION= 10.0.0
+PORTREVISION= 1
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
@@ -26,17 +27,10 @@ CMAKE_ARGS= -DCONCURRENT_MALLOC="Tbbmalloc" -DTbb_INCLUDE_DIR=${LOCALBASE}/incl
CMAKE_OFF= OPENVDB_CORE_STATIC
CMAKE_TESTING_ON= OPENVDB_BUILD_UNITTESTS # one test fails: https://github.com/AcademySoftwareFoundation/openvdb/issues/1103
-OPTIONS_DEFINE= PYTHON TOOLS #DOCS # TOOLS and PYTHON should be made into subpackages
-OPTIONS_DEFAULT= PYTHON TOOLS
+OPTIONS_DEFINE= TOOLS #DOCS # TOOLS should be made into a subpackage
+OPTIONS_DEFAULT= TOOLS
OPTIONS_SUB= yes
-PYTHON_USES= python
-PYTHON_CMAKE_BOOL= OPENVDB_BUILD_PYTHON_MODULE
-PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DUSE_NUMPY:BOOL=ON
-PYTHON_LIB_DEPENDS= ${PY_BOOST}
-PYTHON_BUILD_DEPENDS= ${PYNUMPY}
-PYTHON_RUN_DEPENDS= ${PYNUMPY}
-
TOOLS_DESC= Build CLI tools
TOOLS_CMAKE_BOOL= OPENVDB_BUILD_BINARIES OPENVDB_BUILD_VDB_LOD \
OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW
diff --git a/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
deleted file mode 100644
index 12b187e2ac81..000000000000
--- a/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- openvdb/openvdb/python/CMakeLists.txt.orig 2022-06-09 14:50:40 UTC
-+++ openvdb/openvdb/python/CMakeLists.txt
-@@ -115,7 +115,7 @@ if(USE_NUMPY)
- endif()
-
- # Make sure find_package(Python) is only ever invoked once with all required components
--find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
-+find_package(Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
-
- openvdb_check_python_version(Python::Module
- "${Python_VERSION}"
diff --git a/misc/openvdb/pkg-plist b/misc/openvdb/pkg-plist
index e010b21a5adc..6c54bf63893a 100644
--- a/misc/openvdb/pkg-plist
+++ b/misc/openvdb/pkg-plist
@@ -71,7 +71,6 @@ include/openvdb/points/StreamCompression.h
include/openvdb/points/impl/PointRasterizeFrustumImpl.h
include/openvdb/points/impl/PointRasterizeSDFImpl.h
include/openvdb/points/impl/PointRasterizeTrilinearImpl.h
-%%PYTHON%%include/openvdb/python/pyopenvdb.h
include/openvdb/thread/Threading.h
include/openvdb/tools/Activate.h
include/openvdb/tools/ChangeBackground.h
@@ -162,4 +161,3 @@ lib/cmake/OpenVDB/OpenVDBUtils.cmake
lib/libopenvdb.so
lib/libopenvdb.so.10.0
lib/libopenvdb.so.10.0.0
-%%PYTHON_SITELIBDIR%%/pyopenvdb.so