Attachment #217782 for bug #249138





PORTNAME=	openshadinglanguage
DISTVERSIONPREFIX=	Release-
DISTVERSION=	1.11.7.3
PORTREVISION=	2
CATEGORIES=	graphics devel

MAINTAINER=	FreeBSD@Shaneware.biz
COMMENT=	Advanced shading language for production GI renderers

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE.md

BROKEN_FreeBSD_12_powerpc64=	fails to compile: llvm_ops.cpp:101:10: fatal error: 'iostream' file not found


		libpugixml.so:textproc/pugixml
RUN_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}

USES=		bison cmake compiler:c++14-lang ncurses
USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	imageworks


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/}

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e 's,bash,sh,' \
		${WRKSRC}/src/liboslexec/serialize-bc.bash
	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
		-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
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
LIB_DEPENDS+=	liboslquery.so:graphics/openshadinglanguage
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openimageio>0:graphics/py-openimageio@${PY_FLAVOR}
PLIST=		${PKGDIR}/pkg-plist-pybind
USES+=		python
USE_PYTHON=	flavors
CMAKE_ON+=	USE_PYTHON
CMAKE_ARGS+=	-DPYTHON_VERSION=${PYTHON_VER}

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:build
CMAKE_OFF+=	USE_PYTHON
USE_LDCONFIG=	yes
.endif # SLAVE_PORT

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)graphics/openshadinglanguage/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1589452701	1	TIMESTAMP = 1599284253
2	SHA256 (imageworks-OpenShadingLanguage-Release-1.10.10_GH0.tar.gz) = ce17c119c3ebdb1cc02f96e59fff4c512b4f82f12f46a5d9328a61a474ba5322	2	SHA256 (imageworks-OpenShadingLanguage-Release-1.11.7.3_GH0.tar.gz) = 6ecc451f2b9b0301548d53f6a6c5425c5db8c4fa26d61479daba37e7183c8df5
3	SIZE (imageworks-OpenShadingLanguage-Release-1.10.10_GH0.tar.gz) = 13549066	3	SIZE (imageworks-OpenShadingLanguage-Release-1.11.7.3_GH0.tar.gz) = 14131976




--- src/liboslexec/CMakeLists.txt.orig	2020-09-05 23:50:56 UTC
+++ src/liboslexec/CMakeLists.txt
@@ -113,7 +113,7 @@ macro ( LLVM_COMPILE llvm_src srclist )
           -Wno-deprecated-register
           -O3 -fno-math-errno -S -emit-llvm -o ${llvm_asm} ${llvm_src}
       COMMAND "${LLVM_DIRECTORY}/bin/llvm-as" -f -o ${llvm_bc} ${llvm_asm}
-      COMMAND python "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py" ${llvm_bc} ${llvm_bc_cpp} "osl_llvm_compiled_ops"
+      COMMAND %%PYCMD%% "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py" ${llvm_bc} ${llvm_bc_cpp} "osl_llvm_compiled_ops"
       MAIN_DEPENDENCY ${llvm_src}
       DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
               ${exec_headers} ${PROJECT_PUBLIC_HEADERS}
