diff --git a/graphics/py-pivy/Makefile b/graphics/py-pivy/Makefile index 92bf4b213d03..6fbc47780581 100644 --- a/graphics/py-pivy/Makefile +++ b/graphics/py-pivy/Makefile @@ -1,28 +1,28 @@ PORTNAME= pivy -PORTVERSION= 0.6.10 +PORTVERSION= 0.6.11 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= cmt@FreeBSD.org COMMENT= Python binding for Coin WWW= https://github.com/coin3d/pivy LICENSE= MIT BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libCoin.so:graphics/Coin \ libSoQt.so:x11-toolkits/soqt USES= cmake:indirect compiler:c11 python qt:6 USE_GITHUB= yes GH_ACCOUNT= coin3d USE_PYTHON= distutils USE_QT= base CMAKE_ARGS= -DPIVY_USE_QT6="ON" PLIST_SUB+= DISTVERSION=${DISTVERSION} INSTALL_TARGET= install-strip .include diff --git a/graphics/py-pivy/distinfo b/graphics/py-pivy/distinfo index 38298cfafb4e..103de0e760a4 100644 --- a/graphics/py-pivy/distinfo +++ b/graphics/py-pivy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743259249 -SHA256 (coin3d-pivy-0.6.10_GH0.tar.gz) = 7b409816c9fad84cf94f93659281f9dd2501d285eb2fc609e9401a3d004ce723 -SIZE (coin3d-pivy-0.6.10_GH0.tar.gz) = 6678472 +TIMESTAMP = 1774640495 +SHA256 (coin3d-pivy-0.6.11_GH0.tar.gz) = 78f79bd7d1ce7e8140ceba4b1220136ea1f14b4403b1e463c59fa892feed961e +SIZE (coin3d-pivy-0.6.11_GH0.tar.gz) = 6276974 diff --git a/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt b/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt deleted file mode 100644 index f130b8e72ad2..000000000000 --- a/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -commit 01ec1707a767eaeabec3135a3866ded2920c2ff6 -Author: Christoph Moench-Tegeder - - 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 -@@ -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-swig b/graphics/py-pivy/files/patch-swig index 9fadf7f204d7..b40135e6ba83 100644 --- a/graphics/py-pivy/files/patch-swig +++ b/graphics/py-pivy/files/patch-swig @@ -1,35 +1,26 @@ ---- interfaces/coin.i.orig 2025-02-17 18:58:05 UTC -+++ interfaces/coin.i -@@ -80,7 +80,11 @@ if (init_file_emulator() < 0) { - %init %{ - #if PY_MAJOR_VERSION >= 3 - if (init_file_emulator() < 0) { -+#if (SWIG_VERSION < 0x040400) - return NULL; -+#else -+ return 0; -+#endif - } - #endif - %} -@@ -106,4 +110,4 @@ for key in list(locals()): - thing = x.__dict__[name] - if isinstance(thing, property): - delattr(x, name) --%} -\ No newline at end of file -+%} ---- interfaces/soqt.i.orig 2025-02-17 18:58:05 UTC +commit b52888ddf6a97f866b0f700b74a2be2da582f193 +Author: Christoph Moench-Tegeder + + fix build with swig 4.4.0+ + + Adapted from + commit 574e4a8ec8532fa8b78d21a27c27586a6ed9748a + Author: Po-Chuan Hsieh + Date: Thu Jan 15 19:45:00 2026 +0800 + +diff --git interfaces/soqt.i interfaces/soqt.i +index 466250c..db1ab3a 100644 +--- interfaces/soqt.i +++ interfaces/soqt.i -@@ -52,7 +52,11 @@ if (init_file_emulator() < 0) { +@@ -52,7 +52,11 @@ static int init_file_emulator(void) %init %{ #if PY_MAJOR_VERSION >= 3 if (init_file_emulator() < 0) { +#if (SWIG_VERSION < 0x040400) return NULL; +#else + return 0; +#endif } #endif %} diff --git a/graphics/py-pivy/pkg-plist b/graphics/py-pivy/pkg-plist index af0184646d87..21a70c9dcae8 100644 --- a/graphics/py-pivy/pkg-plist +++ b/graphics/py-pivy/pkg-plist @@ -1,93 +1,96 @@ %%PYTHON_SITELIBDIR%%/Pivy-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO %%PYTHON_SITELIBDIR%%/Pivy-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt %%PYTHON_SITELIBDIR%%/Pivy-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt %%PYTHON_SITELIBDIR%%/Pivy-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt %%PYTHON_SITELIBDIR%%/pivy/__init__.py %%PYTHON_SITELIBDIR%%/pivy/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/coin%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/coin%%PYTHON_TAG%%.pyc +%%PYTHON_SITELIBDIR%%/pivy/__pycache__/graphics%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/pivy/__pycache__/graphics%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/pivy_meta%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/pivy_meta%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/sogui%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/sogui%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/utils%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/__pycache__/utils%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/_coin%%PYTHON_TAG%%.so %%PYTHON_SITELIBDIR%%/pivy/coin.py -%%PYTHON_SITELIBDIR%%/pivy/graphics/__init__.py -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/__init__%%PYTHON_TAG%%.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/colors%%PYTHON_TAG%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/colors%%PYTHON_TAG%%.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/mesh%%PYTHON_TAG%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/mesh%%PYTHON_TAG%%.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/plot%%PYTHON_TAG%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/plot%%PYTHON_TAG%%.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/viewer%%PYTHON_TAG%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/__pycache__/viewer%%PYTHON_TAG%%.pyc -%%PYTHON_SITELIBDIR%%/pivy/graphics/colors.py -%%PYTHON_SITELIBDIR%%/pivy/graphics/mesh.py -%%PYTHON_SITELIBDIR%%/pivy/graphics/plot.py -%%PYTHON_SITELIBDIR%%/pivy/graphics/viewer.py +%%PYTHON_SITELIBDIR%%/pivy/graphics.py %%PYTHON_SITELIBDIR%%/pivy/gui/__init__.py %%PYTHON_SITELIBDIR%%/pivy/gui/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/gui/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/gui/__pycache__/qt%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/gui/__pycache__/qt%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/gui/__pycache__/soqt%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/gui/__pycache__/soqt%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/gui/_soqt%%PYTHON_TAG%%.so %%PYTHON_SITELIBDIR%%/pivy/gui/qt.py %%PYTHON_SITELIBDIR%%/pivy/gui/soqt.py +%%PYTHON_SITELIBDIR%%/pivy/interactive/__init__.py +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/__init__%%PYTHON_TAG%%.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/colors%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/colors%%PYTHON_TAG%%.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/mesh%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/mesh%%PYTHON_TAG%%.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/plot%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/plot%%PYTHON_TAG%%.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/viewer%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/__pycache__/viewer%%PYTHON_TAG%%.pyc +%%PYTHON_SITELIBDIR%%/pivy/interactive/colors.py +%%PYTHON_SITELIBDIR%%/pivy/interactive/mesh.py +%%PYTHON_SITELIBDIR%%/pivy/interactive/plot.py +%%PYTHON_SITELIBDIR%%/pivy/interactive/viewer.py %%PYTHON_SITELIBDIR%%/pivy/pivy_meta.py %%PYTHON_SITELIBDIR%%/pivy/quarter/ContextMenu.py %%PYTHON_SITELIBDIR%%/pivy/quarter/ImageReader.py %%PYTHON_SITELIBDIR%%/pivy/quarter/QuarterWidget.py %%PYTHON_SITELIBDIR%%/pivy/quarter/SensorManager.py %%PYTHON_SITELIBDIR%%/pivy/quarter/SignalThread.py %%PYTHON_SITELIBDIR%%/pivy/quarter/__init__.py %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/ContextMenu%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/ContextMenu%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/ImageReader%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/ImageReader%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/QuarterWidget%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/QuarterWidget%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/SensorManager%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/SensorManager%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/SignalThread%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/SignalThread%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/DeviceHandler.py %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/DeviceManager.py %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/KeyboardHandler.py %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/MouseHandler.py %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__init__.py %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/DeviceHandler%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/DeviceHandler%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/DeviceManager%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/DeviceManager%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/KeyboardHandler%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/KeyboardHandler%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/MouseHandler%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/MouseHandler%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/devices/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/DragDropHandler.py %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/EventHandler.py %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/EventManager.py %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__init__.py %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/DragDropHandler%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/DragDropHandler%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/EventHandler%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/EventHandler%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/EventManager%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/EventManager%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/eventhandlers/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/plugins/designer/python/PyQuarterWidgetPlugin.py %%PYTHON_SITELIBDIR%%/pivy/quarter/plugins/designer/python/__pycache__/PyQuarterWidgetPlugin%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/pivy/quarter/plugins/designer/python/__pycache__/PyQuarterWidgetPlugin%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/pivy/sogui.py %%PYTHON_SITELIBDIR%%/pivy/utils.py