diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index a696b7a620fe..b3100d5f7ac0 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -1,86 +1,87 @@ PORTNAME= openshadinglanguage DISTVERSIONPREFIX= v -DISTVERSION= 1.13.12.0 +DISTVERSION= 1.14.8.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?= 5 +PORTREVISION?= 0 CATEGORIES?= graphics devel MAINTAINER= FreeBSD@Shaneware.biz COMMENT?= Advanced shading language for production GI renderers WWW= https://github.com/AcademySoftwareFoundation/OpenShadingLanguage LICENSE= BSD3CLAUSE 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) +BUILD_DEPENDS= ${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr \ libOpenImageIO.so:graphics/openimageio \ libpartio.so:graphics/partio \ libpugixml.so:textproc/pugixml USES= bison cmake compiler:c++17-lang llvm:lib localbase ncurses USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation GH_PROJECT= OpenShadingLanguage 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 # DISTVERSION has an extra digit which isn't in the lib name # for LIBVERS we want the first three digits PLIST_SUB= SHL2=${DISTVERSION:R:R} SHL3=${DISTVERSION:R} OPTIONS_DEFINE= OSLTOY OPTIONS_SUB= yes OSLTOY_DESC= Interactive shader edit and visualize tool OSLTOY_USES= qt:6 gl OSLTOY_USE= GL=gl,opengl QT=base OSLTOY_CMAKE_BOOL= USE_QT .include 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 .if ${SLAVE_PORT} == yes BUILD_DEPENDS+= ${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11 LIB_DEPENDS+= liboslquery.so:graphics/openshadinglanguage RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openimageio>0:graphics/py-openimageio@${PY_FLAVOR} USES+= python USE_PYTHON= flavors CMAKE_ARGS+= -DPYTHON_VERSION=${PYTHON_VER} CMAKE_ON+= USE_PYTHON PLIST= ${PKGDIR}/pkg-plist-pybind do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR} .else # SLAVE_PORT != yes # 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 diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo index dc8cf7c805ea..dc06210dad5b 100644 --- a/graphics/openshadinglanguage/distinfo +++ b/graphics/openshadinglanguage/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738022959 -SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.13.12.0_GH0.tar.gz) = a1d359b236a691a1cc0d4a241de3081ce137a0d54be0d2db43f415802291ea88 -SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.13.12.0_GH0.tar.gz) = 21824352 +TIMESTAMP = 1766887558 +SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.14.8.0_GH0.tar.gz) = 7916ed97403766b7c853f52506cff0dc2b4a2f5f20386fb0d86817ca8725e18f +SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.14.8.0_GH0.tar.gz) = 43677183 diff --git a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt index 16ea4ca1ae18..9fbea7c8dfae 100644 --- a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt +++ b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/doc/CMakeLists.txt.orig 2021-01-27 18:00:20 UTC +--- src/doc/CMakeLists.txt.orig 2025-12-01 23:23:35 UTC +++ src/doc/CMakeLists.txt -@@ -43,7 +43,7 @@ macro (docdeep_generate) - endif () +@@ -41,7 +41,7 @@ macro (docdeep_generate) + message (VERBOSE "docdeep will make '${mdfile}'") set (docdeep_program ${CMAKE_SOURCE_DIR}/src/build-scripts/docdeep.py) add_custom_command (OUTPUT ${mdfile} -- COMMAND ${Python_EXECUTABLE} ${docdeep_program} -d ${_docdeep_NAME} -s docs.css +- COMMAND ${Python3_EXECUTABLE} ${docdeep_program} -d ${_docdeep_NAME} -s docs.css + COMMAND %%PYCMD%% ${docdeep_program} -d ${_docdeep_NAME} -s docs.css ${_docdeep_SOURCE} > "${CMAKE_CURRENT_BINARY_DIR}/${mdfile}" MAIN_DEPENDENCY ${docdeep_program} DEPENDS ${_docdeep_SOURCE} diff --git a/graphics/openshadinglanguage/pkg-plist b/graphics/openshadinglanguage/pkg-plist index 7306f2f88155..06f683e3e591 100644 --- a/graphics/openshadinglanguage/pkg-plist +++ b/graphics/openshadinglanguage/pkg-plist @@ -1,114 +1,107 @@ bin/oslc bin/oslinfo %%OSLTOY%%bin/osltoy bin/testrender bin/testshade bin/testshade_dso 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 -include/OSL/Imathx/ImathLimits.h -include/OSL/Imathx/ImathMatrix.h -include/OSL/Imathx/ImathVec.h +include/OSL/hashes.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/optautomata.h include/OSL/oslclosure.h include/OSL/oslcomp.h include/OSL/oslconfig.h include/OSL/oslexec.h include/OSL/oslnoise.h include/OSL/oslquery.h include/OSL/oslversion.h include/OSL/platform.h include/OSL/rendererservices.h include/OSL/rs_free_function.h 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 lib/cmake/OSL/OSLTargets.cmake lib/liboslcomp.so lib/liboslcomp.so.%%SHL2%% lib/liboslcomp.so.%%SHL3%% lib/liboslexec.so lib/liboslexec.so.%%SHL2%% lib/liboslexec.so.%%SHL3%% lib/liboslnoise.so lib/liboslnoise.so.%%SHL2%% lib/liboslnoise.so.%%SHL3%% lib/liboslquery.so lib/liboslquery.so.%%SHL2%% lib/liboslquery.so.%%SHL3%% lib/libtestshade.so lib/libtestshade.so.%%SHL2%% lib/libtestshade.so.%%SHL3%% 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 %%DATADIR%%/shaders/emitter.oso %%DATADIR%%/shaders/glass.osl %%DATADIR%%/shaders/glass.oso %%DATADIR%%/shaders/image.osl %%DATADIR%%/shaders/image.oso %%DATADIR%%/shaders/mandelbrot.osl %%DATADIR%%/shaders/mandelbrot.oso %%DATADIR%%/shaders/matrix33.h %%DATADIR%%/shaders/matte.osl %%DATADIR%%/shaders/matte.oso %%DATADIR%%/shaders/metal.osl %%DATADIR%%/shaders/metal.oso %%DATADIR%%/shaders/oslutil.h %%DATADIR%%/shaders/stdosl.h %%DATADIR%%/shaders/ubersurface.osl %%DATADIR%%/shaders/ubersurface.oso %%DATADIR%%/shaders/vector2.h %%DATADIR%%/shaders/vector4.h %%DOCSDIR%%/CHANGES.md %%DOCSDIR%%/Figures/osltoy/osltoy-error.jpg %%DOCSDIR%%/Figures/osltoy/osltoy-fbm.jpg %%DOCSDIR%%/Figures/osltoy/osltoy-start.jpg %%DOCSDIR%%/Figures/testshade/fBm_default.jpg %%DOCSDIR%%/Figures/testshade/fBm_freq.jpg %%DOCSDIR%%/Figures/testshade/fBm_gain.jpg %%DOCSDIR%%/Figures/testshade/fBm_lac.jpg %%DOCSDIR%%/Figures/testshade/fBm_octaves.jpg %%DOCSDIR%%/Figures/testshade/makenoise.jpg %%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 %%DOCSDIR%%/docs.css %%DOCSDIR%%/markdeep.min.js -%%DOCSDIR%%/osl-languagespec.pdf %%DOCSDIR%%/osltoy.md.html %%DOCSDIR%%/testshade.md.html