@@ -151,7 +151,7 @@ macro ( CUDA_SHADEOPS_COMPILE srclist )
 
     # Serialize the linked bitcode into a CPP file and add it to the list of liboslexec soures
     add_custom_command ( OUTPUT ${shadeops_bc_cuda_cpp}
-        COMMAND python "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
+        COMMAND %%PYCMD%% "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
             ${linked_shadeops_bc} ${shadeops_bc_cuda_cpp} "osl_llvm_compiled_ops_cuda"
         DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py" ${linked_shadeops_bc}
         ${exec_headers} ${PROJECT_PUBLIC_HEADERS}




bin/testrender
bin/testshade
bin/testshade_dso
include/OSL/ImathMatrix_cuda.h
include/OSL/ImathVec_cuda.h
include/OSL/Imathx.h
include/OSL/accum.h
include/OSL/device_string.h
include/OSL/dual.h
include/OSL/dual_vec.h
include/OSL/export.h
include/OSL/genclosure.h
include/OSL/Imathx/ImathColor.h
include/OSL/Imathx/ImathFun.h
include/OSL/Imathx/ImathLimits.h
include/OSL/Imathx/ImathMatrix.h
include/OSL/Imathx/ImathVec.h
include/OSL/Imathx/Imathx.h
include/OSL/llvm_util.h
include/OSL/matrix22.h
include/OSL/optautomata.h

include/OSL/oslnoise.h
include/OSL/oslquery.h
include/OSL/oslversion.h
include/OSL/platform.h
include/OSL/rendererservices.h
include/OSL/sfm_simplex.h
include/OSL/sfmath.h
include/OSL/shaderglobals.h
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
lib/liboslcomp.so
lib/liboslcomp.so.1.11
lib/liboslcomp.so.%%LIBVERS%%
lib/liboslexec.so
lib/liboslexec.so.1.11
lib/liboslexec.so.%%LIBVERS%%
lib/liboslnoise.so
lib/liboslnoise.so.1.11
lib/liboslnoise.so.%%LIBVERS%%
lib/liboslquery.so
lib/liboslquery.so.1.11
lib/liboslquery.so.%%LIBVERS%%
lib/libtestshade.so
lib/libtestshade.so.1.11
lib/libtestshade.so.%%LIBVERS%%
lib/osl.imageio.so
libdata/pkgconfig/oslcomp.pc
libdata/pkgconfig/oslexec.pc
libdata/pkgconfig/oslquery.pc
%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color.osl
%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color.oso
%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color2.osl

%%DOCSDIR%%/Figures/testshade/noisetex.jpg
%%DOCSDIR%%/Figures/testshade/show_uv.jpg
%%DOCSDIR%%/INSTALL.md
%%DOCSDIR%%/LICENSE.md
%%DOCSDIR%%/OSLQuery.md.html
%%DOCSDIR%%/README.md
%%DOCSDIR%%/docdeep.md.html

Line 0 Link Here

(-)graphics/openshadinglanguage/pkg-plist-pybind (+1 lines)
	1	%%PYTHON_SITELIBDIR%%/oslquery.so

Return to bug 249138

Lines 3-16 Link Here

(-)graphics/openshadinglanguage/Makefile (-8 / +29 lines)
3		3
4	PORTNAME= openshadinglanguage	4	PORTNAME= openshadinglanguage
5	DISTVERSIONPREFIX= Release-	5	DISTVERSIONPREFIX= Release-
6	DISTVERSION= 1.10.10	6	DISTVERSION= 1.11.7.3
7	PORTREVISION= 2
8	CATEGORIES= graphics devel	7	CATEGORIES= graphics devel
9		8
10	MAINTAINER= FreeBSD@Shaneware.biz	9	MAINTAINER= FreeBSD@Shaneware.biz
11	COMMENT= Advanced shading language for production GI renderers	10	COMMENT= Advanced shading language for production GI renderers
12		11
13	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
		13	LICENSE_FILE= ${WRKSRC}/LICENSE.md
14		14
15	BROKEN_FreeBSD_12_powerpc64= fails to compile: llvm_ops.cpp:101:10: fatal error: 'iostream' file not found	15	BROKEN_FreeBSD_12_powerpc64= fails to compile: llvm_ops.cpp:101:10: fatal error: 'iostream' file not found
16		16
Lines 22-29 Link Here
22	libpugixml.so:textproc/pugixml	22	libpugixml.so:textproc/pugixml
23	RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}	23	RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
24		24
25	USES= bison cmake compiler:c++11-lang ncurses python:build	25	USES= bison cmake compiler:c++14-lang ncurses
26	USE_LDCONFIG= yes
27		26
28	USE_GITHUB= yes	27	USE_GITHUB= yes
29	GH_ACCOUNT= imageworks	28	GH_ACCOUNT= imageworks
Lines 55-69 Link Here
55		54
56	CXXFLAGS+= -I${STAGEDIR}/include	55	CXXFLAGS+= -I${STAGEDIR}/include
57		56
58	PLIST_SUB+= LIBVERS=${DISTVERSION}	57	# DISTVERSION has an extra digit which isn't in the lib name
		58	# for LIBVERS we want the first three digits
		59	PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9])\.([0-9])\.([0-9])(.)/\1.\2.\3/}
59		60
		61	.include <bsd.port.options.mk>
		62
