git: 65c81a7ed9c6 - main - graphics/openshadinglanguage: update to 1.11.17.0 release

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Tue, 01 Feb 2022 17:04:35 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=65c81a7ed9c6fe9cabf2b22e873baafa22304bb6

commit 65c81a7ed9c6fe9cabf2b22e873baafa22304bb6
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-02-01 16:35:05 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-02-01 17:04:13 +0000

    graphics/openshadinglanguage: update to 1.11.17.0 release
    
    Includes move to new github account - AcademySoftwareFoundation
    This update is to add support for clang/llvm 13+
    
    PR:             260163
    Sponsored by:   Netzkommune GmbH.
---
 graphics/openshadinglanguage/Makefile              | 24 +++++++++++-----------
 graphics/openshadinglanguage/distinfo              |  6 +++---
 .../files/patch-src_doc_CMakeLists.txt             | 11 ++++++++++
 graphics/openshadinglanguage/pkg-descr             |  2 +-
 graphics/openshadinglanguage/pkg-plist             | 22 ++++++++++----------
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index a81ad6a298ff..8b7e7e210734 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -1,8 +1,6 @@
-# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
-
 PORTNAME=	openshadinglanguage
-DISTVERSIONPREFIX=	Release-
-DISTVERSION=	1.11.15.0
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.11.17.0
 CATEGORIES?=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
@@ -22,10 +20,12 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libpugixml.so:textproc/pugixml
 RUN_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 
-USES=		bison cmake compiler:c++14-lang ncurses
+USES=		bison cmake compiler:c++14-lang localbase ncurses qt:5
+
+USE_QT=		buildtools_build qmake_build
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	imageworks
+GH_ACCOUNT=	AcademySoftwareFoundation
 GH_PROJECT=	OpenShadingLanguage
 
 CMAKE_ON=	ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
@@ -43,14 +43,13 @@ MATERIALX_CMAKE_BOOL=	OSL_BUILD_MATERIALX
 
 OSLTOY_DESC=		Interactive shader edit and visualize tool
 OSLTOY_CMAKE_BOOL=	USE_QT
-OSLTOY_USES=		qt:5
-OSLTOY_USE=		QT=buildtools,core,gui,qmake_build,widgets
+OSLTOY_USE=		QT=buildtools_build,core,gui,qmake_build,widgets
 
-CXXFLAGS+=	-I${STAGEDIR}/include
+#CXXFLAGS+=	-I${STAGEDIR}/include
 
 # DISTVERSION has an extra digit which isn't in the lib name
 # for LIBVERS we want the first three digits
-PLIST_SUB+=	LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/}
+PLIST_SUB=	SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R}
 
 .include <bsd.port.options.mk>
 
@@ -65,6 +64,7 @@ post-patch:
 		-e 's,%%PYCMD%%,${PYTHON_CMD},' \
 		${WRKSRC}/src/shaders/CMakeLists.txt \
 		${WRKSRC}/src/shaders/MaterialX/CMakeLists.txt \
+		${WRKSRC}/src/doc/CMakeLists.txt \
 		${WRKSRC}/src/liboslexec/CMakeLists.txt
 
 .if ${SLAVE_PORT} == yes
