From owner-svn-ports-all@freebsd.org Mon Sep 14 03:28:56 2020 Return-Path: Delivered-To: svn-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 93CEC3F0544; Mon, 14 Sep 2020 03:28:56 +0000 (UTC) (envelope-from vanilla@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BqWzr3LTrz46CS; Mon, 14 Sep 2020 03:28:56 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 55EE8109CB; Mon, 14 Sep 2020 03:28:56 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08E3Su3S074701; Mon, 14 Sep 2020 03:28:56 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08E3StPj074693; Mon, 14 Sep 2020 03:28:55 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <202009140328.08E3StPj074693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Mon, 14 Sep 2020 03:28:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548581 - in head/graphics/openshadinglanguage: . files X-SVN-Group: ports-head X-SVN-Commit-Author: vanilla X-SVN-Commit-Paths: in head/graphics/openshadinglanguage: . files X-SVN-Commit-Revision: 548581 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2020 03:28:56 -0000 Author: vanilla Date: Mon Sep 14 03:28:55 2020 New Revision: 548581 URL: https://svnweb.freebsd.org/changeset/ports/548581 Log: Update to 1.11.7.3. Includes support for new slave port to install python module. PR: 249138 Submitted by: maintainer Added: head/graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt (contents, props changed) head/graphics/openshadinglanguage/pkg-plist-pybind (contents, props changed) Modified: head/graphics/openshadinglanguage/Makefile head/graphics/openshadinglanguage/distinfo head/graphics/openshadinglanguage/pkg-plist Modified: head/graphics/openshadinglanguage/Makefile ============================================================================== --- head/graphics/openshadinglanguage/Makefile Mon Sep 14 00:15:18 2020 (r548580) +++ head/graphics/openshadinglanguage/Makefile Mon Sep 14 03:28:55 2020 (r548581) @@ -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 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ 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 @@ OSLTOY_USE= QT=buildtools,core,gui,qmake_build,widget 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 + 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+= ${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} +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 Modified: head/graphics/openshadinglanguage/distinfo ============================================================================== --- head/graphics/openshadinglanguage/distinfo Mon Sep 14 00:15:18 2020 (r548580) +++ head/graphics/openshadinglanguage/distinfo Mon Sep 14 03:28:55 2020 (r548581) @@ -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 Added: head/graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openshadinglanguage/files/patch-src_liboslexec_CMakeLists.txt Mon Sep 14 03:28:55 2020 (r548581) @@ -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} Modified: head/graphics/openshadinglanguage/pkg-plist ============================================================================== --- head/graphics/openshadinglanguage/pkg-plist Mon Sep 14 00:15:18 2020 (r548580) +++ head/graphics/openshadinglanguage/pkg-plist Mon Sep 14 03:28:55 2020 (r548581) @@ -4,15 +4,18 @@ bin/oslinfo 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/oslexec.h 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 @@ lib/osl.imageio.so %%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 Added: head/graphics/openshadinglanguage/pkg-plist-pybind ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openshadinglanguage/pkg-plist-pybind Mon Sep 14 03:28:55 2020 (r548581) @@ -0,0 +1 @@ +%%PYTHON_SITELIBDIR%%/oslquery.so