Attachment #251726 for bug #279846

Lines 1-11 Link Here

(-)b/graphics/openshadinglanguage/Makefile (-5 / +13 lines)
1	PORTNAME= openshadinglanguage	1	PORTNAME= openshadinglanguage
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.12.14.0	3	DISTVERSION= 1.13.10.0
4	# PORTREVISION must be set with ?= so as not to stomp over	4	# PORTREVISION must be set with ?= so as not to stomp over
5	# py-openimageio's PORTREVISION.	5	# py-openimageio's PORTREVISION.
6	# Also, just to be on the safe side, when resetting,	6	# Also, just to be on the safe side, when resetting,
7	# best keep PORTREVISION?= 0.	7	# best keep PORTREVISION?= 0.
8	PORTREVISION?= 1	8	PORTREVISION?= 0
9	CATEGORIES?= graphics devel	9	CATEGORIES?= graphics devel
10		10
11	MAINTAINER= FreeBSD@Shaneware.biz	11	MAINTAINER= FreeBSD@Shaneware.biz
Lines 17-22 LICENSE_FILE= ${WRKSRC}/LICENSE.md Link Here
17		17
18	BROKEN_riscv64= fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture	18	BROKEN_riscv64= fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture
19		19
		20	ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le
		21	ONLY_FOR_ARCHS_REASON= fails static_assert(sizeof(ustringhash) == sizeof(size_t)
		22
20	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \	23	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
21	libImath.so:math/Imath \	24	libImath.so:math/Imath \
22	libOpenEXR.so:graphics/openexr \	25	libOpenEXR.so:graphics/openexr \
Lines 24-36 LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ Link Here
24	libpartio.so:graphics/partio \	27	libpartio.so:graphics/partio \
25	libpugixml.so:textproc/pugixml	28	libpugixml.so:textproc/pugixml
26		29
27	USES= bison cmake compiler:c++14-lang llvm:max=15,lib localbase ncurses	30	USES= bison cmake compiler:c++17-lang localbase ncurses
28		31
29	USE_GITHUB= yes	32	USE_GITHUB= yes
30	GH_ACCOUNT= AcademySoftwareFoundation	33	GH_ACCOUNT= AcademySoftwareFoundation
31	GH_PROJECT= OpenShadingLanguage	34	GH_PROJECT= OpenShadingLanguage
32		35
33	CMAKE_ARGS+= -DCMAKE_CXX_STANDARD=14 -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \	36	CMAKE_ARGS+= -DCMAKE_CXX_STANDARD:INTEGER=17 -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \
34	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}"	37	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}"
35	CMAKE_ON= ENABLE_RTTI OSL_BUILD_TESTS USE_LIBCPLUSPLUS USE_LLVM_BITCODE	38	CMAKE_ON= ENABLE_RTTI OSL_BUILD_TESTS USE_LIBCPLUSPLUS USE_LLVM_BITCODE
36		39
Lines 51-56 OSLTOY_CMAKE_BOOL= USE_QT Link Here
51	post-patch:	54	post-patch:
52	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \	55	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
53	-e 's,%%PYCMD%%,${PYTHON_CMD},' \	56	-e 's,%%PYCMD%%,${PYTHON_CMD},' \
		57	${WRKSRC}/CMakeLists.txt \
54	${WRKSRC}/src/shaders/CMakeLists.txt \	58	${WRKSRC}/src/shaders/CMakeLists.txt \
55	${WRKSRC}/src/doc/CMakeLists.txt \	59	${WRKSRC}/src/doc/CMakeLists.txt \
56	${WRKSRC}/src/liboslexec/CMakeLists.txt	60	${WRKSRC}/src/liboslexec/CMakeLists.txt
Lines 69-78 do-install: Link Here
69	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}	73	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
70	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR}	74	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR}
71	.else # SLAVE_PORT != yes	75	.else # SLAVE_PORT != yes
72	USES+= python:build	76	# using python:env as this port doesn't need to use python
		77	# a python util script is installed for user consumption
		78	# it is not required for using the port, only to assist developers using the libs
		79	USES+= python:build shebangfix
73	USE_LDCONFIG= yes	80	USE_LDCONFIG= yes
74	CMAKE_OFF+= USE_PYTHON	81	CMAKE_OFF+= USE_PYTHON
75	BINARY_ALIAS+= python=${PYTHON_CMD}	82	BINARY_ALIAS+= python=${PYTHON_CMD}
		83	SHEBANG_FILES+= src/build-scripts/serialize-bc.py
