From nobody Tue Nov 01 10:36:15 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 4N1mdq4F3wz4gxQ5; Tue, 1 Nov 2022 10:36:15 +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 4N1mdq2zZtz3Mbk; Tue, 1 Nov 2022 10:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667298975; 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=RDqG3yOfw6yrtwlfFCAamAgU6SyK9ZF9ckWPdqdyz7g=; b=XK/oSpWCpQ59rBXwvW5PXxi6QRGg0DlD7aL4et0IAlYdPRNuoLAZDBeHkz/h6ibEegcM6j WRSssYDmZorzfe4kUTyXMyMI69vPctfNAysEelrgqjv5K+AWX07q/NDzSQHEQKTpOMM1lT AIbpnmHuHNI2qm3K3NPI1DawbzhkAvtTIxAVL4VW3lRD8mi0gjUKiu8HjVAYiUbN1gqAcs f+DE+6TcqNQUgEYzlzeZ4W/gHG+VWNj+StF8J5g5c3y/2Eek2x75aAkZIwMIKpQtrGjFne Qtk+5pzYC510w8s+Fh24jnPk1NF1zAWHGmZi9y35ZW2h2oTcbH40QhhZPmKdLA== 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 4N1mdq24b4z1C9b; Tue, 1 Nov 2022 10:36:15 +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 2A1AaFi2076938; Tue, 1 Nov 2022 10:36:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1AaFrR076937; Tue, 1 Nov 2022 10:36:15 GMT (envelope-from git) Date: Tue, 1 Nov 2022 10:36:15 GMT Message-Id: <202211011036.2A1AaFrR076937@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 8475e06812f3 - main - misc/openvdb: Remove PYTHON option 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8475e06812f3a9772627290752ad5b4fced402ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667298975; 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=RDqG3yOfw6yrtwlfFCAamAgU6SyK9ZF9ckWPdqdyz7g=; b=jheJYvD7/4rHyyRYsq6NTdjixUPIpMOqpQ4wTb0yvKC3L0BgvIIIWtOuOzs0DD7Y0g5E50 sjAn0Sx6w6CtNk8TAGFthMMWNYpQau1RihHYm5KSmrnaYp3f75Zd0m8k3UjMkDFyUogvzY lirX38kVNEykxyccKIz2Cu10APGqaR6+9iujiJiqPQswKbHBVMLVLyhepTH14UiekMeyWP fPnwEECdV94/KljHhETxQUHV0p7LLP9FRTXaJMpSfceAJv+NQPl3LfWy0ozr05+PzG4rsX 9coiAELFFTZDpxn33ULIv7hUz9cEqbaQaGlnIrdB89IXsQXtLeBAJUrCObdfkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667298975; a=rsa-sha256; cv=none; b=kaIZoYuhTNkDCh18GIxn0L7riqjcTofesaC201Fae7vLmkHXHlRYwv5Dgsk+EYylq7ZYPj jq2dp23TXod9rljInmpbCInDZAxzGJGh00isAzmbMwzYLXku0mNtFEk1QOQudtlkfOMRIh QZcuk61DrdmCCqyIwVQSwr8ayFTIejA4ETrmcgwZewoE7VjpMuDJ81ZfBcpYPi/L+Aj6tN 5l6MwHbjutMFtofVx8vT0DaL2WoJ1IEk3aNfO5jhicHJB4WSNs3i0WpCKQBeJEsm+jysx2 zajHUQFbZnv8ShLe4SgIf8ZvGmJH82vfYYrODc00K/xT7y0mPYOi5KfFJq7YTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8475e06812f3a9772627290752ad5b4fced402ac commit 8475e06812f3a9772627290752ad5b4fced402ac Author: Yuri Victorovich AuthorDate: 2022-11-01 10:32:58 +0000 Commit: Yuri Victorovich 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