From nobody Sun Jun 09 16:21:15 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vy0YR4bhSz5MQ4G; Sun, 09 Jun 2024 16:21:15 +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 4Vy0YR48hsz4VcQ; Sun, 9 Jun 2024 16:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717950075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fanyt93qtKkJzmAaCvjShcPFoxvpGjsoBSusITQDxEY=; b=oRMIAbWRoawzHPWeICfuTH0pNsaHgAXpqCYakZ3NIUtJOS0I6ZKlvYoyvScEHyl1nMr3uh 4cHF6AO6o4ZD5+TXn+RvaqC1zfHQDkczuTYgbEr+tKTiCjHUzLyOpk05mQOfpWHDTx0RpG z09W5RbrrzuJj37ZJ1sjMLAnYTg6wAG4qgyEQKNm3GD/Wqcv4N3KdJN6BU4D3e/fJr/QHw ixJAYxtAbpXqSfuVXbxorQFuy3JZ+vLQevh/jhCpRypZhBV0S25lW8Ewrwvw0KxtgdYKrI E0Uu3eJIgrWGl9qqR7eF+UWTxMYwi/8v4ya5kZzU5WpFkd8Tq0728jtNSM2Hgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717950075; a=rsa-sha256; cv=none; b=LjaMsXvb4WCQZqPvIAtJjeOfRHgq3vZMQpigvf58YO3CmmgNvqmn5xoe6/ADhiKa0QldPG RGBEh4W8DR62MQTTE3PMN1Hu4kb2/weeY6pWGBj5onxg5LKiwU8tRUAHZrHkVdzDk/OKPz L91qS2/Qqo67HFdaKn92+V6+RRwSDcgzhDhi9SSJmZHLN532FZHUs87RMDLtpH33z1YlkN xLOKiYWoNYb5GsJlXmPgFFaAIMaEyl1LEW2Tu6mdBe3GWxE3gQNLKP2ELH+ACSoqPBdRd/ UfxFQusb7tL57G1ruaewRAvohA/+gxa9oBhmSftqqbzBVWT3FfAQyoUhoWOjQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717950075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fanyt93qtKkJzmAaCvjShcPFoxvpGjsoBSusITQDxEY=; b=prNmsQVVLwoAo6nhgvJ8pLKa3684lTbjnFOv/h+KglP1PFW22Ph4ys1T01J1lt7uKLWUDR yNvzyEFW5O6rBS9i4xS2Xl540+A2EuJNXTBfZdGuq2caVobYX/VbRMOIx5KAdgKo9Hunb5 6vZgHE16QI4dkv4Al78seDLpxHbXK96IWG78lqrNSpK58NW2VsYP9C0L8qwg5s3thD4Qeo M8mFbOAopUaKYvOvaheCVsePTndQlMtIDAE4K4dJO6oCh+ATXhFrsi5r8H4DSl7ca0H/U1 BSx/leO9GXUXyEMJ4UhKXATkLrzVQ7cPMQxXKexDwPYtUYX9wmigb5/hNXTIfQ== 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 4Vy0YR3lzhzpb4; Sun, 9 Jun 2024 16:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 459GLF4w000164; Sun, 9 Jun 2024 16:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459GLFdZ000161; Sun, 9 Jun 2024 16:21:15 GMT (envelope-from git) Date: Sun, 9 Jun 2024 16:21:15 GMT Message-Id: <202406091621.459GLFdZ000161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 7cb9bbeced6c - main - graphics/{,py-}openshadinglanguage: sort out Makefile, pet portclippy, add graphics/partio as dependency List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cb9bbeced6ca9890d332f55ac5827cc932b8248 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cb9bbeced6ca9890d332f55ac5827cc932b8248 commit 7cb9bbeced6ca9890d332f55ac5827cc932b8248 Author: Vladimir Druzenko AuthorDate: 2024-06-09 16:03:55 +0000 Commit: Vladimir Druzenko CommitDate: 2024-06-09 16:21:06 +0000 graphics/{,py-}openshadinglanguage: sort out Makefile, pet portclippy, add graphics/partio as dependency Grab silently graphics/partio (small library for reading, writing, and manipulating a variety of standard particle formats GEO, BGEO, PTC, PDB, PDA) if installed. It's possible to create build option PARTIO and prevent search partio with PARTIO_CMAKE_OFF=-DCMAKE_DISABLE_FIND_PACKAGE_partio:BOOL=ON, but partio is small and is on by default by ustream - so add it as mandatory dependency. Also rename renamed by upstream ENABLERTTI to ENABLE_RTTI and pet portclippy. PR: 279457 Approved by: Shane (maintaner) --- graphics/openshadinglanguage/Makefile | 29 +++++++++++++++-------------- graphics/py-openshadinglanguage/Makefile | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index b57c0e6cf3f4..ec9b0ddf6a9b 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -5,7 +5,7 @@ DISTVERSION= 1.12.14.0 # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= graphics devel MAINTAINER= FreeBSD@Shaneware.biz @@ -15,12 +15,13 @@ 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 +BROKEN_riscv64= fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture 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++14-lang llvm:max=15,lib localbase ncurses @@ -29,21 +30,21 @@ USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation GH_PROJECT= OpenShadingLanguage -CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS -CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \ - -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14 +CMAKE_ARGS+= -DCMAKE_CXX_STANDARD=14 -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=${PORTVERSION:R:R} SHL3=${PORTVERSION:R} OPTIONS_DEFINE= OSLTOY OPTIONS_SUB= yes OSLTOY_DESC= Interactive shader edit and visualize tool -OSLTOY_CMAKE_BOOL= USE_QT OSLTOY_USES= qt:6 gl OSLTOY_USE= GL=gl,opengl QT=base - -# DISTVERSION has an extra digit which isn't in the lib name -# for LIBVERS we want the first three digits -PLIST_SUB= SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R} +OSLTOY_CMAKE_BOOL= USE_QT .include @@ -58,20 +59,20 @@ post-patch: 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} +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 USES+= python:build -BINARY_ALIAS+= python=${PYTHON_CMD} -CMAKE_OFF+= USE_PYTHON USE_LDCONFIG= yes +CMAKE_OFF+= USE_PYTHON +BINARY_ALIAS+= python=${PYTHON_CMD} .endif # SLAVE_PORT .include diff --git a/graphics/py-openshadinglanguage/Makefile b/graphics/py-openshadinglanguage/Makefile index 1fa4e38214f8..a1707b8c59e3 100644 --- a/graphics/py-openshadinglanguage/Makefile +++ b/graphics/py-openshadinglanguage/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics multimedia python # Note this port shares its PORTREVISION with graphics/openshadinglanguage! PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}