graphics/{,py-}openshadinglanguage: update 1.12.14.0 → 1.13.10.0

Changelog:
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.13.6.0-beta1
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.13.6.1
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.13.7.0
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.13.8.0
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.13.9.0
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.13.10.0

PR:	279846

6 files changed, 42 insertions, 20 deletions

diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index ec9b0ddf6a9b..e7b9cbed0f71 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	openshadinglanguage
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.12.14.0
+DISTVERSION=	1.13.10.0
 # PORTREVISION must be set with ?= so as not to stomp over
 # py-openimageio's PORTREVISION.
 # Also, just to be on the safe side, when resetting,
 # best keep PORTREVISION?=	0.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES?=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
@@ -17,6 +17,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_riscv64=	fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture
 
+ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64 powerpc64le
+ONLY_FOR_ARCHS_REASON=	fails static_assert(sizeof(ustringhash) == sizeof(size_t)
+
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libImath.so:math/Imath \
 		libOpenEXR.so:graphics/openexr \
@@ -24,13 +27,13 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libpartio.so:graphics/partio \
 		libpugixml.so:textproc/pugixml
 
-USES=		bison cmake compiler:c++14-lang llvm:max=15,lib localbase ncurses
+USES=		bison cmake compiler:c++17-lang localbase ncurses
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AcademySoftwareFoundation
 GH_PROJECT=	OpenShadingLanguage
 
-CMAKE_ARGS+=	-DCMAKE_CXX_STANDARD=14 -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \
+CMAKE_ARGS+=	-DCMAKE_CXX_STANDARD:INTEGER=17 -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \
 		-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}"
 CMAKE_ON=	ENABLE_RTTI OSL_BUILD_TESTS USE_LIBCPLUSPLUS USE_LLVM_BITCODE
 
@@ -51,6 +54,7 @@ OSLTOY_CMAKE_BOOL=	USE_QT
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
 		-e 's,%%PYCMD%%,${PYTHON_CMD},' \
+		${WRKSRC}/CMakeLists.txt \
 		${WRKSRC}/src/shaders/CMakeLists.txt \
 		${WRKSRC}/src/doc/CMakeLists.txt \
 		${WRKSRC}/src/liboslexec/CMakeLists.txt
@@ -69,10 +73,14 @@ 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
+# using python:env as this port doesn't need to use python
+# a python util script is installed for user consumption
+# it is not required for using the port, only to assist developers using the libs
+USES+=		python:build shebangfix
 USE_LDCONFIG=	yes
 CMAKE_OFF+=	USE_PYTHON
 BINARY_ALIAS+=	python=${PYTHON_CMD}
+SHEBANG_FILES+=	src/build-scripts/serialize-bc.py
 .endif # SLAVE_PORT
 
 .include <bsd.port.mk>
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index 957163e9c9a6..696cad51058a 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690299022
-SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.14.0_GH0.tar.gz) = 6562a3fa10b80b8d328951004258ab6d12a6a23c23143f46a86d2f48f55354d3
-SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.14.0_GH0.tar.gz) = 20555853
+TIMESTAMP = 1717481007
+SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.13.10.0_GH0.tar.gz) = 302f573d21c700d859fb36497d377656cb51213309d95bebda941bb0993a7f42
+SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.13.10.0_GH0.tar.gz) = 21776721
diff --git a/graphics/openshadinglanguage/files/patch-CMakeLists.txt b/graphics/openshadinglanguage/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..d7d0a67c8952
--- /dev/null
+++ b/graphics/openshadinglanguage/files/patch-CMakeLists.txt
@@ -0,0 +1,18 @@
+--- 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
diff --git a/graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt b/graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt
deleted file mode 100644
index e9255bb1cf9f..000000000000
--- a/graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/liboslexec/CMakeLists.txt.orig	2022-09-30 23:43:53 UTC
-+++ src/liboslexec/CMakeLists.txt
-@@ -211,7 +211,7 @@ macro ( CUDA_SHADEOPS_COMPILE srclist )
- 
-     # Serialize the linked bitcode into a CPP file and add it to the list of liboslexec sources
-     add_custom_command ( OUTPUT ${shadeops_bc_cuda_cpp}
--        COMMAND ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
-+        COMMAND %%PY_CMD%% "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
-             ${linked_shadeops_bc} ${shadeops_bc_cuda_cpp} "osl_llvm_compiled_ops_cuda"
-         DEPENDS "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${linked_shadeops_bc}
-         ${exec_headers} ${PROJECT_PUBLIC_HEADERS}
diff --git a/graphics/openshadinglanguage/pkg-plist b/graphics/openshadinglanguage/pkg-plist
index 2571c410db71..7306f2f88155 100644
--- a/graphics/openshadinglanguage/pkg-plist
+++ b/graphics/openshadinglanguage/pkg-plist
@@ -8,10 +8,13 @@ include/OSL/accum.h
 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
@@ -19,6 +22,7 @@ include/OSL/Imathx/ImathLimits.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
@@ -37,8 +41,10 @@ include/OSL/sfm_simplex.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
@@ -62,6 +68,7 @@ lib/osl.imageio.so
 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
diff --git a/graphics/py-openshadinglanguage/Makefile b/graphics/py-openshadinglanguage/Makefile
index a1707b8c59e3..1fa4e38214f8 100644
--- a/graphics/py-openshadinglanguage/Makefile
+++ b/graphics/py-openshadinglanguage/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics multimedia python
 # Note this port shares its PORTREVISION with graphics/openshadinglanguage!
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}