From owner-dev-commits-ports-main@freebsd.org Mon Apr 12 00:34:34 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 7EB7A5E3FC9; Mon, 12 Apr 2021 00:34:34 +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 4FJV9k0jTmz4nq0; Mon, 12 Apr 2021 00:34:33 +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 CD98F5B5E; Mon, 12 Apr 2021 00:34:33 +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 13C0YXVo092511; Mon, 12 Apr 2021 00:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YXVV092510; Mon, 12 Apr 2021 00:34:33 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:33 GMT Message-Id: <202104120034.13C0YXVV092510@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: 4cb2f6041ce7 - main - graphics/vigra: 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: 4cb2f6041ce71d590b6cad0624639b23f880c1cf 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:34 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cb2f6041ce71d590b6cad0624639b23f880c1cf commit 4cb2f6041ce71d590b6cad0624639b23f880c1cf Author: Matthias Andree AuthorDate: 2021-04-11 18:38:30 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:45 +0000 graphics/vigra: make compatible with OpenEXR/Imath 3.0 --- graphics/vigra/Makefile | 8 +++++--- graphics/vigra/files/patch-config_FindOpenEXR.cmake | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index b717e5100be1..f77070e64550 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -3,7 +3,7 @@ PORTNAME= vigra DISTVERSIONPREFIX=v DISTVERSION= 1.11.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= VIGRA stands for "Vision with Generic Algorithms" LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libHalf.so:graphics/ilmbase \ +LIB_DEPENDS= libImath.so:math/Imath \ libsz.so:science/szip USES= cmake compiler:c++14-lang python:run shebangfix @@ -21,6 +21,8 @@ GH_ACCOUNT= ukoethe GH_TAGNAME= 8acd73a USE_LDCONFIG= yes +CFLAGS+= -I${LOCALBASE}/include/Imath + CMAKE_ARGS= -DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \ -DDOCINSTALL:PATH=${DOCSDIR_REL} SHEBANG_FILES= config/vigra-config.in @@ -35,7 +37,7 @@ HDF5_CMAKE_BOOL= WITH_HDF5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 OPENEXR_CMAKE_BOOL= WITH_OPENEXR -OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr +OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC47+) NUMPY_CMAKE_BOOL= WITH_VIGRANUMPY diff --git a/graphics/vigra/files/patch-config_FindOpenEXR.cmake b/graphics/vigra/files/patch-config_FindOpenEXR.cmake new file mode 100644 index 000000000000..06aae65b6394 --- /dev/null +++ b/graphics/vigra/files/patch-config_FindOpenEXR.cmake @@ -0,0 +1,20 @@ +--- config/FindOpenEXR.cmake.orig 2018-10-19 16:12:20 UTC ++++ config/FindOpenEXR.cmake +@@ -27,7 +27,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFI + + FOREACH(V "" -2_2 -2_1 -2_0 -1_7) + if(NOT OPENEXR_ILMIMF_LIBRARY) +- FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf${V}) ++ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES OpenEXR${V}) + if(OPENEXR_ILMIMF_LIBRARY) + set(OPENEXR_VERSION ${V}) + endif() +@@ -37,7 +37,7 @@ ENDFOREACH(V) + FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath${OPENEXR_VERSION}) + FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex${OPENEXR_VERSION}) + FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread${OPENEXR_VERSION}) +-FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half) ++FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Imath) + + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG