Date: Sat, 20 Mar 2021 20:10:16 +0000 (UTC) From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568884 - in head/graphics/py-pivy: . files Message-ID: <202103202010.12KKAGCa040686@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cmt Date: Sat Mar 20 20:10:16 2021 New Revision: 568884 URL: https://svnweb.freebsd.org/changeset/ports/568884 Log: update py-pivy to 0.6.6 https://github.com/coin3d/pivy/releases/tag/0.6.6 Added: head/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt (contents, props changed) Modified: head/graphics/py-pivy/Makefile head/graphics/py-pivy/distinfo head/graphics/py-pivy/files/patch-CMakeLists.txt head/graphics/py-pivy/files/patch-setup.py Modified: head/graphics/py-pivy/Makefile ============================================================================== --- head/graphics/py-pivy/Makefile Sat Mar 20 20:02:07 2021 (r568883) +++ head/graphics/py-pivy/Makefile Sat Mar 20 20:10:16 2021 (r568884) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pivy -PORTVERSION= 0.6.5 +PORTVERSION= 0.6.6 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/graphics/py-pivy/distinfo ============================================================================== --- head/graphics/py-pivy/distinfo Sat Mar 20 20:02:07 2021 (r568883) +++ head/graphics/py-pivy/distinfo Sat Mar 20 20:10:16 2021 (r568884) @@ -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 Modified: head/graphics/py-pivy/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/py-pivy/files/patch-CMakeLists.txt Sat Mar 20 20:02:07 2021 (r568883) +++ head/graphics/py-pivy/files/patch-CMakeLists.txt Sat Mar 20 20:10:16 2021 (r568884) @@ -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}") - - Added: head/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/py-pivy/files/patch-distutils__cmake_CMakeLists.txt Sat Mar 20 20:10:16 2021 (r568884) @@ -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() + + Modified: head/graphics/py-pivy/files/patch-setup.py ============================================================================== --- head/graphics/py-pivy/files/patch-setup.py Sat Mar 20 20:02:07 2021 (r568883) +++ head/graphics/py-pivy/files/patch-setup.py Sat Mar 20 20:10:16 2021 (r568884) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103202010.12KKAGCa040686>