Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 May 2021 21:50:50 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 66a03470a292 - main - graphics/gdal: Fix build with OpenEXR/Imath 3.0 (should be part of 9ab14902a13463a884c7446d358364ed5ee64088)
Message-ID:  <202105042150.144Loo1L081846@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=66a03470a2924840d5ff13a874d93f95ed832d7b

commit 66a03470a2924840d5ff13a874d93f95ed832d7b
Author:     John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2021-05-04 21:40:05 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2021-05-04 21:45:47 +0000

    graphics/gdal: Fix build with OpenEXR/Imath 3.0 (should be part of 9ab14902a13463a884c7446d358364ed5ee64088)
    
    - Remove MAKE_JOBS_UNSAFE [1]
    
    PR:             255216
    Reported by:    O. Hartmann <ohartmann@walstatt.org>
    Tested by:      John Hein <jcfyecrayz@liamekaens.com> [1]
---
 graphics/gdal/Makefile                                 |  1 -
 graphics/gdal/files/patch-frmts_exr_openexr__headers.h | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 077fdb27c3cd..4889d2d81ee1 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -61,7 +61,6 @@ CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
 		${ICONV_CONFIGURE_ARG}
 GNU_CONFIGURE=	yes
 LDFLAGS+=	${ICONV_LIB}
-MAKE_JOBS_UNSAFE=	yes
 MAKEFILE=	GNUmakefile
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
diff --git a/graphics/gdal/files/patch-frmts_exr_openexr__headers.h b/graphics/gdal/files/patch-frmts_exr_openexr__headers.h
index fb0a5dc1bb06..f2dc5df43d6c 100644
--- a/graphics/gdal/files/patch-frmts_exr_openexr__headers.h
+++ b/graphics/gdal/files/patch-frmts_exr_openexr__headers.h
@@ -1,6 +1,14 @@
---- frmts/exr/openexr_headers.h.orig	2020-12-29 12:18:28 UTC
+--- frmts/exr/openexr_headers.h.orig	2021-03-05 04:40:24 UTC
 +++ frmts/exr/openexr_headers.h
-@@ -42,6 +42,7 @@
+@@ -35,6 +35,7 @@
+ #pragma GCC system_header
+ #endif
+ 
++#include "ImathInt64.h"
+ #include "ImathMatrix.h"
+ #include "ImfChannelList.h"
+ #include "ImfFloatAttribute.h"
+@@ -42,6 +43,7 @@
  #include "ImfMatrixAttribute.h"
  #include "ImfMultiPartInputFile.h"
  #include "ImfMultiPartOutputFile.h"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105042150.144Loo1L081846>