From nobody Sun Jul 09 22:09:35 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzhBR6kpRz4mqs2; Sun, 9 Jul 2023 22:09:35 +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 4QzhBR4VDmz3C5k; Sun, 9 Jul 2023 22:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBfGLQ9H5XbiyBs4Nh5UB6qyt515sO1VZGL6j+uAp7w=; b=u5wqbObqKOs0MCNqqxVqvk7bnxXkuAeN5jqJ5TbnMxy66p602RaxMvDrCkRjLkawekISsq 3Fu7JEAUFKPyRDRXMBvCfGdWwP2/uxDzYF1KcfKdcD92HVuHRhmTUCWC1UX4VIwsZxnohh fXewWVv4rvUYzp+IrE0fS4SosRxBJp1GbJMLaaaEyFnufr2A3PY3XcKeexc2Txp9zkhiNb KSGDw1ZWXvD9TxBp8ZkbeG3aNOZ5PhOpp/q7scXZb4qKSWgIr9U4KDDCtr3n9vhxpJPBh5 94hssjQspo5Q9Nbv9JQidMzlp19pv+wfFXz2U4HYHMbS8TNMb56zT4PTWvME2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBfGLQ9H5XbiyBs4Nh5UB6qyt515sO1VZGL6j+uAp7w=; b=rfDigkrXhwyitWOeqG+ZJS4p7LrX6CFNT5SJlE1C/IFWujztgc7RklPglLwdA4W13+b/AX rU4y8yLAbf1sptWneBIXCNzL7JeRIou95x3zKOogyd/dYDww1qXSXw8RlCJPAAMC0Wi4Py Jh5G9vQ6en2uTg7/UB9nxgeg9NMK6U/dvaQlUvWyjgirppUgvftP2Dn30d82isvhhBQ7n+ wCw/1wwsp12f4RFjznyx1NDLd5T7r6oFz42Jx8jz0GkPE/CDuBgM6eh1qn57GQe1+JhMvV RKpRcEwhZFUdHZQhFlFREF87GOfqxRnvZV0ikmRzWBTjky8fMc0XZugIWemsYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940575; a=rsa-sha256; cv=none; b=BHxSgyXQiz3+SsNO0P27T/qED2IGsYGPBiRJT9hwDNaQ4tvKTnJpfcWa09SC23IXdCAqzg /RYnFq7Iko7H7ElbnKXZUl1e/i8GNvYdzB/LWuqfufmAlspThlNmdBBeTF6Vo73zkw/DTz QG4RTKgf5t/j0Jhzs8b6I71/bxkPslRKZBaAF98f7DuanKHX7tHLzh2PPvt4mj1eerCZ4Y 9X3tlprdX57p+oB7qKPQo0CBYEerjDtDigDZank0dc6uKZKt5YAsgKuql1/9cJssMOB756 hGjLs145zwh+a3i/mKTm7dhE3TUgstF0KKp0yEptNsn3sBiAv+JiB95axui7iA== 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 4QzhBR3YtszKsj; Sun, 9 Jul 2023 22:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369M9ZM9034200; Sun, 9 Jul 2023 22:09:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9ZLu034199; Sun, 9 Jul 2023 22:09:35 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:35 GMT Message-Id: <202307092209.369M9ZLu034199@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: 4e79a077ff66 - main - graphics/hugin: make compatible with exiv2 0.28 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 4e79a077ff6661edd98bd83266d6c8a9dbd8be4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e79a077ff6661edd98bd83266d6c8a9dbd8be4b commit 4e79a077ff6661edd98bd83266d6c8a9dbd8be4b Author: Matthias Andree AuthorDate: 2023-07-02 13:19:50 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:08 +0000 graphics/hugin: make compatible with exiv2 0.28 PR: 272311 --- graphics/hugin/Makefile | 2 +- .../patch-src_hugin__base_panodata_Exiv2Helper.cpp | 27 +++++++++++++ ...patch-src_hugin__base_panodata_SrcPanoImage.cpp | 47 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 87d244130551..3c5bbd84d9b5 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= hugin DISTVERSION= 2022.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} diff --git a/graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp b/graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp new file mode 100644 index 000000000000..c383922e90da --- /dev/null +++ b/graphics/hugin/files/patch-src_hugin__base_panodata_Exiv2Helper.cpp @@ -0,0 +1,27 @@ +--- src/hugin_base/panodata/Exiv2Helper.cpp.orig 2019-05-15 15:30:47 UTC ++++ src/hugin_base/panodata/Exiv2Helper.cpp +@@ -40,7 +40,7 @@ namespace HuginBase + Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName)); + if (itr != exifData.end() && itr->count()) + { +- value = itr->toLong(); ++ value = itr->toInt64(); + return true; + } + else +@@ -165,7 +165,7 @@ namespace HuginBase + { + if(it!=exifData.end() && it->count()) + { +- return it->toLong(); ++ return it->toInt64(); + } + return 0; + }; +@@ -600,4 +600,4 @@ namespace HuginBase + }; + + }; //namespace Exiv2Helper +-}; //namespace HuginBase +\ No newline at end of file ++}; //namespace HuginBase diff --git a/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp b/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp new file mode 100644 index 000000000000..b097a4a9939b --- /dev/null +++ b/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp @@ -0,0 +1,47 @@ +--- src/hugin_base/panodata/SrcPanoImage.cpp.orig 2022-05-26 16:18:56 UTC ++++ src/hugin_base/panodata/SrcPanoImage.cpp +@@ -384,7 +384,7 @@ bool SrcPanoImage::readEXIF() + pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels")); + if (pos != xmpData.end()) + { +- croppedWidth = pos->toLong(); ++ croppedWidth = pos->toInt64(); + } + else + { +@@ -394,7 +394,7 @@ bool SrcPanoImage::readEXIF() + pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels")); + if (pos != xmpData.end()) + { +- croppedHeight = pos->toLong(); ++ croppedHeight = pos->toInt64(); + } + else + { +@@ -408,7 +408,7 @@ bool SrcPanoImage::readEXIF() + double hfov = 0; + if (pos != xmpData.end()) + { +- hfov = 360 * croppedWidth / (double)pos->toLong(); ++ hfov = 360 * croppedWidth / (double)pos->toInt64(); + } + else + { +@@ -419,7 +419,7 @@ bool SrcPanoImage::readEXIF() + pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels")); + if (pos != xmpData.end()) + { +- fullHeight = pos->toLong(); ++ fullHeight = pos->toInt64(); + } + else + { +@@ -430,7 +430,7 @@ bool SrcPanoImage::readEXIF() + pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels")); + if (pos != xmpData.end()) + { +- cropTop = pos->toLong(); ++ cropTop = pos->toInt64(); + } + else + {