From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:18 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 073215E3CD4; Mon, 12 Apr 2021 00:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJV9P5vMdz4nRl; Mon, 12 Apr 2021 00:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE8F35ABA; Mon, 12 Apr 2021 00:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13C0YHuV092199; Mon, 12 Apr 2021 00:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YHEi092198; Mon, 12 Apr 2021 00:34:17 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:17 GMT Message-Id: <202104120034.13C0YHEi092198@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: f57940a456d4 - main - graphics/openshadinglanguage: make compatible with OpenEXR/Imath 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f57940a456d40c928d7db6a3733ea457947058a6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 00:34:18 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=f57940a456d40c928d7db6a3733ea457947058a6 commit f57940a456d40c928d7db6a3733ea457947058a6 Author: Matthias Andree AuthorDate: 2021-04-10 21:22:33 +0000 Commit: Matthias Andree 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@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}