graphics/openshadinglanguage: update to 1.12.6.2 release (+)

Changelog:	https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/tag/v1.12.6.2
Approved by:	maintainer (implicit)

graphics/openshadinglanguage/Makefile

@@ -1,7 +1,6 @@
 PORTNAME=	openshadinglanguage
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.17.0
-PORTREVISION=	2
+DISTVERSION=	1.12.6.2
 CATEGORIES?=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
@@ -37,12 +36,9 @@ CMAKE_ARGS+=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
 # This flag fixes linking with clang 9.0 ??
 CXXFLAGS+=	-DNDEBUG
 
-OPTIONS_DEFINE=		MATERIALX OSLTOY
+OPTIONS_DEFINE=		OSLTOY
 OPTIONS_SUB=		yes
 
-MATERIALX_DESC=		Install material library
-MATERIALX_CMAKE_BOOL=	OSL_BUILD_MATERIALX
-
 OSLTOY_DESC=		Interactive shader edit and visualize tool
 OSLTOY_CMAKE_BOOL=	USE_QT
 OSLTOY_USE=		QT=buildtools:build,core,gui,qmake:build,widgets
@@ -65,7 +61,6 @@ post-patch:
 	@${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
 

graphics/openshadinglanguage/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1642948000
-SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.11.17.0_GH0.tar.gz) = ab7e17fde3f759b94efcc159d8f4ccc6cc92f40cba76e4f88a8133a00587738f
-SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.11.17.0_GH0.tar.gz) = 13888114
+TIMESTAMP = 1665081363
+SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.6.2_GH0.tar.gz) = 0115a0a09ac9ef0ade88f2434e1472323b335c3f0ddcca0ffd062f9cc822e629
+SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.6.2_GH0.tar.gz) = 20247666

graphics/openshadinglanguage/files/patch-llvm14

@@ -1,29 +0,0 @@
-diff --git src/build-scripts/build_llvm.bash src/build-scripts/build_llvm.bash
-index 2e8f49fca..3b375e543 100755
---- src/build-scripts/build_llvm.bash
-+++ src/build-scripts/build_llvm.bash
-@@ -29,7 +29,7 @@ if [[ `uname` == "Linux" ]] ; then
-     fi
-     LLVMTAR=clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-${LLVM_DISTRO_NAME}.tar.xz
-     echo LLVMTAR = $LLVMTAR
--    if [[ "$LLVM_VERSION" == "10.0.0" ]] || [[ "$LLVM_VERSION" == "11.0.0" ]] || [[ "$LLVM_VERSION" == "11.1.0" ]] || [[ "$LLVM_VERSION" == "12.0.0" ]] ; then
-+    if [[ "$LLVM_VERSION" == "10.0.0" ]] || [[ "$LLVM_VERSION" == "11.0.0" ]] || [[ "$LLVM_VERSION" == "11.1.0" ]] || [[ "$LLVM_VERSION" == "12.0.0" ]] || [[ "$LLVM_VERSION" == "13.0.0" ]]  || [[ "$LLVM_VERSION" == "14.0.0" ]]  || [[ "$LLVM_VERSION" == "14.0.1" ]] ; then
-         # new
-         curl --location https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/${LLVMTAR} -o $LLVMTAR
-     else
-diff --git src/liboslexec/llvm_util.cpp src/liboslexec/llvm_util.cpp
-index b30c89318..22d4134ba 100644
---- src/liboslexec/llvm_util.cpp
-+++ src/liboslexec/llvm_util.cpp
-@@ -45,7 +45,11 @@
- #include <llvm/Support/raw_os_ostream.h>
- #include <llvm/IR/LegacyPassManager.h>
- #include <llvm/IR/ValueSymbolTable.h>
-+#if OSL_LLVM_VERSION < 140
- #include <llvm/Support/TargetRegistry.h>
-+#else
-+#include <llvm/MC/TargetRegistry.h>
-+#endif
- 
- #include <llvm/Bitcode/BitcodeReader.h>
- #include <llvm/Bitcode/BitcodeWriter.h>

graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt

@@ -1,20 +1,11 @@
---- src/liboslexec/CMakeLists.txt.orig	2020-09-05 23:50:56 UTC
+--- src/liboslexec/CMakeLists.txt.orig	2022-09-30 23:43:53 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 )
+@@ -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 soures
+     # 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 "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
-+        COMMAND %%PYCMD%% "${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.py"
+-        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_CURRENT_SOURCE_DIR}/serialize-bc.py" ${linked_shadeops_bc}
+         DEPENDS "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${linked_shadeops_bc}
          ${exec_headers} ${PROJECT_PUBLIC_HEADERS}

graphics/openshadinglanguage/files/patch-src_shaders_CMakeLists.txt

@@ -1,8 +1,8 @@
---- src/shaders/CMakeLists.txt.orig	2018-02-02 20:54:13 UTC
+--- src/shaders/CMakeLists.txt.orig	2022-09-30 23:43:53 UTC
 +++ src/shaders/CMakeLists.txt
-@@ -63,4 +63,4 @@ add_custom_target (shaders ALL
+@@ -63,4 +63,4 @@ install (FILES ${shader_headers} ${shader_source} ${sh
                     SOURCES ${shader_source} ${shader_headers})
  
  install (FILES ${shader_headers} ${shader_source} ${shader_objs}
--        DESTINATION shaders)
+-         DESTINATION ${OSL_SHADER_INSTALL_DIR})
 +        DESTINATION %%DATADIR%%/shaders)

graphics/openshadinglanguage/files/patch-src_shaders_MaterialX_CMakeLists.txt

@@ -1,18 +0,0 @@
---- src/shaders/MaterialX/CMakeLists.txt.orig	2018-12-03 14:24:20 UTC
-+++ src/shaders/MaterialX/CMakeLists.txt
-@@ -64,7 +64,7 @@ macro (mx_oslc_compile)
-         message (STATUS "oslc will make ${mxfile_justname} -> ${oslfile_justname} -> ${osofile_justname}")
-     endif ()
-     add_custom_command (OUTPUT ${osofile}
--        COMMAND python "${CMAKE_CURRENT_SOURCE_DIR}/build_materialX_osl.py"
-+        COMMAND %%PYCMD%% "${CMAKE_CURRENT_SOURCE_DIR}/build_materialX_osl.py"
-                        -s "${_shader_SHADERNAME}"
-                        -m "${mxfile}"
-                        -o "${oslfile}"
-@@ -258,5 +258,5 @@ add_custom_target (mxshaders ALL
-                    SOURCES ${shader_source} ${mx_shader_headers})
- 
- install (FILES ${mx_shader_headers} ${mx_shader_objs} ${mx_shader_osls}
--         DESTINATION shaders/MaterialX)
-+         DESTINATION %%DATADIR%%/shaders/MaterialX)
- 

graphics/py-openshadinglanguage/Makefile

@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics multimedia python
 # Note this port shares its PORTREVISION with graphics/openshadinglanguage!
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}