From owner-svn-ports-head@freebsd.org Fri Mar 8 20:46:26 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5231A15288EF; Fri, 8 Mar 2019 20:46:26 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E9C728B4AA; Fri, 8 Mar 2019 20:46:25 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D35587E1; Fri, 8 Mar 2019 20:46:25 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x28KkPEo016986; Fri, 8 Mar 2019 20:46:25 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x28KkPNe016984; Fri, 8 Mar 2019 20:46:25 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903082046.x28KkPNe016984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 8 Mar 2019 20:46:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495072 - in head/graphics/hugin: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/graphics/hugin: . files X-SVN-Commit-Revision: 495072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E9C728B4AA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Mar 2019 20:46:26 -0000 Author: tcberner Date: Fri Mar 8 20:46:25 2019 New Revision: 495072 URL: https://svnweb.freebsd.org/changeset/ports/495072 Log: graphics/hugin: prepare for exiv2-0.27 Import gentoo's fix to build against graphics/exiv2 0.27: https://gitweb.gentoo.org/repo/gentoo.git/diff/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch?id=450cbf95fae0141740b2c9f74265220651ee8863 PR: 235943 Added: head/graphics/hugin/files/patch-gentoo_23dd54 (contents, props changed) Modified: head/graphics/hugin/Makefile Modified: head/graphics/hugin/Makefile ============================================================================== --- head/graphics/hugin/Makefile Fri Mar 8 20:38:07 2019 (r495071) +++ head/graphics/hugin/Makefile Fri Mar 8 20:46:25 2019 (r495072) @@ -3,7 +3,7 @@ PORTNAME= hugin PORTVERSION= 2018.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} Added: head/graphics/hugin/files/patch-gentoo_23dd54 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/hugin/files/patch-gentoo_23dd54 Fri Mar 8 20:46:25 2019 (r495072) @@ -0,0 +1,30 @@ +https://gitweb.gentoo.org/repo/gentoo.git/diff/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch?id=450cbf95fae0141740b2c9f74265220651ee8863 + +--- src/hugin_base/panodata/Exiv2Helper.cpp ++++ src/hugin_base/panodata/Exiv2Helper.cpp +@@ -29,6 +29,7 @@ + #include "hugin_math/hugin_math.h" + #include "hugin_utils/utils.h" + #include "exiv2/easyaccess.hpp" ++#include "exiv2/version.hpp" + + namespace HuginBase + { +@@ -232,7 +233,7 @@ + return false; + }; + }; +-#if EXIV2_TEST_VERSION(0,23,0) ++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0) + if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) && + _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2)) + { +@@ -563,7 +564,7 @@ + std::string lensName; + // first we are reading LensModel in Exif section, this is only available + // with EXIF >= 2.3 +-#if EXIV2_TEST_VERSION(0,22,0) ++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0) + //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above + if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName)) + #else