60	post-patch:	63	post-patch:
61	@${REINPLACE_CMD} -e 's,bash,sh,' \
62	${WRKSRC}/src/liboslexec/serialize-bc.bash
63	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \	64	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
64	-e 's,%%PYCMD%%,${PYTHON_CMD},' \	65	-e 's,%%PYCMD%%,${PYTHON_CMD},' \
65	${WRKSRC}/src/shaders/CMakeLists.txt \	66	${WRKSRC}/src/shaders/CMakeLists.txt \
66	${WRKSRC}/src/shaders/MaterialX/CMakeLists.txt \	67	${WRKSRC}/src/shaders/MaterialX/CMakeLists.txt \
67	${WRKSRC}/src/doc/CMakeLists.txt	68	${WRKSRC}/src/doc/CMakeLists.txt \
		69	${WRKSRC}/src/liboslexec/CMakeLists.txt
		70
		71	.if ${SLAVE_PORT} == yes
		72	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
		73	LIB_DEPENDS+= liboslquery.so:graphics/openshadinglanguage
		74	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openimageio>0:graphics/py-openimageio@${PY_FLAVOR}
		75	PLIST= ${PKGDIR}/pkg-plist-pybind
		76	USES+= python
		77	USE_PYTHON= flavors
		78	CMAKE_ON+= USE_PYTHON
		79	CMAKE_ARGS+= -DPYTHON_VERSION=${PYTHON_VER}
		80
		81	do-install:
		82	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
		83	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR}
		84	.else # SLAVE_PORT != yes
		85	USES+= python:build
		86	CMAKE_OFF+= USE_PYTHON
		87	USE_LDCONFIG= yes
		88	.endif # SLAVE_PORT
