Attachment 217782 Details for Bug 249138 – maintainer update for graphics/openshadinglanguage

[patch] maintainer update for graphics/openshadinglanguage

openshadinglanguage.patch (text/plain), 7.33 KB, created by Shane on 2020-09-06 07:14:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2020-09-06 07:14:38 UTC

Size: 7.33 KB

patch

obsolete

>diff -Nru graphics/openshadinglanguage.orig/Makefile graphics/openshadinglanguage/Makefile
>--- graphics/openshadinglanguage.orig/Makefile	2020-09-06 16:14:58.422010000 +0930
>+++ graphics/openshadinglanguage/Makefile	2020-09-06 16:13:51.674375000 +0930
>@@ -3,14 +3,14 @@
> 
> PORTNAME=	openshadinglanguage
> DISTVERSIONPREFIX=	Release-
>-DISTVERSION=	1.10.10
>-PORTREVISION=	2
>+DISTVERSION=	1.11.7.3
> 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
> 
>@@ -22,8 +22,7 @@
> 		libpugixml.so:textproc/pugixml
> RUN_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
> 
>-USES=		bison cmake compiler:c++11-lang ncurses python:build
>-USE_LDCONFIG=	yes
>+USES=		bison cmake compiler:c++14-lang ncurses
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	imageworks
>@@ -55,15 +54,37 @@
> 
> CXXFLAGS+=	-I${STAGEDIR}/include
> 
>-PLIST_SUB+=	LIBVERS=${DISTVERSION}
>+# 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/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>
>diff -Nru graphics/openshadinglanguage.orig/distinfo graphics/openshadinglanguage/distinfo
>--- graphics/openshadinglanguage.orig/distinfo	2020-09-06 16:14:58.421741000 +0930
>+++ graphics/openshadinglanguage/distinfo	2020-09-06 15:37:43.880167000 +0930
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589452701
>-SHA256 (imageworks-OpenShadingLanguage-Release-1.10.10_GH0.tar.gz) = ce17c119c3ebdb1cc02f96e59fff4c512b4f82f12f46a5d9328a61a474ba5322
>-SIZE (imageworks-OpenShadingLanguage-Release-1.10.10_GH0.tar.gz) = 13549066
>+TIMESTAMP = 1599284253
>+SHA256 (imageworks-OpenShadingLanguage-Release-1.11.7.3_GH0.tar.gz) = 6ecc451f2b9b0301548d53f6a6c5425c5db8c4fa26d61479daba37e7183c8df5
>+SIZE (imageworks-OpenShadingLanguage-Release-1.11.7.3_GH0.tar.gz) = 14131976
>diff -Nru graphics/openshadinglanguage.orig/files/patch-src_liboslexec_CMakeLists.txt graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt
>--- graphics/openshadinglanguage.orig/files/patch-src_liboslexec_CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
>+++ graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt	2020-09-06 15:37:43.916633000 +0930
>@@ -0,0 +1,20 @@
>+--- 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}
>diff -Nru graphics/openshadinglanguage.orig/pkg-plist graphics/openshadinglanguage/pkg-plist
>--- graphics/openshadinglanguage.orig/pkg-plist	2020-09-06 16:14:58.381894000 +0930
>+++ graphics/openshadinglanguage/pkg-plist	2020-09-06 15:37:43.948453000 +0930
>@@ -4,15 +4,18 @@
> 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
>@@ -23,25 +26,36 @@
> 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.10
>+lib/liboslcomp.so.1.11
> lib/liboslcomp.so.%%LIBVERS%%
> lib/liboslexec.so
>-lib/liboslexec.so.1.10
>+lib/liboslexec.so.1.11
> lib/liboslexec.so.%%LIBVERS%%
> lib/liboslnoise.so
>-lib/liboslnoise.so.1.10
>+lib/liboslnoise.so.1.11
> lib/liboslnoise.so.%%LIBVERS%%
> lib/liboslquery.so
>-lib/liboslquery.so.1.10
>+lib/liboslquery.so.1.11
> lib/liboslquery.so.%%LIBVERS%%
> lib/libtestshade.so
>-lib/libtestshade.so.1.10
>+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
>@@ -1319,7 +1333,7 @@
> %%DOCSDIR%%/Figures/testshade/noisetex.jpg
> %%DOCSDIR%%/Figures/testshade/show_uv.jpg
> %%DOCSDIR%%/INSTALL.md
>-%%DOCSDIR%%/LICENSE
>+%%DOCSDIR%%/LICENSE.md
> %%DOCSDIR%%/OSLQuery.md.html
> %%DOCSDIR%%/README.md
> %%DOCSDIR%%/docdeep.md.html
>diff -Nru graphics/openshadinglanguage.orig/pkg-plist-pybind graphics/openshadinglanguage/pkg-plist-pybind
>--- graphics/openshadinglanguage.orig/pkg-plist-pybind	1970-01-01 09:30:00.000000000 +0930
>+++ graphics/openshadinglanguage/pkg-plist-pybind	2020-09-06 15:37:43.961700000 +0930
>@@ -0,0 +1 @@
>+%%PYTHON_SITELIBDIR%%/oslquery.so

Actions: View | Diff

Attachments on bug 249138: 217782 | 217941