From nobody Tue Feb 01 17:04:39 2022 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 C0D28198C534; Tue, 1 Feb 2022 17:04:45 +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 4JpBB23XYKz4p5N; Tue, 1 Feb 2022 17:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643735085; 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=AAEmmrLZkCtVKbRgR3a7e5nsCsaD7Get1D1S+4rNmdw=; b=b2meXIsrmtP8vBrzBRBg4KfVP1R783URCD5+n60v11o0OpLekwxyX679Py+1cI1J9ybszm 5TcWciIdy96Z2XdWu+TWeyupdmrl3zDOup+zf8EpyxCsWgZcRsyhhTu6/N25fzsWFjdL71 hiruHKcW95ZFygV67m9dGgJ48wGZUGdQlhmH5hJrQ3aPyhmkTV/02xw6ofJzeaXQ0qvfC7 TEQASxw2gDTR23nkIckGI+cajA3TEQTsbrc4YIv1op4pLHPL7MZLj+ckcP9VB7Ey9qmcO2 SKTwLI9z1IyW1kQ0ATDzaWCc29ZUKLktC9F8OKNjGOecAe635j7E7leSOYbIyA== 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 2AC4814469; Tue, 1 Feb 2022 17:04:39 +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 211H4dJU086402; Tue, 1 Feb 2022 17:04:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211H4dOS086401; Tue, 1 Feb 2022 17:04:39 GMT (envelope-from git) Date: Tue, 1 Feb 2022 17:04:39 GMT Message-Id: <202202011704.211H4dOS086401@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 3eb839e43e50 - main - graphics/blender-lts28: update to 2.83.18 release 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eb839e43e50913a7a7ef8cb601899d33b6e5b10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643735083; 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=AAEmmrLZkCtVKbRgR3a7e5nsCsaD7Get1D1S+4rNmdw=; b=vjCiiVnbmVptUZLCK48sX66aJ7CkNOddW5hZmhJaa5Gk+iXcC1oY6T1XW3JOjaAayROpJw eqmGjZgNP3VhSPv0ep99biVYfiObU2hd5Ks1LLsrm1yde+dsyVpFXt3q0gkQQgECnj+h3i PPUNW7PKRkA7OvbTHUx1gNBnGncYcWzWKrT7YBh3BubS4Bh8wwaYxXx/wSMyzRDqWvgijK kjW6oN6JEm8q4vonytVNbH2BpYdZx+VGCS75KwGlrjrbQzweE0VhASTXVgxXYuSX+fS8xU HYlOzq4lv/CGc0Ii7HMv6eTxrMvoCOXkwnMLn3ZTeZ1/GC0j3AaGkJFXIcqkfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643735083; a=rsa-sha256; cv=none; b=Z80ltRO5xBMYAleMl+35KtOdb1a+sueCxE9aaaeT8kTtOgGc+lQlJV4sKyDkGB/5J4dK3j u52mNe0hHpuALPkvJtMxav0AexHVyK4cF+uAT56MsNaxmSLxNn2CCdJp0wBaBXk9TZT1pb QTCCwtLedOBDvV14WBrygsn4wYlekCBwxdk4xsl9tJNV4N+wDJQEbFXdytZVOp6xhIij87 HgSMfpaw0R6HTqhSaRs1g1jwrfeabRfT4D/rbTRWoUh00a5SJvvs5pU9Q88V/qdNBHELdV 86plT3FIvALq7Tg36oZUgrXYK5/pOkL1IaQWsKgwGOY+aOT5sbGY5Baoy28WhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eb839e43e50913a7a7ef8cb601899d33b6e5b10 commit 3eb839e43e50913a7a7ef8cb601899d33b6e5b10 Author: Dima Panov AuthorDate: 2022-02-01 16:47:17 +0000 Commit: Dima Panov CommitDate: 2022-02-01 17:04:14 +0000 graphics/blender-lts28: update to 2.83.18 release This also includes adjustment to use new ports for opencoloriov1 and openimageio-ociov1 PR: 260311 Sponsored by: Netzkommune GmbH. --- graphics/blender-lts28/Makefile | 37 +++++++++++++++------- graphics/blender-lts28/Makefile.options | 8 ++--- graphics/blender-lts28/Makefile.versions | 4 +-- graphics/blender-lts28/distinfo | 6 ++-- graphics/blender-lts28/files/patch-CMakeLists.txt | 4 +-- ...uild__files_cmake_Modules_FindOpenColorIO.cmake | 22 +++++++++++++ ...uild__files_cmake_Modules_FindOpenImageIO.cmake | 29 +++++++++++++++++ ...ch-extern_audaspace_bindings_python_PySound.cpp | 11 ------- 8 files changed, 86 insertions(+), 35 deletions(-) diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile index 135ad4c9ccc2..568c51265dd0 100644 --- a/graphics/blender-lts28/Makefile +++ b/graphics/blender-lts28/Makefile @@ -1,6 +1,5 @@ PORTNAME= blender -DISTVERSION= 2.83.15 -PORTREVISION= 10 +DISTVERSION= 2.83.18 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -23,14 +22,15 @@ RUN_DEPENDS= ${PYNUMPY} # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. -USES= cmake compiler:c++14-lang gl cpe gnome jpeg python:3.7 shebangfix \ +USES= cmake compiler:c++14-lang cpe gl jpeg python:3.7 shebangfix \ tar:xz xorg USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew +INSTALLS_ICONS= yes CMAKE_OFF= WITH_IMAGE_OPENJPEG WITH_PYTHON_INSTALL \ WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \ - WITH_CYCLES_LOGGING + WITH_CYCLES_LOGGING WITH_CYCLES_OSL WITH_LLVM SUB_FILES= blender SHEBANG_FILES= release/bin/blender-thumbnailer.py \ @@ -45,7 +45,7 @@ CXXFLAGS_i386= -march=i586 # prevent conflict with other blender versions DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -PLIST_SUB+= VER=${DISTVERSION:R} SUFFIX=${PKGNAMESUFFIX} +PLIST_SUB+= VER=${DISTVERSION:R} SUFFIX=${PKGNAMESUFFIX} CYCLESOSL="@comment " OPTIONS_SUB= yes .include "${.CURDIR}/Makefile.options" @@ -53,13 +53,15 @@ OPTIONS_SUB= yes ALEMBIC_CMAKE_BOOL= WITH_ALEMBIC ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic # note that this needs to be set to match alembics hdf5 option -ALEMBIC_HDF5_IMPLIES= ALEMBIC +ALEMBIC_HDF5_REQUIRES= ALEMBIC ALEMBIC_HDF5_CMAKE_BOOL= WITH_ALEMBIC_HDF5 ALEMBIC_HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 AVI_CMAKE_BOOL= WITH_CODEC_AVI BULLET_CMAKE_BOOL= WITH_BULLET CAMERATRACK_CMAKE_BOOL= WITH_LIBMV CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind +CAMERATRACK_ONLY_FOR_ARCHS= i386 amd64 +CAMERATRACK_ONLY_FOR_ARCHS_REASON= libunwind only supports x86/amd64 CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON COLLADA_CMAKE_BOOL= WITH_OPENCOLLADA COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada \ @@ -73,6 +75,8 @@ CYCLES_LIB_DEPENDS= libpugixml.so:textproc/pugixml CYCLESEMBR_IMPLIES= CYCLES CYCLESEMBR_CMAKE_BOOL= WITH_CYCLES_EMBREE CYCLESEMBR_LIB_DEPENDS= libembree3.so:graphics/embree +CYCLESEMBR_ONLY_FOR_ARCHS= amd64 +CYCLESEMBR_ONLY_FOR_ARCHS_REASON= embree only supports amd64 CYCLESOSL_IMPLIES= CYCLES CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ @@ -81,10 +85,11 @@ CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +CYCLESOSL_BROKEN= OSL not supported with current ocio DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG -FFMPEG_LDFLAGS= -L${PREFIX}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish +FFMPEG_LDFLAGS= -L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libflite_cmu_us_kal.so:audio/flite FFTW3_CMAKE_BOOL= WITH_FFTW3 @@ -115,7 +120,7 @@ NLS_USES= gettext iconv:lib,wchar_t OPENAL_CMAKE_BOOL= WITH_OPENAL OPENAL_USES= openal:al,alut OPENCOLORIO_CMAKE_BOOL= WITH_OPENCOLORIO -OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ +OPENCOLORIO_LIB_DEPENDS= libOpenColorIOv1.so:graphics/opencoloriov1 \ libyaml-cpp03.so:devel/yaml-cpp03 \ libtinyxml.so:textproc/tinyxml OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR @@ -124,9 +129,12 @@ OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr OPENIMAGEIO_IMPLIES= OPENEXR TIFF OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO -OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio +OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO-ociov1.so:graphics/openimageio-ociov1 +#OPENIMAGEIO_LDFLAGS= -lOpenImageIO_Util-ociov1 OPENIMAGEDN_CMAKE_BOOL= WITH_OPENIMAGEDENOISE OPENIMAGEDN_LIB_DEPENDS= libOpenImageDenoise.so:graphics/oidn +OPENIMAGEDN_ONLY_FOR_ARCHS= amd64 +OPENIMAGEDN_ONLY_FOR_ARCHS_REASON= oidn only supports amd64 # openmp usually works on amd64 OPENMP_CMAKE_BOOL= WITH_OPENMP OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV @@ -167,8 +175,15 @@ LLVM_VER= ${LLVM_DEFAULT} .endif post-patch-OPENCOLORIO-on: - @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \ - ${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake + @${REINPLACE_CMD} -e 's|OpenColorIO/OpenColorIO.h|OpenColorIOv1/OpenColorIO.h|' \ + ${PATCH_WRKSRC}/intern/opencolorio/ocio_impl_glsl.cc \ + ${PATCH_WRKSRC}/intern/opencolorio/ocio_impl.cc \ + ${PATCH_WRKSRC}/intern/cycles/render/colorspace.cpp \ + ${PATCH_WRKSRC}/intern/cycles/render/shader.cpp + @${REINPLACE_CMD} -e 's|= 0; - }