git: 069cac4cb119 - main - graphics/py-pivy: update to 0.6.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Sep 2024 21:58:11 UTC
The branch main has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=069cac4cb119c3348708a1d87501e7465b830086
commit 069cac4cb119c3348708a1d87501e7465b830086
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2024-09-26 21:57:38 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2024-09-26 21:57:38 +0000
graphics/py-pivy: update to 0.6.3
Release Notes:
https://github.com/coin3d/pivy/releases/tag/0.6.9
---
graphics/py-pivy/Makefile | 9 +++---
graphics/py-pivy/distinfo | 6 ++--
graphics/py-pivy/files/patch-CMakeLists.txt | 16 -----------
.../files/patch-distutils__cmake_CMakeLists.txt | 33 ++++++++++------------
graphics/py-pivy/files/patch-qtinfo.py | 17 +++++++----
graphics/py-pivy/files/patch-setup.py | 22 ---------------
6 files changed, 35 insertions(+), 68 deletions(-)
diff --git a/graphics/py-pivy/Makefile b/graphics/py-pivy/Makefile
index 1433c68ed6f8..6a8a94d367b3 100644
--- a/graphics/py-pivy/Makefile
+++ b/graphics/py-pivy/Makefile
@@ -1,6 +1,5 @@
PORTNAME= pivy
-PORTVERSION= 0.6.8
-PORTREVISION= 1
+PORTVERSION= 0.6.9
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,11 +13,13 @@ BUILD_DEPENDS= swig:devel/swig
LIB_DEPENDS= libCoin.so:graphics/Coin \
libSoQt.so:x11-toolkits/soqt
-USES= cmake:indirect compiler:c11 python qt:5
+USES= cmake:indirect compiler:c11 python qt:6
USE_GITHUB= yes
GH_ACCOUNT= coin3d
USE_PYTHON= distutils
-USE_QT= core gui opengl widgets
+USE_QT= base
+
+CMAKE_ARGS= -DPIVY_USE_QT6="ON"
PLIST_SUB+= DISTVERSION=${DISTVERSION}
diff --git a/graphics/py-pivy/distinfo b/graphics/py-pivy/distinfo
index 77a9701dc74f..8a40b2c9b54d 100644
--- a/graphics/py-pivy/distinfo
+++ b/graphics/py-pivy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678735206
-SHA256 (coin3d-pivy-0.6.8_GH0.tar.gz) = c443dd7dd724b0bfa06427478b9d24d31e0c3b5138ac5741a2917a443b28f346
-SIZE (coin3d-pivy-0.6.8_GH0.tar.gz) = 6618458
+TIMESTAMP = 1727379380
+SHA256 (coin3d-pivy-0.6.9_GH0.tar.gz) = c207f5ed73089b2281356da4a504c38faaab90900b95639c80772d9d25ba0bbc
+SIZE (coin3d-pivy-0.6.9_GH0.tar.gz) = 6678377
diff --git a/graphics/py-pivy/files/patch-CMakeLists.txt b/graphics/py-pivy/files/patch-CMakeLists.txt
deleted file mode 100644
index 2fbd008b59ee..000000000000
--- a/graphics/py-pivy/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt.orig 2021-03-19 15:41:45 UTC
-+++ CMakeLists.txt
-@@ -7,10 +7,10 @@ option(DISABLE_SWIG_WARNINGS "if on no swig warnings a
- find_package(SWIG 4.0.0 REQUIRED)
- include(${SWIG_USE_FILE})
-
--find_package(Coin CONFIG REQUIRED)
--find_package(SoQt CONFIG)
-+find_package(Coin3D CONFIG REQUIRED)
-+find_package(soqt CONFIG)
-
--if (SoQt_FOUND)
-+if (SoQt_INCLUDE_DIRS)
- find_package(Qt5 COMPONENTS Core Widgets Gui REQUIRED)
- endif()
-
diff --git a/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt b/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt
index 3a68bcb4add1..f130b8e72ad2 100644
--- a/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt
+++ b/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt
@@ -1,21 +1,18 @@
---- distutils_cmake/CMakeLists.txt.orig 2021-03-19 15:41:45 UTC
+commit 01ec1707a767eaeabec3135a3866ded2920c2ff6
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+
+ set project type to initialize cmake compiler checks
+
+ Qt6 will pull in FindThreads() which fails w/o C compiler
+
+diff --git distutils_cmake/CMakeLists.txt distutils_cmake/CMakeLists.txt
+index 976be6a..e59804a 100644
+--- distutils_cmake/CMakeLists.txt
+++ distutils_cmake/CMakeLists.txt
-@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.5)
- project(pivy_cmake_setup NONE)
-
-
--find_package(Coin CONFIG REQUIRED)
-+find_package(Coin3D REQUIRED)
-
--if (Coin_FOUND)
-+if (COIN3D_FOUND)
-+ get_filename_component(COIN_LIB_DIR ${COIN3D_LIBRARIES} DIRECTORY)
- MESSAGE(STATUS "COIN_FOUND: TRUE")
-- MESSAGE(STATUS "COIN_INCLUDE_DIR: ${Coin_INCLUDE_DIR}")
-- MESSAGE(STATUS "COIN_LIB_DIR: ${Coin_LIB_DIR}")
-- MESSAGE(STATUS "COIN_VERSION: ${Coin_VERSION}")
-+ MESSAGE(STATUS "COIN_INCLUDE_DIR: ${COIN3D_INCLUDE_DIRS}")
-+ MESSAGE(STATUS "COIN_LIB_DIR: ${COIN_LIB_DIR}")
- endif()
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.5)
+-project(pivy_cmake_setup NONE)
++project(pivy_cmake_setup C CXX)
+ find_package(Coin CONFIG REQUIRED)
diff --git a/graphics/py-pivy/files/patch-qtinfo.py b/graphics/py-pivy/files/patch-qtinfo.py
index 534332fcea13..cd0752aa3d16 100644
--- a/graphics/py-pivy/files/patch-qtinfo.py
+++ b/graphics/py-pivy/files/patch-qtinfo.py
@@ -1,15 +1,22 @@
---- qtinfo.py.orig 2023-03-13 20:25:16.070089000 +0100
-+++ qtinfo.py 2023-03-13 20:26:18.492969000 +0100
-@@ -7,7 +7,7 @@
+commit 9075d5a5fc7bd7f0144667e12e26e0aa8f7bb4c2
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+
+ our qmake is qmake6
+
+diff --git qtinfo.py qtinfo.py
+index 49b03b4..986960a 100644
+--- qtinfo.py
++++ qtinfo.py
+@@ -7,7 +7,7 @@ class QtInfo(object):
if qmake_command:
self._qmake_command = qmake_command
else:
- self._qmake_command = [find_executable("qmake"),]
-+ self._qmake_command = [find_executable("qmake-qt5"),]
++ self._qmake_command = [find_executable("qmake6"),]
self._dict = {}
# bind all variables early at __init__ time.
for thing in self.__class__.__dict__:
-@@ -79,4 +79,4 @@
+@@ -79,4 +79,4 @@ class QtInfo(object):
translations_dir = property(getTranslationsPath)
headers_dir = property(getHeadersPath)
docs_dir = property(getDocsPath)
diff --git a/graphics/py-pivy/files/patch-setup.py b/graphics/py-pivy/files/patch-setup.py
deleted file mode 100644
index ddeada753a85..000000000000
--- a/graphics/py-pivy/files/patch-setup.py
+++ /dev/null
@@ -1,22 +0,0 @@
---- setup.py.orig 2021-03-19 15:41:45 UTC
-+++ setup.py
-@@ -201,8 +201,8 @@ class pivy_build(build):
- print(yellow('calling: ' + cmake_command[0] + ' ' + cmake_command[1]))
- cmake = subprocess.Popen(cmake_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- cmake_out, cmake_err = cmake.communicate()
-- coin_vars = ['COIN_FOUND', 'COIN_VERSION', 'COIN_INCLUDE_DIR', 'COIN_LIB_DIR']
-- soqt_vars = ['SOQT_FOUND', 'SOQT_VERSION', 'SOQT_INCLUDE_DIR', 'SOQT_LIB_DIR']
-+ coin_vars = ['COIN_FOUND', 'COIN_INCLUDE_DIR', 'COIN_LIB_DIR']
-+ soqt_vars = ['SOQT_VERSION', 'SOQT_INCLUDE_DIR', 'SOQT_LIB_DIR']
- config_dict = {}
- print(yellow(cmake_out.decode("utf-8")))
- print(red(cmake_err.decode("utf-8")))
-@@ -228,7 +228,7 @@ class pivy_build(build):
- if key in config_dict:
- print(blue(key + ': ' + config_dict[key]))
-
-- if config_dict.get('SOQT_FOUND', 'false') == 'false':
-+ if config_dict.get('SOQT_INCLUDE_DIR', 'false') == 'false':
- pivy_build.MODULES.pop('soqt')
- print(red("\ndisable soqt, because cmake couldn't find it"))
- else: