Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Sep 2020 13:40:17 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550274 - head/graphics/opencolorio
Message-ID:  <202009271340.08RDeHX9017784@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sun Sep 27 13:40:17 2020
New Revision: 550274
URL: https://svnweb.freebsd.org/changeset/ports/550274

Log:
  graphics/opencolorio: remove python 2.7 usage
  
  PR:		249534
  Submitted by:	Shane Ambler <FreeBSD@Shaneware.biz> (maintainer)

Modified:
  head/graphics/opencolorio/Makefile   (contents, props changed)
  head/graphics/opencolorio/pkg-plist   (contents, props changed)

Modified: head/graphics/opencolorio/Makefile
==============================================================================
--- head/graphics/opencolorio/Makefile	Sun Sep 27 13:10:29 2020	(r550273)
+++ head/graphics/opencolorio/Makefile	Sun Sep 27 13:40:17 2020	(r550274)
@@ -20,7 +20,8 @@ GH_ACCOUNT=	imageworks
 GH_PROJECT=	OpenColorIO
 
 CMAKE_ON=	USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML
-CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC
+CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC \
+		OCIO_BUILD_DOCS
 
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_gcc=	-Wno-unused-function -Wno-error
@@ -30,10 +31,6 @@ SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceCPP.py
 		share/sphinx/ExtractRstFromSourceSimple.py \
 		src/pyglue/createPyDocH.py
 
-OPTIONS_DEFINE=		DOCS
-
-DOCS_CMAKE_BOOL=	OCIO_BUILD_DOCS
-
 PLIST_SUB+=		LIBVERS=${PORTVERSION}
 
 .if ${MACHINE_CPU:Msse2}
@@ -67,14 +64,9 @@ CMAKE_OFF+=	OCIO_BUILD_APPS OCIO_BUILD_SHARED
 CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
 PLIST=		${PKGDIR}/pkg-plist-pyglue
 .else # master port
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libyaml-cpp03.so:devel/yaml-cpp03
-.if ${PORT_OPTIONS:MDOCS}
-USES+=		python:2.7,build
-.else
 USES+=		python:build
-.endif
 USE_LDCONFIG=	yes
 CMAKE_ON+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
 CMAKE_OFF+=	OCIO_BUILD_APPS
@@ -83,8 +75,6 @@ CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
 # available when generating docs, we leave the python header in place
 # but only install the python module with the py-opencolorio port
 # this makes it easier to allow multiple python versions installed
-# doc building fails using python3 - but the py-opencolorio port can still
-# be used to build a python 3 module
 PLIST=		${PKGDIR}/pkg-plist
 EXTRA_PATCHES=	${PATCHDIR}/libs
 .endif

Modified: head/graphics/opencolorio/pkg-plist
==============================================================================
--- head/graphics/opencolorio/pkg-plist	Sun Sep 27 13:10:29 2020	(r550273)
+++ head/graphics/opencolorio/pkg-plist	Sun Sep 27 13:40:17 2020	(r550274)
@@ -10,115 +10,4 @@ libdata/pkgconfig/OpenColorIO.pc
 share/cmake/Modules/OpenColorIOConfig.cmake
 share/cmake/Modules/OpenColorIO-release.cmake
 share/cmake/Modules/OpenColorIO.cmake
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
-%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/License.html
-%%PORTDOCS%%%%DOCSDIR%%/_images/gn10_to_linear_light.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/_images/gnf_to_linear_light.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/_images/lg10_to_linear_light.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/_images/lg8_to_vd8.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/_images/lgf_to_linear_light.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_itworks.png
-%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_open_current_profile.png
-%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_proof_setup.png
-%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_reveal_profile.png
-%%PORTDOCS%%%%DOCSDIR%%/_images/psicc_select_profile.png
-%%PORTDOCS%%%%DOCSDIR%%/_sources/ChangeLog.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/CompatibleSoftware.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/aces_1.0.3.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/allocation_vars.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTypes.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonAPI.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTransforms.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTypes.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/coding_guidelines.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/documentation_guidelines.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/getting_started.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/internal_architecture.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/issues.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/submitting_changes.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/usage_examples.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/downloads.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/introduction.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/installation.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/baking_luts.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/config_syntax.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/contexts.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/looks.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/tool_overview.txt
-%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
-%%PORTDOCS%%%%DOCSDIR%%/_static/alert_info_32.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/alert_warning_32.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/bg-page.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/bullet_orange.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_lm10.0101.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_lnf.0101.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_vd16.0101.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/ocio.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
-%%PORTDOCS%%%%DOCSDIR%%/configurations/aces_1.0.3.html
-%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html
-%%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html
-%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html
-%%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTypes.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/api/index.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonAPI.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTransforms.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTypes.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/coding_guidelines.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/documentation_guidelines.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/getting_started.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/index.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/internal_architecture.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/issues.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/submitting_changes.html
-%%PORTDOCS%%%%DOCSDIR%%/developers/usage_examples.html
-%%PORTDOCS%%%%DOCSDIR%%/downloads.html
-%%PORTDOCS%%%%DOCSDIR%%/genindex.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/installation.html
-%%PORTDOCS%%%%DOCSDIR%%/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/objects.inv
-%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
-%%PORTDOCS%%%%DOCSDIR%%/search.html
-%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
-%%PORTDOCS%%%%DOCSDIR%%/userguide/baking_luts.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide/config_syntax.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide/contexts.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide/looks.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html
 share/ocio/setup_ocio.sh



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009271340.08RDeHX9017784>