From nobody Sun May 29 00:39:06 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 709661B55015; Sun, 29 May 2022 00:39:06 +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 4L9fmp2kP0z3mJ5; Sun, 29 May 2022 00:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653784746; 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=CaA8RZYZqIwZnYVKwDAmGdHArhPyCuTSgXe4iOR5/do=; b=cvdfrxBUJucTYFQQMUZOUDZCYj4kzv8ohoKD6AGOlh2WFBmzDN+H6p5/Shk2io7UuDy3h/ LOfnkI5h0d0Isqg3ohhrdxkf6esh7oaRuQKz8UFGH1G62PmV6A/sG+L2wNpZeDEOnLtqUo rMQNV1yuI9SlS5bCj5OA6Cuyi+NRqaHbYWRRj1hi3bm6fGuRWrMlr6XNRQwpl7D2mWEfAP TnktykeKGdZFlEAqQ1qn8Sw+X2QQLnMO+NKhdVNy6IN74UhyQNag3Vdhht38O/LNzJNtSu eLDUL4aC9Mp8hAlLS9pc95uck9HDDbaGKcKMA1s/zON22nYV+ZVWoLXXtT1UbQ== 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 3446118EDD; Sun, 29 May 2022 00:39:06 +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 24T0d6YR096561; Sun, 29 May 2022 00:39:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24T0d6QW096560; Sun, 29 May 2022 00:39:06 GMT (envelope-from git) Date: Sun, 29 May 2022 00:39:06 GMT Message-Id: <202205290039.24T0d6QW096560@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: b12bde426257 - main - graphics/blender-lts29: unbreak and update to 2.93.9 LTS 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: b12bde4262578bfe7f50e189cdb102f4cb48b958 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653784746; 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=CaA8RZYZqIwZnYVKwDAmGdHArhPyCuTSgXe4iOR5/do=; b=FIvhLFgs4VcCcv7edWXhasxO0V5S6T/2iYwIrUSa+tAdAgTAOGwwIUbK5iUg489zZp7eID zT2baWNZj/TD4PqVoHuCfTMysCzL1ysN+xhXmw1a07/GC6hgIM2uf1fQD4HXbJkmS3m5wk qlhhe7Fz31psghQEi65pbqodD3DmZuByElotxjql4Y9t04PHAJFvlhQ4C5SvTp5OrTUqyS OkKahjcOJNASX5rNPDkLZ33SZkDSrWYHYJlTjHlej1gCU0utgmuqJiL2q73EjQTuqanJn+ aFnHBrsrsOYkC8YGubSWUCfcPwZpdoEkcAWglg3q0yYdqADDM56FBjp2HjFXpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653784746; a=rsa-sha256; cv=none; b=K2RhyxZHE/4l1lmOjMq7c9ywSvsJv4ZZhDKCtEExOr8rMaRWHJaj0QuVJjIGUDy3isddJr 7ISNnvFy72tyPqj747jBaNhu+a3IWpJq65YF2F8z6z3yyraLAmBl+YyYFiIjRa6d6Zs/SC e8TB2FTvQKWxbPEKpEEJAIEsGB+iVEKSEez7NP6SMyoKEmNjLOQW9QtMKqc0jrICxRGyTe WSfQTolZcv6D197x+T/MW+y+CVu7IiCBb4E3tBLCcefh2gmpmXVzjmk373JNN8zebPGwom QJ1u5FfTpH7Vu+APS5NmXlVk8qLiRB2eX3CH6LgwUFRHvN6eVD5l3oubqfJzgQ== 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=b12bde4262578bfe7f50e189cdb102f4cb48b958 commit b12bde4262578bfe7f50e189cdb102f4cb48b958 Author: Dima Panov AuthorDate: 2022-05-29 00:37:26 +0000 Commit: Dima Panov CommitDate: 2022-05-29 00:37:26 +0000 graphics/blender-lts29: unbreak and update to 2.93.9 LTS release (+) Buldled Google log library was failed to link after recent boost update. Use devel/glog instead. Enable (and use by default) OpenJPEG (JPEG2000) option Approved by: maintainer (implicit) --- graphics/blender-lts29/Makefile | 16 ++++++++-------- graphics/blender-lts29/Makefile.options | 2 ++ graphics/blender-lts29/pkg-plist | 8 +++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/graphics/blender-lts29/Makefile b/graphics/blender-lts29/Makefile index 8e393efaa327..d70107701fb3 100644 --- a/graphics/blender-lts29/Makefile +++ b/graphics/blender-lts29/Makefile @@ -1,6 +1,5 @@ PORTNAME= blender -DISTVERSION= 2.93.6 -PORTREVISION= 2 +DISTVERSION= 2.93.9 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -26,15 +25,13 @@ 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. -BROKEN= ld: error: undefined symbol: google::InitVLOG3__(google::SiteFlag*, int*, char const*, int) - -USES= cmake compiler:c++14-lang cpe gl jpeg python:3.9 shebangfix \ +USES= cmake compiler:c++17-lang cpe gl jpeg python:3.9 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 \ +CMAKE_OFF= WITH_PYTHON_INSTALL \ WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \ WITH_CYCLES_LOGGING @@ -66,8 +63,9 @@ 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_CMAKE_BOOL= WITH_LIBMV WITH_SYSTEM_GLOG +CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind \ + libglog.so:devel/glog CAMERATRACK_ONLY_FOR_ARCHS= i386 amd64 aarch64 powerpc64 powerpc64le CAMERATRACK_ONLY_FOR_ARCHS_REASON= libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON @@ -150,6 +148,8 @@ 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 +OPENJPEG_CMAKE_BOOL= WITH_IMAGE_OPENJPEG +OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg # openmp usually works on amd64 OPENMP_CMAKE_BOOL= WITH_OPENMP OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV diff --git a/graphics/blender-lts29/Makefile.options b/graphics/blender-lts29/Makefile.options index 44c793568fd2..4f95dd6b09be 100644 --- a/graphics/blender-lts29/Makefile.options +++ b/graphics/blender-lts29/Makefile.options @@ -35,6 +35,7 @@ OPTIONS_DEFINE= \ OPENEXR \ OPENIMAGEIO \ OPENIMAGEDN \ + OPENJPEG \ OPENMP \ OPENSUBDIV \ OPENVDB \ @@ -77,6 +78,7 @@ OPTIONS_DEFAULT= \ OPENCOLORIO \ OPENEXR \ OPENIMAGEIO \ + OPENJPEG \ OPENSUBDIV \ OPENVDB \ RAYOPTIMIZATION \ diff --git a/graphics/blender-lts29/pkg-plist b/graphics/blender-lts29/pkg-plist index 93d1c2d7acc4..c8a9305812d6 100644 --- a/graphics/blender-lts29/pkg-plist +++ b/graphics/blender-lts29/pkg-plist @@ -23,8 +23,8 @@ share/applications/blender%%SUFFIX%%.desktop %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/vd16.spi1d %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/xyz_D65_to_E.spimtx %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/xyz_to_aces.spimtx -%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/bmonofont-i18n.ttf -%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/droidsans.ttf +%%DATADIR%%/%%VER%%/datafiles/fonts/bmonofont-i18n.ttf +%%DATADIR%%/%%VER%%/datafiles/fonts/droidsans.ttf %%DATADIR%%/%%VER%%/datafiles/icons/brush.gpencil_draw.draw.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.gpencil_draw.erase.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.gpencil_draw.fill.dat @@ -1229,9 +1229,7 @@ share/applications/blender%%SUFFIX%%.desktop %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/ui/view3d_copy_paste_uv_objectmode.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/ui/view3d_uv_manipulation.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/ui/view3d_uv_mapping.py -%%DATADIR%%/%%VER%%/scripts/addons/magic_uv/updater.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/utils/__init__.py -%%DATADIR%%/%%VER%%/scripts/addons/magic_uv/utils/addon_updater.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/utils/bl_class_registry.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/utils/compatibility.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/utils/property_class_registry.py @@ -1993,7 +1991,7 @@ share/applications/blender%%SUFFIX%%.desktop %%DATADIR%%/%%VER%%/scripts/presets/fluid/Oil.py %%DATADIR%%/%%VER%%/scripts/presets/fluid/Water.py %%DATADIR%%/%%VER%%/scripts/presets/framerate/120.py -%%DATADIR%%/%%VER%%/scripts/presets/framerate/2%%PYTHON_VER%%8.py +%%DATADIR%%/%%VER%%/scripts/presets/framerate/23.98.py %%DATADIR%%/%%VER%%/scripts/presets/framerate/24.py %%DATADIR%%/%%VER%%/scripts/presets/framerate/240.py %%DATADIR%%/%%VER%%/scripts/presets/framerate/25.py