From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:42 2021 Return-Path: Delivered-To: dev-commits-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 1A3915E4042; Mon, 12 Apr 2021 00:34:42 +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 4FJV9s6QRVz4nhQ; Mon, 12 Apr 2021 00:34:41 +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 C85035ABF; Mon, 12 Apr 2021 00:34:41 +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 13C0YfMt092670; Mon, 12 Apr 2021 00:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YfJI092669; Mon, 12 Apr 2021 00:34:41 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:41 GMT Message-Id: <202104120034.13C0YfJI092669@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: 02ac12ab4347 - main - graphics/pfstools: 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: 02ac12ab4347d0b8c512b99d6046e667f70558cb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 00:34:42 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=02ac12ab4347d0b8c512b99d6046e667f70558cb commit 02ac12ab4347d0b8c512b99d6046e667f70558cb Author: Matthias Andree AuthorDate: 2021-04-11 21:38:20 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:49 +0000 graphics/pfstools: make compatible with OpenEXR/Imath 3.0 --- graphics/pfstools/Makefile | 9 ++++---- .../pfstools/files/patch-cmake_FindOpenEXR.cmake | 26 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index ee1a77f825dd..2f22f1385cf1 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -2,7 +2,7 @@ PORTNAME= pfstools DISTVERSION= 2.1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF @@ -16,13 +16,14 @@ RUN_DEPENDS= bash:shells/bash CONFLICTS= pfstmo-1.* pfscalibration-1.* +CFLAGS+= -I${LOCALBASE}/include/Imath LDFLAGS+= -lthr USES= cmake tar:tgz dos2unix jpeg perl5 USE_PERL5= run USE_LDCONFIG= yes -CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON \ +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON \ -DWITH_MATLAB=OFF \ -DBASH_EXECUTABLE:STRING=${LOCALBASE}/bin/bash \ -DPERL_EXECUTABLE:STRING=${PERL} @@ -50,8 +51,8 @@ TIFF_CMAKE_BOOL= WITH_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff OPENEXR_CMAKE_BOOL= WITH_OpenEXR -OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ - libIex.so:graphics/ilmbase +OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ + libImath.so:math/Imath IMAGEMAGICK_CMAKE_BOOL= WITH_ImageMagick IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 diff --git a/graphics/pfstools/files/patch-cmake_FindOpenEXR.cmake b/graphics/pfstools/files/patch-cmake_FindOpenEXR.cmake new file mode 100644 index 000000000000..4b7e15621607 --- /dev/null +++ b/graphics/pfstools/files/patch-cmake_FindOpenEXR.cmake @@ -0,0 +1,26 @@ +--- cmake/FindOpenEXR.cmake.orig 2021-04-11 21:35:51 UTC ++++ cmake/FindOpenEXR.cmake +@@ -35,9 +35,8 @@ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} + ENDIF() + + SET(_openexr_FIND_COMPONENTS +- Half + Iex +- IlmImf ++ OpenEXR + IlmThread + Imath + ) +@@ -108,10 +107,10 @@ INCLUDE(FindPackageHandleStandardArgs) + + # This is a work-around as passing the list does not work in cmake 2.8.11.2 (cygwin) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG +- OPENEXR_HALF_LIBRARY OPENEXR_IEX_LIBRARY OPENEXR_ILMIMF_LIBRARY OPENEXR_ILMTHREAD_LIBRARY OPENEXR_IMATH_LIBRARY ZLIB_LIBRARY OPENEXR_INCLUDE_DIR) ++ OPENEXR_OPENEXR_LIBRARY OPENEXR_IMATH_LIBRARY ZLIB_LIBRARY OPENEXR_INCLUDE_DIR) + + IF(OPENEXR_FOUND) +- SET(OPENEXR_LIBRARIES ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY}) ++ SET(OPENEXR_LIBRARIES ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_OPENEXR_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY}) + # Both include paths are needed because of dummy OSL headers mixing #include and #include :( + SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${ZLIB_INCLUDE_DIR}) + ENDIF()