68		89
69	.include <bsd.port.mk>	90	.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt (+20 lines)
	1	--- src/liboslexec/CMakeLists.txt.orig 2020-09-05 23:50:56 UTC
	2	+++ src/liboslexec/CMakeLists.txt
	3	@@ -113,7 +113,7 @@ macro ( LLVM_COMPILE llvm_src srclist )
	4	-Wno-deprecated-register
	5	-O3 -fno-math-errno -S -emit-llvm -o ${llvm_asm} ${llvm_src}
	6	COMMAND "${LLVM_DIRECTORY}/bin/llvm-as" -f -o ${llvm_bc} ${llvm_asm}
	7	- COMMAND python "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py" ${llvm_bc} ${llvm_bc_cpp} "osl_llvm_compiled_ops"
	8	+ COMMAND %%PYCMD%% "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py" ${llvm_bc} ${llvm_bc_cpp} "osl_llvm_compiled_ops"
	9	MAIN_DEPENDENCY ${llvm_src}
	10	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
	11	${exec_headers} ${PROJECT_PUBLIC_HEADERS}
	12	@@ -151,7 +151,7 @@ macro ( CUDA_SHADEOPS_COMPILE srclist )
	13
	14	# Serialize the linked bitcode into a CPP file and add it to the list of liboslexec soures
	15	add_custom_command ( OUTPUT ${shadeops_bc_cuda_cpp}
	16	- COMMAND python "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
	17	+ COMMAND %%PYCMD%% "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
	18	${linked_shadeops_bc} ${shadeops_bc_cuda_cpp} "osl_llvm_compiled_ops_cuda"
	19	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py" ${linked_shadeops_bc}
	20	${exec_headers} ${PROJECT_PUBLIC_HEADERS}

Lines 4-18 Link Here

(-)graphics/openshadinglanguage/pkg-plist (-9 / +23 lines)
4	bin/testrender	4	bin/testrender
5	bin/testshade	5	bin/testshade
6	bin/testshade_dso	6	bin/testshade_dso
7	include/OSL/ImathMatrix_cuda.h
8	include/OSL/ImathVec_cuda.h
9	include/OSL/Imathx.h
10	include/OSL/accum.h	7	include/OSL/accum.h
11	include/OSL/device_string.h	8	include/OSL/device_string.h
12	include/OSL/dual.h	9	include/OSL/dual.h
13	include/OSL/dual_vec.h	10	include/OSL/dual_vec.h
14	include/OSL/export.h	11	include/OSL/export.h
15	include/OSL/genclosure.h	12	include/OSL/genclosure.h
		13	include/OSL/Imathx/ImathColor.h
		14	include/OSL/Imathx/ImathFun.h
		15	include/OSL/Imathx/ImathLimits.h
		16	include/OSL/Imathx/ImathMatrix.h
		17	include/OSL/Imathx/ImathVec.h
		18	include/OSL/Imathx/Imathx.h
16	include/OSL/llvm_util.h	19	include/OSL/llvm_util.h
17	include/OSL/matrix22.h	20	include/OSL/matrix22.h
18	include/OSL/optautomata.h	21	include/OSL/optautomata.h
Lines 23-47 Link Here
23	include/OSL/oslnoise.h	26	include/OSL/oslnoise.h
24	include/OSL/oslquery.h	27	include/OSL/oslquery.h
25	include/OSL/oslversion.h	28	include/OSL/oslversion.h
		29	include/OSL/platform.h
26	include/OSL/rendererservices.h	30	include/OSL/rendererservices.h
		31	include/OSL/sfm_simplex.h
		32	include/OSL/sfmath.h
27	include/OSL/shaderglobals.h	33	include/OSL/shaderglobals.h
28	include/OSL/strdecls.h	34	include/OSL/strdecls.h
		35	include/OSL/wide.h
		36	lib/cmake/OSL/OSLConfig.cmake
		37	lib/cmake/OSL/OSLConfigVersion.cmake
		38	lib/cmake/OSL/OSLTargets-release.cmake
		39	lib/cmake/OSL/OSLTargets.cmake
29	lib/liboslcomp.so	40	lib/liboslcomp.so
30	lib/liboslcomp.so.1.10	41	lib/liboslcomp.so.1.11
31	lib/liboslcomp.so.%%LIBVERS%%	42	lib/liboslcomp.so.%%LIBVERS%%
32	lib/liboslexec.so	43	lib/liboslexec.so
33	lib/liboslexec.so.1.10	44	lib/liboslexec.so.1.11
34	lib/liboslexec.so.%%LIBVERS%%	45	lib/liboslexec.so.%%LIBVERS%%
35	lib/liboslnoise.so	46	lib/liboslnoise.so
36	lib/liboslnoise.so.1.10	47	lib/liboslnoise.so.1.11
37	lib/liboslnoise.so.%%LIBVERS%%	48	lib/liboslnoise.so.%%LIBVERS%%
38	lib/liboslquery.so	49	lib/liboslquery.so
39	lib/liboslquery.so.1.10	50	lib/liboslquery.so.1.11
40	lib/liboslquery.so.%%LIBVERS%%	51	lib/liboslquery.so.%%LIBVERS%%
41	lib/libtestshade.so	52	lib/libtestshade.so
42	lib/libtestshade.so.1.10	53	lib/libtestshade.so.1.11
43	lib/libtestshade.so.%%LIBVERS%%	54	lib/libtestshade.so.%%LIBVERS%%
44	lib/osl.imageio.so	55	lib/osl.imageio.so
		56	libdata/pkgconfig/oslcomp.pc
		57	libdata/pkgconfig/oslexec.pc
		58	libdata/pkgconfig/oslquery.pc
45	%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color.osl	59	%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color.osl
46	%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color.oso	60	%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color.oso
47	%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color2.osl	61	%%MATERIALX%%%%DATADIR%%/shaders/MaterialX/mx_absval_color2.osl
Lines 1319-1325 Link Here
1319	%%DOCSDIR%%/Figures/testshade/noisetex.jpg	1333	%%DOCSDIR%%/Figures/testshade/noisetex.jpg
1320	%%DOCSDIR%%/Figures/testshade/show_uv.jpg	1334	%%DOCSDIR%%/Figures/testshade/show_uv.jpg
1321	%%DOCSDIR%%/INSTALL.md	1335	%%DOCSDIR%%/INSTALL.md
1322	%%DOCSDIR%%/LICENSE	1336	%%DOCSDIR%%/LICENSE.md
1323	%%DOCSDIR%%/OSLQuery.md.html	1337	%%DOCSDIR%%/OSLQuery.md.html
1324	%%DOCSDIR%%/README.md	1338	%%DOCSDIR%%/README.md
1325	%%DOCSDIR%%/docdeep.md.html	1339	%%DOCSDIR%%/docdeep.md.html