update py-pivy to 0.6.6

https://github.com/coin3d/pivy/releases/tag/0.6.6


git-svn-id: http://svn.freebsd.org/ports/head@568884 35697150-7ecd-e111-bb59-0022644237b5

5 files changed, 49 insertions, 27 deletions

diff --git a/graphics/py-pivy/Makefile b/graphics/py-pivy/Makefile
index 2f14387147cc..13bdf344ef19 100644
--- a/graphics/py-pivy/Makefile
+++ b/graphics/py-pivy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pivy
-PORTVERSION=	0.6.5
+PORTVERSION=	0.6.6
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/graphics/py-pivy/distinfo b/graphics/py-pivy/distinfo
index f6774b30ad9c..b315fcc00d50 100644
--- a/graphics/py-pivy/distinfo
+++ b/graphics/py-pivy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579180338
-SHA256 (coin3d-pivy-0.6.5_GH0.tar.gz) = 16f2e339e5c59a6438266abe491013a20f53267e596850efad1559564a2c1719
-SIZE (coin3d-pivy-0.6.5_GH0.tar.gz) = 6614159
+TIMESTAMP = 1616253386
+SHA256 (coin3d-pivy-0.6.6_GH0.tar.gz) = 27204574d894cc12aba5df5251770f731f326a3e7de4499e06b5f5809cc5659e
+SIZE (coin3d-pivy-0.6.6_GH0.tar.gz) = 6618471
diff --git a/graphics/py-pivy/files/patch-CMakeLists.txt b/graphics/py-pivy/files/patch-CMakeLists.txt
index dca4ed6f72f1..2fbd008b59ee 100644
--- a/graphics/py-pivy/files/patch-CMakeLists.txt
+++ b/graphics/py-pivy/files/patch-CMakeLists.txt
@@ -1,26 +1,16 @@
---- CMakeLists.txt.orig	2020-01-12 21:51:59 UTC
+--- CMakeLists.txt.orig	2021-03-19 15:41:45 UTC
 +++ CMakeLists.txt
-@@ -2,17 +2,18 @@ project(pivy_cmake_setup NONE)
- cmake_minimum_required(VERSION 3.5)
- 
+@@ -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(Coin3D REQUIRED)
+-find_package(SoQt CONFIG)
++find_package(Coin3D CONFIG REQUIRED)
++find_package(soqt CONFIG)
  
--if (Coin_INCLUDE_DIR)
-+if (COIN3D_INCLUDE_DIRS)
-     MESSAGE(STATUS "COIN_FOUND: true")
- else()
-     MESSAGE(STATUS "COIN_FOUND: false")
+-if (SoQt_FOUND)
++if (SoQt_INCLUDE_DIRS)
+     find_package(Qt5 COMPONENTS Core Widgets Gui REQUIRED)
  endif()
  
--MESSAGE(STATUS "COIN_INCLUDE_DIR: ${Coin_INCLUDE_DIR}")
--MESSAGE(STATUS "COIN_LIB_DIR: ${Coin_LIB_DIR}")
--MESSAGE(STATUS "COIN_VERSION: ${Coin_VERSION}")
-+get_filename_component(COIN_LIB_DIR ${COIN3D_LIBRARIES} DIRECTORY)
-+MESSAGE(STATUS "COIN_INCLUDE_DIR: ${COIN3D_INCLUDE_DIRS}")
-+MESSAGE(STATUS "COIN_LIB_DIR: ${COIN_LIB_DIR}")
-+# MESSAGE(STATUS "COIN_VERSION: ${Coin_VERSION}")
- 
- 
- 
diff --git a/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt b/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt
new file mode 100644
index 000000000000..3a68bcb4add1
--- /dev/null
+++ b/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- distutils_cmake/CMakeLists.txt.orig	2021-03-19 15:41:45 UTC
++++ 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()
+ 
+ 
diff --git a/graphics/py-pivy/files/patch-setup.py b/graphics/py-pivy/files/patch-setup.py
index 4e9704738e0d..ddeada753a85 100644
--- a/graphics/py-pivy/files/patch-setup.py
+++ b/graphics/py-pivy/files/patch-setup.py
@@ -1,11 +1,22 @@
---- setup.py.orig	2020-01-12 21:51:59 UTC
+--- setup.py.orig	2021-03-19 15:41:45 UTC
 +++ setup.py
-@@ -201,7 +201,7 @@ class pivy_build(build):
+@@ -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_FOUND', 'SOQT_VERSION', 'SOQT_INCLUDE_DIR', 'SOQT_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: