From nobody Sun Jul 09 22:09:52 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 4QzhBm61g6z4mqvq; Sun, 9 Jul 2023 22:09:52 +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 4QzhBm51Glz3Ch3; Sun, 9 Jul 2023 22:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940592; 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=Xxz/v/YVT3CE0BUdNi9CdTgs/ljcjsBicVQ1tN2s9fw=; b=O8iGIZah/+ElVnMTSx07sbkkDafut0gpRLj2vwYC4zHt5Ocw+tUYgaf2OoF3ZNQ/N8Wgyj 2IBtA5haiYJb6EBQ+fdWUdLRdX4y7MvvZgdLFmswuPJaTlcXyNLHDLZ8fRsyR/HIuRZy3h mpbgm3t65GxXqFZxjNSun7400RYgsqpzrP/PZvKOfGJcoa7nj3aKPKXpJ+mQu4FO/G8Hta Yv6Gtd5kjctCmdYEBLZRNmORSo9cTwWENrw5qSvuc90Jf3gwHqRyp01cVHEWgnSb6yY0HI 2wXLUlxIbSsrTnpwbdpaKXT1FScvbQEjG+VNfPrWQ2bMHn7MB/8YPRBLn9zJ+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940592; 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=Xxz/v/YVT3CE0BUdNi9CdTgs/ljcjsBicVQ1tN2s9fw=; b=JN+ni8BSNWNJGPSa3xpt4Zzr3WN8FQ669ZNDET9QSAomw3R7qmpVFM6tlynL4gDj9u0YiZ fmJVavNYkAQB5VQgACOgoa9vxRIWBGl/ivbs85qeuyqmRLJQUXYbtlqiL+dKM/nCHpJ4qk eAFlwzo6mu94ZK8RGK8FfcPefuN9vAOdOecG3cMv4R5mPYIXPcqgAewBU5o/SpuHbsuRb0 HYjyLZ2/J6UkTvB9NsLu0XMAIY1t+vJtg7fk5W1NVEsjS7dxkTHUJM65DKU+cuCJp6u7Mi mOVK5jp+cYjETf0WUcKJxgTcA+B0PgqHkEUWB9LuilP4FfN9sFtkNOoBh7bn7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940592; a=rsa-sha256; cv=none; b=gfHPmyBMnrgSzDqG674C7DDtYgwlS1w2Vp5p8/rfoXV398OgvHrxbU9/gKzIfzSoGJDzTy cqtvhLix3i/VyMh82UkXEx1VBJzE34YTTOBX/uwjUxsFvXhyT6KNIRuXADP4b8cDsNyPKJ kYUjVv3WAnkEnyfahtjG/lxL0ALcN8Ay1w/oJU+8higwEe6FXh82Eka6aLu6X5+q8CDcF5 f2ajqIkgvUE5wBPcZd7GXhxWeaoifn2MXBJGpUtVmrV5x0RNnxa+auKNPB8HnY3yLobRAS AgdIe+wJyFpQejlmSKCjvkBBMPeTvlVvLpIJoEZyyR+HzbRJZMmXek5xIveG8g== 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 4QzhBm3sTCzKRx; Sun, 9 Jul 2023 22:09:52 +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 369M9q37034507; Sun, 9 Jul 2023 22:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9qat034506; Sun, 9 Jul 2023 22:09:52 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:52 GMT Message-Id: <202307092209.369M9qat034506@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: 8b78f1c8e484 - main - graphics/luminance-qt5: 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: 8b78f1c8e484fb13f9fbab472c052558f63c68a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b78f1c8e484fb13f9fbab472c052558f63c68a2 commit 8b78f1c8e484fb13f9fbab472c052558f63c68a2 Author: Matthias Andree AuthorDate: 2023-07-02 23:23:59 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:13 +0000 graphics/luminance-qt5: make compatible with exiv2 0.28 PR: 272311 --- graphics/luminance-qt5/Makefile | 2 +- .../files/patch-src_Exif_ExifOperations.cpp | 88 ++++++++++++++++++++++ .../files/patch-src_Libpfs_exif_exifdata.cpp | 29 +++++++ ...tch-src_TransplantExif_TransplantExifDialog.cpp | 11 +++ 4 files changed, 129 insertions(+), 1 deletion(-) diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile index 1b0d2c852f74..f7fee8af15cc 100644 --- a/graphics/luminance-qt5/Makefile +++ b/graphics/luminance-qt5/Makefile @@ -1,6 +1,6 @@ PORTNAME= luminance-hdr DISTVERSION= 2.6.1.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} diff --git a/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp b/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp new file mode 100644 index 000000000000..439f147063d3 --- /dev/null +++ b/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp @@ -0,0 +1,88 @@ +--- src/Exif/ExifOperations.cpp.orig 2021-01-11 09:41:28 UTC ++++ src/Exif/ExifOperations.cpp +@@ -108,12 +108,12 @@ void copyExifData(const std::string &from, const std:: + #endif + + try { +- Exiv2::Image::AutoPtr sourceImage; ++ Exiv2::Image::UniquePtr sourceImage; + Exiv2::ExifData srcExifData; + + if (!from.empty()) { + // get source exif data +- sourceImage = Exiv2::ImageFactory::open(from); ++ sourceImage = std::move(Exiv2::ImageFactory::open(from)); + + sourceImage->readMetadata(); + srcExifData = sourceImage->exifData(); +@@ -128,7 +128,7 @@ void copyExifData(const std::string &from, const std:: + } + + // get destination exif data +- Exiv2::Image::AutoPtr destinationImage = Exiv2::ImageFactory::open(to); ++ Exiv2::Image::UniquePtr destinationImage = Exiv2::ImageFactory::open(to); + + if (dontOverwrite) { + // doesn't throw anything if it is empty +@@ -212,7 +212,7 @@ void copyExifData(const std::string &from, const std:: + destinationImage->setExifData(srcExifData); + } + destinationImage->writeMetadata(); +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + #ifndef NDEBUG + qDebug() << e.what(); + #endif +@@ -250,7 +250,7 @@ float obtain_avg_lum(const std::string& filename) + { + try + { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) +@@ -329,7 +329,7 @@ allowed for ev computation purposes. + return -1; + } + } +- catch (Exiv2::AnyError& e) ++ catch (Exiv2::Error& e) + { + return -1; + } +@@ -338,7 +338,7 @@ allowed for ev computation purposes. + + float getExposureTime(const std::string &filename) { + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) return -1; +@@ -374,14 +374,14 @@ float getExposureTime(const std::string &filename) { + } else { + return -1; + } +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + return -1; + } + } + + float getAverageLuminance(const std::string &filename) { + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + +@@ -403,7 +403,7 @@ float getAverageLuminance(const std::string &filename) + << std::endl; + + return -1.0; +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + return -1.0; + } + } diff --git a/graphics/luminance-qt5/files/patch-src_Libpfs_exif_exifdata.cpp b/graphics/luminance-qt5/files/patch-src_Libpfs_exif_exifdata.cpp new file mode 100644 index 000000000000..6a6eabf8d9dd --- /dev/null +++ b/graphics/luminance-qt5/files/patch-src_Libpfs_exif_exifdata.cpp @@ -0,0 +1,29 @@ +--- src/Libpfs/exif/exifdata.cpp.orig 2021-01-11 09:41:28 UTC ++++ src/Libpfs/exif/exifdata.cpp +@@ -52,7 +52,7 @@ ExifData::ExifData(const std::string &filename) { from + void ExifData::fromFile(const std::string &filename) { + reset(); + try { +- ::Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ::Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + ::Exiv2::ExifData &exifData = image->exifData(); + +@@ -121,7 +121,7 @@ void ExifData::fromFile(const std::string &filename) { + */ + if ((it = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) != + exifData.end()) { +- long rotation = it->toLong(); ++ long rotation = it->toInt64(); + switch (rotation) { + case 3: + m_orientation = 180; +@@ -134,7 +134,7 @@ void ExifData::fromFile(const std::string &filename) { + break; + } + } +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + return; + } + } diff --git a/graphics/luminance-qt5/files/patch-src_TransplantExif_TransplantExifDialog.cpp b/graphics/luminance-qt5/files/patch-src_TransplantExif_TransplantExifDialog.cpp new file mode 100644 index 000000000000..98db3ad724d6 --- /dev/null +++ b/graphics/luminance-qt5/files/patch-src_TransplantExif_TransplantExifDialog.cpp @@ -0,0 +1,11 @@ +--- src/TransplantExif/TransplantExifDialog.cpp.orig 2021-01-11 09:41:28 UTC ++++ src/TransplantExif/TransplantExifDialog.cpp +@@ -347,7 +347,7 @@ void TransplantExifDialog::transplant_requested() { + QFile::encodeName((*i_dest)).constData(), + m_Ui->checkBox_dont_overwrite->isChecked()); + m_Ui->rightlist->item(index)->setBackground(QBrush("#a0ff87")); +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + add_log_message("ERROR:" + QString::fromStdString(e.what())); + m_Ui->rightlist->item(index)->setBackground(QBrush("#ff743d")); + }