From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:43 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 2C79C5E40C5; Mon, 12 Apr 2021 00:34:43 +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 4FJV9v0PgGz4p64; Mon, 12 Apr 2021 00:34:43 +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 E1C795AC0; Mon, 12 Apr 2021 00:34:42 +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 13C0YgvE092691; Mon, 12 Apr 2021 00:34:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0Ygkc092690; Mon, 12 Apr 2021 00:34:42 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:42 GMT Message-Id: <202104120034.13C0Ygkc092690@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: 73ed226ab4b0 - main - graphics/povray37: 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: 73ed226ab4b08daa82e2a8ba850f7978d9551f2e 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:43 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=73ed226ab4b08daa82e2a8ba850f7978d9551f2e commit 73ed226ab4b08daa82e2a8ba850f7978d9551f2e Author: Matthias Andree AuthorDate: 2021-04-11 21:51:11 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:49 +0000 graphics/povray37: make compatible with OpenEXR/Imath 3.0 --- graphics/povray37/Makefile | 6 +++--- graphics/povray37/files/patch-source_backend_povray.cpp | 11 +++++++++++ .../povray37/files/patch-unix_config_ax__check__openexr.m4 | 11 +++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 972d9e052c02..aba7cd7e3667 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -1,7 +1,7 @@ PORTNAME= povray DISTVERSIONPREFIX= v DISTVERSION= 3.7.0.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics PKGNAMESUFFIX= 37 @@ -78,8 +78,8 @@ CONFIGURE_ARGS+=--without-libtiff .if ${PORT_OPTIONS:MSTATIC} BUILD_DEPENDS+= openexr>=1.6:graphics/openexr .else -LIB_DEPENDS+= libIlmImf.so:graphics/openexr -CPPFLAGS+= -I${LOCALBASE}/include/OpenEXR +LIB_DEPENDS+= libOpenEXR.so:graphics/openexr libImath.so:math/Imath +CPPFLAGS+= -I${LOCALBASE}/include/OpenEXR -I${LOCALBASE}/include/Imath -DInt64=uint64_t .endif .else CONFIGURE_ARGS+=--without-openexr diff --git a/graphics/povray37/files/patch-source_backend_povray.cpp b/graphics/povray37/files/patch-source_backend_povray.cpp new file mode 100644 index 000000000000..61bbaf34ab68 --- /dev/null +++ b/graphics/povray37/files/patch-source_backend_povray.cpp @@ -0,0 +1,11 @@ +--- source/backend/povray.cpp.orig 2018-05-27 09:54:06 UTC ++++ source/backend/povray.cpp +@@ -68,7 +68,7 @@ + extern "C" const char* TIFFGetVersion(void); + #endif + #ifndef OPENEXR_MISSING +- #include ++ #include + #include + // NOTE: + // Versions of OpenEXR and IlmImf prior to 1.7.1 do not seem to have a way to get the version number, diff --git a/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4 b/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4 new file mode 100644 index 000000000000..5bdd9b4deabf --- /dev/null +++ b/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4 @@ -0,0 +1,11 @@ +--- unix/config/ax_check_openexr.m4.orig 2018-05-27 09:54:06 UTC ++++ unix/config/ax_check_openexr.m4 +@@ -56,7 +56,7 @@ AC_DEFUN([AX_CHECK_OPENEXR], + # check include file + AC_CHECK_HEADER( + [OpenEXR/ImfCRgbaFile.h], +- [AC_CHECK_LIB([IlmImf], [ImfInputReadPixels], [], [ax_check_openexr="not found"])], ++ [AC_CHECK_LIB([OpenEXR], [ImfInputReadPixels], [], [ax_check_openexr="not found"])], + [ax_check_openexr="no headers"] + ) + fi