@@ -72,7 +72,7 @@ BUILD_DEPENDS+=	${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind
 LIB_DEPENDS+=	liboslquery.so:graphics/openshadinglanguage
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openimageio>0:graphics/py-openimageio@${PY_FLAVOR}
 PLIST=		${PKGDIR}/pkg-plist-pybind
-USES+=		python:3.6+
+USES+=		python
 USE_PYTHON=	flavors
 CMAKE_ON+=	USE_PYTHON
 CMAKE_ARGS+=	-DPYTHON_VERSION=${PYTHON_VER}
@@ -81,7 +81,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 .else # SLAVE_PORT != yes
-USES+=		python:3.6+,build
+USES+=		python:build
 BINARY_ALIAS+=	python=${PYTHON_CMD}
 CMAKE_OFF+=	USE_PYTHON
 USE_LDCONFIG=	yes
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index 8eb926cc4ea9..c3d9f8f222ea 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631387445
-SHA256 (imageworks-OpenShadingLanguage-Release-1.11.15.0_GH0.tar.gz) = a10baa2455405f0a6488a915645dd3d006b8471bae6c269796ba5ba6ce863cbc
-SIZE (imageworks-OpenShadingLanguage-Release-1.11.15.0_GH0.tar.gz) = 14143372
+TIMESTAMP = 1642948000
+SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.11.17.0_GH0.tar.gz) = ab7e17fde3f759b94efcc159d8f4ccc6cc92f40cba76e4f88a8133a00587738f
+SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.11.17.0_GH0.tar.gz) = 13888114
diff --git a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
new file mode 100644
index 000000000000..16ea4ca1ae18
--- /dev/null
+++ b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/doc/CMakeLists.txt.orig	2021-01-27 18:00:20 UTC
++++ src/doc/CMakeLists.txt
+@@ -43,7 +43,7 @@ macro (docdeep_generate)
+     endif ()
+     set (docdeep_program ${CMAKE_SOURCE_DIR}/src/build-scripts/docdeep.py)
+     add_custom_command (OUTPUT ${mdfile}
+-        COMMAND ${Python_EXECUTABLE} ${docdeep_program} -d ${_docdeep_NAME} -s docs.css
++        COMMAND %%PYCMD%% ${docdeep_program} -d ${_docdeep_NAME} -s docs.css
+                 ${_docdeep_SOURCE} > "${CMAKE_CURRENT_BINARY_DIR}/${mdfile}"
+         MAIN_DEPENDENCY ${docdeep_program}
+         DEPENDS ${_docdeep_SOURCE}
diff --git a/graphics/openshadinglanguage/pkg-descr b/graphics/openshadinglanguage/pkg-descr
index e1b20761caaa..f3eb59f931d0 100644
--- a/graphics/openshadinglanguage/pkg-descr
+++ b/graphics/openshadinglanguage/pkg-descr
@@ -7,4 +7,4 @@ renderer used for feature film animation and visual effects. The
 language specification was developed with input by other visual effects
 and animation studios who also wish to use it.
 
-WWW: https://github.com/imageworks/openshadinglanguage
+WWW: https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
diff --git a/graphics/openshadinglanguage/pkg-plist b/graphics/openshadinglanguage/pkg-plist
index b7f3fdba1012..fe262412baf4 100644
--- a/graphics/openshadinglanguage/pkg-plist
+++ b/graphics/openshadinglanguage/pkg-plist
@@ -35,23 +35,23 @@ include/OSL/strdecls.h
 include/OSL/wide.h
 lib/cmake/OSL/OSLConfig.cmake
 lib/cmake/OSL/OSLConfigVersion.cmake
-lib/cmake/OSL/OSLTargets-release.cmake
+lib/cmake/OSL/OSLTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/OSL/OSLTargets.cmake
 lib/liboslcomp.so
-lib/liboslcomp.so.1.11
-lib/liboslcomp.so.%%LIBVERS%%
+lib/liboslcomp.so.%%SHL2%%
+lib/liboslcomp.so.%%SHL3%%
 lib/liboslexec.so
-lib/liboslexec.so.1.11
-lib/liboslexec.so.%%LIBVERS%%
+lib/liboslexec.so.%%SHL2%%
+lib/liboslexec.so.%%SHL3%%
 lib/liboslnoise.so
-lib/liboslnoise.so.1.11
-lib/liboslnoise.so.%%LIBVERS%%
+lib/liboslnoise.so.%%SHL2%%
+lib/liboslnoise.so.%%SHL3%%
 lib/liboslquery.so
-lib/liboslquery.so.1.11
-lib/liboslquery.so.%%LIBVERS%%
+lib/liboslquery.so.%%SHL2%%
+lib/liboslquery.so.%%SHL3%%
 lib/libtestshade.so
-lib/libtestshade.so.1.11
-lib/libtestshade.so.%%LIBVERS%%
+lib/libtestshade.so.%%SHL2%%
+lib/libtestshade.so.%%SHL3%%
 lib/osl.imageio.so
 libdata/pkgconfig/oslcomp.pc
 libdata/pkgconfig/oslexec.pc