Control: tags 1071027 + pending
Dear maintainer,
I've prepared an NMU for hdrmerge (versioned as 0.5+git20200117-4.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru hdrmerge-0.5+git20200117/debian/changelog
hdrmerge-0.5+git20200117/debian/changelog
--- hdrmerge-0.5+git20200117/debian/changelog 2024-06-16 23:12:31.000000000
+0200
+++ hdrmerge-0.5+git20200117/debian/changelog 2024-09-03 07:22:48.000000000
+0200
@@ -1,3 +1,12 @@
+hdrmerge (0.5+git20200117-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream commit 377d8e6f3c7cdd1a45b63bce2493ad177dde03fb to make
+ hdrmerge compatible with Exiv2 0.28+; patch
+ 0001-Adapt-to-Exiv2-0.28.0-API-change.patch (Closes: #1071027)
+
+ -- Pino Toscano <p...@debian.org> Tue, 03 Sep 2024 07:22:48 +0200
+
hdrmerge (0.5+git20200117-4) unstable; urgency=medium
* Ack NMU.
diff -Nru
hdrmerge-0.5+git20200117/debian/patches/0001-Adapt-to-Exiv2-0.28.0-API-change.patch
hdrmerge-0.5+git20200117/debian/patches/0001-Adapt-to-Exiv2-0.28.0-API-change.patch
---
hdrmerge-0.5+git20200117/debian/patches/0001-Adapt-to-Exiv2-0.28.0-API-change.patch
1970-01-01 01:00:00.000000000 +0100
+++
hdrmerge-0.5+git20200117/debian/patches/0001-Adapt-to-Exiv2-0.28.0-API-change.patch
2024-09-03 07:20:46.000000000 +0200
@@ -0,0 +1,57 @@
+From 377d8e6f3c7cdd1a45b63bce2493ad177dde03fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Jirkovsk=C3=BD?= <l.jirkov...@gmail.com>
+Date: Thu, 3 Aug 2023 09:00:42 +0200
+Subject: [PATCH] Adapt to Exiv2 0.28.0 API change.
+
+---
+ src/ExifTransfer.cpp | 8 ++++++++
+ src/RawParameters.cpp | 4 ++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/ExifTransfer.cpp b/src/ExifTransfer.cpp
+index bc8f4f9..0598172 100644
+--- a/src/ExifTransfer.cpp
++++ b/src/ExifTransfer.cpp
+@@ -41,7 +41,11 @@ private:
+ QString srcFile, dstFile;
+ const uint8_t * data;
+ size_t dataSize;
++#if EXIV2_TEST_VERSION(0,28,0)
++ Exiv2::Image::UniquePtr src, dst;
++#else
+ Exiv2::Image::AutoPtr src, dst;
++#endif
+
+ void copyXMP();
+ void copyIPTC();
+@@ -58,7 +62,11 @@ void hdrmerge::Exif::transfer(const QString & srcFile,
const QString & dstFile,
+
+ void ExifTransfer::copyMetadata() {
+ try {
++#if EXIV2_TEST_VERSION(0,28,0)
++ dst = Exiv2::ImageFactory::open(BasicIo::UniquePtr(new MemIo(data,
dataSize)));
++#else
+ dst = Exiv2::ImageFactory::open(BasicIo::AutoPtr(new MemIo(data,
dataSize)));
++#endif
+ dst->readMetadata();
+ } catch (Exiv2::Error & e) {
+ std::cerr << "Exiv2 error: " << e.what() << std::endl;
+diff --git a/src/RawParameters.cpp b/src/RawParameters.cpp
+index 40b77de..e6a38eb 100644
+--- a/src/RawParameters.cpp
++++ b/src/RawParameters.cpp
+@@ -49,7 +49,11 @@ void RawParameters::loadCamXyzFromDng() {
+ cc[j][i] = i == j ? 1.0 : 0.0;
+ }
+ }
++#if EXIV2_TEST_VERSION(0,28,0)
++ Exiv2::Image::UniquePtr src =
Exiv2::ImageFactory::open(fileName.toLocal8Bit().constData());
++#else
+ Exiv2::Image::AutoPtr src =
Exiv2::ImageFactory::open(fileName.toLocal8Bit().constData());
++#endif
+ src->readMetadata();
+ const Exiv2::ExifData & srcExif = src->exifData();
+
+--
+2.45.2
+
diff -Nru hdrmerge-0.5+git20200117/debian/patches/series
hdrmerge-0.5+git20200117/debian/patches/series
--- hdrmerge-0.5+git20200117/debian/patches/series 2023-07-16
21:12:40.000000000 +0200
+++ hdrmerge-0.5+git20200117/debian/patches/series 2024-09-03
07:20:55.000000000 +0200
@@ -1,2 +1,3 @@
0001-Fix-LibRaw-0.21-API-change.patch
221.patch
+0001-Adapt-to-Exiv2-0.28.0-API-change.patch
