Date: Mon, 12 Apr 2021 00:34:50 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9ab14902a134 - main - graphics/gdal: make compatible with OpenEXR/Imath 3.0 Message-ID: <202104120034.13C0YouU092843@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ab14902a13463a884c7446d358364ed5ee64088 commit 9ab14902a13463a884c7446d358364ed5ee64088 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2021-04-12 00:29:13 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104120034.13C0YouU092843>