From owner-dev-commits-ports-main@freebsd.org Mon Apr 12 00:34:22 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 C6D195E4119; Mon, 12 Apr 2021 00:34:22 +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 4FJV9V482Sz4nxD; Mon, 12 Apr 2021 00:34:22 +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 4762F5BC0; Mon, 12 Apr 2021 00:34:22 +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 13C0YMxY092289; Mon, 12 Apr 2021 00:34:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YMBO092288; Mon, 12 Apr 2021 00:34:22 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:22 GMT Message-Id: <202104120034.13C0YMBO092288@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: 581762cb8de9 - main - graphics/yafaray: 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: 581762cb8de91504f0e76cb5f1ef9f6e17576eeb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 00:34:23 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=581762cb8de91504f0e76cb5f1ef9f6e17576eeb commit 581762cb8de91504f0e76cb5f1ef9f6e17576eeb Author: Matthias Andree AuthorDate: 2021-04-11 00:44:26 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:40 +0000 graphics/yafaray: make compatible with OpenEXR/Imath 3.0 --- graphics/yafaray/Makefile | 6 +-- .../files/patch-CMakeModules_FindOpenEXR.cmake | 56 ++++++++++++++++++++++ .../files/patch-src_image__handlers_exrHandler.cc | 11 +++++ 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile index ee91598859de..53d79228d907 100644 --- a/graphics/yafaray/Makefile +++ b/graphics/yafaray/Makefile @@ -3,7 +3,7 @@ PORTNAME= yafaray DISTVERSIONPREFIX= v DISTVERSION= 3.5.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -19,8 +19,8 @@ ONLY_FOR_ARCHS_REASON= assembly is only for amd64 and i386, but it breaks on i38 LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ - libHalf.so:graphics/ilmbase \ - libIlmImf.so:graphics/openexr \ + libImath.so:math/Imath \ + libOpenEXR.so:graphics/openexr \ libopencv_photo.so:graphics/opencv \ libopencv_core.so:graphics/opencv \ libpng.so:graphics/png \ diff --git a/graphics/yafaray/files/patch-CMakeModules_FindOpenEXR.cmake b/graphics/yafaray/files/patch-CMakeModules_FindOpenEXR.cmake new file mode 100644 index 000000000000..1f23d9bbcf63 --- /dev/null +++ b/graphics/yafaray/files/patch-CMakeModules_FindOpenEXR.cmake @@ -0,0 +1,56 @@ +--- CMakeModules/FindOpenEXR.cmake.orig 2020-07-13 08:15:40 UTC ++++ CMakeModules/FindOpenEXR.cmake +@@ -26,10 +26,13 @@ IF(ZLIB_FOUND) + /sw/include + /opt/local/include) + +- FIND_LIBRARY(OPENEXR_HALF_LIBRARY +- NAMES Half +- PATHS ${LIBRARY_DIRS}) +- ++ FIND_PATH(IMATH_INCLUDE_PATH ImathVec.h ++ PATH_SUFFIXES Imath ++ /usr/include ++ /usr/local/include ++ /sw/include ++ /opt/local/include) ++ + FIND_LIBRARY(OPENEXR_IEX_LIBRARY + NAMES Iex + PATHS ${LIBRARY_DIRS}) +@@ -39,7 +42,7 @@ IF(ZLIB_FOUND) + PATHS ${LIBRARY_DIRS}) + + FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY +- NAMES IlmImf ++ NAMES OpenEXR + PATHS ${LIBRARY_DIRS}) + + FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY +@@ -50,15 +53,15 @@ ENDIF(ZLIB_FOUND) + + #MESSAGE(STATUS ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARY}) + +-IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) ++IF (OPENEXR_INCLUDE_PATH AND IMATH_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY) + SET(OPENEXR_FOUND TRUE) +- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR") +- SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") ++ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_PATH} ${IMATH_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR") ++ SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${ZLIB_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + + IF(OPENEXR_ILMTHREAD_LIBRARY) + SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} ${OPENEXR_ILMTHREAD_LIBRARY}) + ENDIF(OPENEXR_ILMTHREAD_LIBRARY) +-ENDIF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) ++ENDIF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY) + + IF(OPENEXR_FOUND) + IF(NOT OPENEXR_FIND_QUIETLY) +@@ -75,5 +78,4 @@ MARK_AS_ADVANCED( + OPENEXR_LIBRARIES + OPENEXR_ILMIMF_LIBRARY + OPENEXR_IMATH_LIBRARY +- OPENEXR_IEX_LIBRARY +- OPENEXR_HALF_LIBRARY) ++ OPENEXR_IEX_LIBRARY) diff --git a/graphics/yafaray/files/patch-src_image__handlers_exrHandler.cc b/graphics/yafaray/files/patch-src_image__handlers_exrHandler.cc new file mode 100644 index 000000000000..066f94667c07 --- /dev/null +++ b/graphics/yafaray/files/patch-src_image__handlers_exrHandler.cc @@ -0,0 +1,11 @@ +--- src/image_handlers/exrHandler.cc.orig 2020-07-13 08:15:40 UTC ++++ src/image_handlers/exrHandler.cc +@@ -35,6 +35,8 @@ + #include + #include + ++typedef uint64_t Int64; ++ + using namespace Imf; + using namespace Imath; +