76	.endif # SLAVE_PORT	84	.endif # SLAVE_PORT
77		85
78	.include <bsd.port.mk>	86	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/graphics/openshadinglanguage/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1690299022	1	TIMESTAMP = 1717481007
2	SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.14.0_GH0.tar.gz) = 6562a3fa10b80b8d328951004258ab6d12a6a23c23143f46a86d2f48f55354d3	2	SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.13.10.0_GH0.tar.gz) = 302f573d21c700d859fb36497d377656cb51213309d95bebda941bb0993a7f42
3	SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.14.0_GH0.tar.gz) = 20555853	3	SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.13.10.0_GH0.tar.gz) = 21776721




--- CMakeLists.txt.orig	2024-02-20 23:53:17 UTC
+++ CMakeLists.txt
@@ -294,13 +294,13 @@ configure_package_config_file ("${PROJECT_SOURCE_DIR}/
 install (FILES "${OSL_PROJECT_CONFIG}" "${OSL_VERSION_CONFIG}"
         DESTINATION "${OSL_CONFIG_INSTALL_DIR}")
 
-install (FILES src/cmake/llvm_macros.cmake DESTINATION cmake)
+install (FILES src/cmake/llvm_macros.cmake DESTINATION ${OSL_CONFIG_INSTALL_DIR})
 
 set (PERMISSION_FLAGS OWNER_EXECUTE OWNER_READ OWNER_WRITE
                       GROUP_EXECUTE GROUP_READ
                       WORLD_EXECUTE WORLD_READ)
 install (FILES src/build-scripts/serialize-bc.py
-         DESTINATION build-scripts
+         DESTINATION %%DATADIR%%/build-scripts
          PERMISSIONS ${PERMISSION_FLAGS})
 
 # install targets files

Removed Link Here

(-)a/graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt (-11 lines)
1	--- src/liboslexec/CMakeLists.txt.orig 2022-09-30 23:43:53 UTC
2	+++ src/liboslexec/CMakeLists.txt
3	@@ -211,7 +211,7 @@ macro ( CUDA_SHADEOPS_COMPILE srclist )
4
5	# Serialize the linked bitcode into a CPP file and add it to the list of liboslexec sources
6	add_custom_command ( OUTPUT ${shadeops_bc_cuda_cpp}
7	- COMMAND ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
8	+ COMMAND %%PY_CMD%% "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
9	${linked_shadeops_bc} ${shadeops_bc_cuda_cpp} "osl_llvm_compiled_ops_cuda"
10	DEPENDS "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${linked_shadeops_bc}
11	${exec_headers} ${PROJECT_PUBLIC_HEADERS}




include/OSL/batched_rendererservices.h
include/OSL/batched_shaderglobals.h
include/OSL/batched_texture.h
include/OSL/device_ptr.h
include/OSL/device_string.h
include/OSL/dual_vec.h
include/OSL/dual.h
include/OSL/encodedtypes.h
include/OSL/export.h
include/OSL/fmt_util.h
include/OSL/genclosure.h
include/OSL/Imathx/ImathColor.h
include/OSL/Imathx/ImathFun.h

include/OSL/Imathx/ImathMatrix.h
include/OSL/Imathx/ImathVec.h
include/OSL/Imathx/Imathx.h
include/OSL/journal.h
include/OSL/llvm_util.h
include/OSL/mask.h
include/OSL/matrix22.h

include/OSL/sfmath.h
include/OSL/shaderglobals.h
include/OSL/strdecls.h
include/OSL/variant.h
include/OSL/wide.h
include/OSL/sfm_staticmatrix.h
lib/cmake/OSL/llvm_macros.cmake
lib/cmake/OSL/OSLConfig.cmake
lib/cmake/OSL/OSLConfigVersion.cmake
lib/cmake/OSL/OSLTargets-%%CMAKE_BUILD_TYPE%%.cmake

libdata/pkgconfig/oslcomp.pc
libdata/pkgconfig/oslexec.pc
libdata/pkgconfig/oslquery.pc
%%DATADIR%%/build-scripts/serialize-bc.py
%%DATADIR%%/shaders/color2.h
%%DATADIR%%/shaders/color4.h
%%DATADIR%%/shaders/emitter.osl

Lines 1-4 Link Here

(-)b/graphics/py-openshadinglanguage/Makefile (-1 / +1 lines)
1	PORTREVISION= 1	1	PORTREVISION= 0
2	CATEGORIES= graphics multimedia python	2	CATEGORIES= graphics multimedia python
3	# Note this port shares its PORTREVISION with graphics/openshadinglanguage!	3	# Note this port shares its PORTREVISION with graphics/openshadinglanguage!
4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Return to bug 279846

Added Link Here

(-)b/graphics/openshadinglanguage/files/patch-CMakeLists.txt (+18 lines)
1	--- CMakeLists.txt.orig 2024-02-20 23:53:17 UTC
2	+++ CMakeLists.txt
3	@@ -294,13 +294,13 @@ configure_package_config_file ("${PROJECT_SOURCE_DIR}/
4	install (FILES "${OSL_PROJECT_CONFIG}" "${OSL_VERSION_CONFIG}"
5	DESTINATION "${OSL_CONFIG_INSTALL_DIR}")
6
7	-install (FILES src/cmake/llvm_macros.cmake DESTINATION cmake)
8	+install (FILES src/cmake/llvm_macros.cmake DESTINATION ${OSL_CONFIG_INSTALL_DIR})
9
10	set (PERMISSION_FLAGS OWNER_EXECUTE OWNER_READ OWNER_WRITE
11	GROUP_EXECUTE GROUP_READ
12	WORLD_EXECUTE WORLD_READ)
13	install (FILES src/build-scripts/serialize-bc.py
14	- DESTINATION build-scripts
15	+ DESTINATION %%DATADIR%%/build-scripts
16	PERMISSIONS ${PERMISSION_FLAGS})
17
18	# install targets files

Lines 8-17 include/OSL/accum.h Link Here

(-)b/graphics/openshadinglanguage/pkg-plist (+7 lines)
8	include/OSL/batched_rendererservices.h	8	include/OSL/batched_rendererservices.h
9	include/OSL/batched_shaderglobals.h	9	include/OSL/batched_shaderglobals.h
10	include/OSL/batched_texture.h	10	include/OSL/batched_texture.h
		11	include/OSL/device_ptr.h
11	include/OSL/device_string.h	12	include/OSL/device_string.h
12	include/OSL/dual_vec.h	13	include/OSL/dual_vec.h
13	include/OSL/dual.h	14	include/OSL/dual.h
		15	include/OSL/encodedtypes.h
14	include/OSL/export.h	16	include/OSL/export.h
		17	include/OSL/fmt_util.h
15	include/OSL/genclosure.h	18	include/OSL/genclosure.h
16	include/OSL/Imathx/ImathColor.h	19	include/OSL/Imathx/ImathColor.h
17	include/OSL/Imathx/ImathFun.h	20	include/OSL/Imathx/ImathFun.h
Lines 19-24 include/OSL/Imathx/ImathLimits.h Link Here
19	include/OSL/Imathx/ImathMatrix.h	22	include/OSL/Imathx/ImathMatrix.h
20	include/OSL/Imathx/ImathVec.h	23	include/OSL/Imathx/ImathVec.h
21	include/OSL/Imathx/Imathx.h	24	include/OSL/Imathx/Imathx.h
		25	include/OSL/journal.h
22	include/OSL/llvm_util.h	26	include/OSL/llvm_util.h
23	include/OSL/mask.h	27	include/OSL/mask.h
24	include/OSL/matrix22.h	28	include/OSL/matrix22.h
Lines 37-44 include/OSL/sfm_simplex.h Link Here
37	include/OSL/sfmath.h	41	include/OSL/sfmath.h
38	include/OSL/shaderglobals.h	42	include/OSL/shaderglobals.h
39	include/OSL/strdecls.h	43	include/OSL/strdecls.h
		44	include/OSL/variant.h
40	include/OSL/wide.h	45	include/OSL/wide.h
41	include/OSL/sfm_staticmatrix.h	46	include/OSL/sfm_staticmatrix.h
		47	lib/cmake/OSL/llvm_macros.cmake
42	lib/cmake/OSL/OSLConfig.cmake	48	lib/cmake/OSL/OSLConfig.cmake
43	lib/cmake/OSL/OSLConfigVersion.cmake	49	lib/cmake/OSL/OSLConfigVersion.cmake
44	lib/cmake/OSL/OSLTargets-%%CMAKE_BUILD_TYPE%%.cmake	50	lib/cmake/OSL/OSLTargets-%%CMAKE_BUILD_TYPE%%.cmake
Lines 62-67 lib/osl.imageio.so Link Here
62	libdata/pkgconfig/oslcomp.pc	68	libdata/pkgconfig/oslcomp.pc
63	libdata/pkgconfig/oslexec.pc	69	libdata/pkgconfig/oslexec.pc
64	libdata/pkgconfig/oslquery.pc	70	libdata/pkgconfig/oslquery.pc
		71	%%DATADIR%%/build-scripts/serialize-bc.py
65	%%DATADIR%%/shaders/color2.h	72	%%DATADIR%%/shaders/color2.h
66	%%DATADIR%%/shaders/color4.h	73	%%DATADIR%%/shaders/color4.h
67	%%DATADIR%%/shaders/emitter.osl	74	%%DATADIR%%/shaders/emitter.osl