From owner-dev-commits-ports-main@freebsd.org Tue May 4 21:50:50 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 E74B5624D8F; Tue, 4 May 2021 21:50:50 +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 4FZYSB68sdz4Y9X; Tue, 4 May 2021 21:50:50 +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 C6CE218F38; Tue, 4 May 2021 21:50: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 144LooIR081847; Tue, 4 May 2021 21:50:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 144Loo1L081846; Tue, 4 May 2021 21:50:50 GMT (envelope-from git) Date: Tue, 4 May 2021 21:50:50 GMT Message-Id: <202105042150.144Loo1L081846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 66a03470a292 - main - graphics/gdal: Fix build with OpenEXR/Imath 3.0 (should be part of 9ab14902a13463a884c7446d358364ed5ee64088) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66a03470a2924840d5ff13a874d93f95ed832d7b 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: Tue, 04 May 2021 21:50:51 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=66a03470a2924840d5ff13a874d93f95ed832d7b commit 66a03470a2924840d5ff13a874d93f95ed832d7b Author: John Hein AuthorDate: 2021-05-04 21:40:05 +0000 Commit: Po-Chuan Hsieh 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 Tested by: John Hein [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"