From owner-dev-commits-ports-main@freebsd.org Mon Apr 12 00:34:52 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 E75A55E41BE; Mon, 12 Apr 2021 00:34:51 +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 4FJVB34GbMz4p0D; Mon, 12 Apr 2021 00:34:51 +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 EA3F85C31; Mon, 12 Apr 2021 00:34:50 +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 13C0YoRx092844; Mon, 12 Apr 2021 00:34:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YouU092843; Mon, 12 Apr 2021 00:34:50 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:50 GMT Message-Id: <202104120034.13C0YouU092843@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: 9ab14902a134 - main - graphics/gdal: 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: 9ab14902a13463a884c7446d358364ed5ee64088 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:52 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ab14902a13463a884c7446d358364ed5ee64088 commit 9ab14902a13463a884c7446d358364ed5ee64088 Author: Matthias Andree AuthorDate: 2021-04-12 00:29:13 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:53 +0000 graphics/gdal: make compatible with OpenEXR/Imath 3.0 --- graphics/gdal/Makefile | 7 ++++--- graphics/gdal/files/patch-frmts_exr_openexr__headers.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index e6319dd7d3cf..01c1f8190765 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -2,7 +2,7 @@ PORTNAME= gdal PORTVERSION= 3.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet @@ -108,7 +108,8 @@ ECW_LIB_DEPENDS= libNCSEcw.so:graphics/libecwj2 EXPAT_CONFIGURE_WITH= expat EXPAT_LIB_DEPENDS= libexpat.so:textproc/expat2 EXR_CONFIGURE_ON= --with-exr -EXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr +EXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr libImath.so:math/Imath +EXR_CFLAGS= -DInt64=uint64_t FREEXL_CONFIGURE_WITH= freexl FREEXL_LIB_DEPENDS= libfreexl.so:textproc/freexl GEOS_CONFIGURE_OFF= --with-geos=no @@ -163,7 +164,7 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd post-patch: @${REINPLACE_CMD} -e '/^#GDAL_SLIB_SONAME/ s|^#||' ${WRKSRC}/GDALmake.opt.in @${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|; s| LICENSE.TXT||' ${WRKSRC}/GNUmakefile - @${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' -e 's|IlmImf|OpenEXR|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|getCString()|c_str()|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp # Clean up bundled libraries @${RM} -r ${WRKSRC}/alg/internal_libqhull/ diff --git a/graphics/gdal/files/patch-frmts_exr_openexr__headers.h b/graphics/gdal/files/patch-frmts_exr_openexr__headers.h new file mode 100644 index 000000000000..fb0a5dc1bb06 --- /dev/null +++ b/graphics/gdal/files/patch-frmts_exr_openexr__headers.h @@ -0,0 +1,10 @@ +--- frmts/exr/openexr_headers.h.orig 2020-12-29 12:18:28 UTC ++++ frmts/exr/openexr_headers.h +@@ -42,6 +42,7 @@ + #include "ImfMatrixAttribute.h" + #include "ImfMultiPartInputFile.h" + #include "ImfMultiPartOutputFile.h" ++#include "ImfOutputPart.h" + #include "ImfPartType.h" + #include "ImfPreviewImage.h" + #include "ImfRgbaFile.h"