git: f57940a456d4 - main - graphics/openshadinglanguage: make compatible with OpenEXR/Imath 3.0
Matthias Andree
mandree at FreeBSD.org
Mon Apr 12 00:34:18 UTC 2021
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f57940a456d40c928d7db6a3733ea457947058a6
commit f57940a456d40c928d7db6a3733ea457947058a6
Author: Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-10 21:22:33 +0000
Commit: Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-12 00:33:38 +0000
graphics/openshadinglanguage: make compatible with OpenEXR/Imath 3.0
---
graphics/openshadinglanguage/Makefile | 10 +++++-----
graphics/openshadinglanguage/distinfo | 6 +++---
.../openshadinglanguage/files/patch-src_doc_CMakeLists.txt | 11 -----------
3 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 016e05691af5..87042b89515f 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -2,8 +2,8 @@
PORTNAME= openshadinglanguage
DISTVERSIONPREFIX= Release-
-DISTVERSION= 1.11.7.3
-PORTREVISION= 3
+DISTVERSION= 1.11.13.0
+PORTREVISION= 0
CATEGORIES= graphics devel
MAINTAINER= FreeBSD at Shaneware.biz
@@ -17,8 +17,8 @@ BROKEN_riscv64= fails to build: /usr/include/c++/v1/__threading_support:135:3:
BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
- libImath.so:graphics/ilmbase \
- libIlmImf.so:graphics/openexr \
+ libImath.so:math/Imath \
+ libOpenEXR.so:graphics/openexr \
libOpenImageIO.so:graphics/openimageio \
libpugixml.so:textproc/pugixml
RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
@@ -71,7 +71,6 @@ post-patch:
-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
.if ${SLAVE_PORT} == yes
@@ -89,6 +88,7 @@ do-install:
${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR}
.else # SLAVE_PORT != yes
USES+= python:3.6+,build
+BINARY_ALIAS+= python=${PYTHON_CMD}
CMAKE_OFF+= USE_PYTHON
USE_LDCONFIG= yes
.endif # SLAVE_PORT
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index 94f3da7bc384..9b4e47c5e101 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1618078392
+SHA256 (imageworks-OpenShadingLanguage-Release-1.11.13.0_GH0.tar.gz) = de192571b1b0cb182f108832a9d2acf5682f46248ed3ecc0464d787ccfc097cf
+SIZE (imageworks-OpenShadingLanguage-Release-1.11.13.0_GH0.tar.gz) = 14142105
diff --git a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
deleted file mode 100644
index b63440587758..000000000000
--- a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/doc/CMakeLists.txt.orig 2018-12-03 20:09:06 UTC
-+++ src/doc/CMakeLists.txt
-@@ -39,7 +39,7 @@ macro (docdeep_generate)
- endif ()
- set (docdeep_program ${CMAKE_SOURCE_DIR}/src/build-scripts/docdeep.py)
- add_custom_command (OUTPUT ${mdfile}
-- COMMAND python ${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}
More information about the dev-commits-ports-all
mailing list