pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/luminance-hdr
Module Name: pkgsrc
Committed By: wiz
Date: Wed Jul 19 08:05:52 UTC 2023
Modified Files:
pkgsrc/graphics/luminance-hdr: distinfo
pkgsrc/graphics/luminance-hdr/patches: patch-CMakeLists.txt
Added Files:
pkgsrc/graphics/luminance-hdr/patches:
patch-src_Exif_ExifOperations.cpp
patch-src_Libpfs_exif_exifdata.cpp
patch-src_TransplantExif_TransplantExifDialog.cpp
Log Message:
luminance-hdr: fix build with exiv2 0.28
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/luminance-hdr/distinfo
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.3 \
pkgsrc/graphics/luminance-hdr/patches/patch-src_Exif_ExifOperations.cpp \
pkgsrc/graphics/luminance-hdr/patches/patch-src_TransplantExif_TransplantExifDialog.cpp
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_exif_exifdata.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/luminance-hdr/distinfo
diff -u pkgsrc/graphics/luminance-hdr/distinfo:1.8 pkgsrc/graphics/luminance-hdr/distinfo:1.9
--- pkgsrc/graphics/luminance-hdr/distinfo:1.8 Tue Oct 26 10:46:30 2021
+++ pkgsrc/graphics/luminance-hdr/distinfo Wed Jul 19 08:05:51 2023
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:46:30 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/07/19 08:05:51 wiz Exp $
BLAKE2s (luminance-hdr-2.6.0.tar.bz2) = 1dae3d48985793932cd269d48d34da75f5a30251af01143f08001c1389b3f5fa
SHA512 (luminance-hdr-2.6.0.tar.bz2) = 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
Size (luminance-hdr-2.6.0.tar.bz2) = 11556372 bytes
-SHA1 (patch-CMakeLists.txt) = c181636a243f5d6ee3dccbe28947eb365ce781ae
+SHA1 (patch-CMakeLists.txt) = 471f5de36791769f8f3846a61fcc204ba336238a
+SHA1 (patch-src_Exif_ExifOperations.cpp) = e1adceb033db85f7e59e18f42685ff9d0f5948bd
SHA1 (patch-src_Libpfs_CMakeLists.txt) = 6cf7b440fdf22d72e2d9abbc328c715e711a15a6
+SHA1 (patch-src_Libpfs_exif_exifdata.cpp) = 07fa2f66604b760643b832eb0a5c00031e7decf9
+SHA1 (patch-src_TransplantExif_TransplantExifDialog.cpp) = 8bd11c7be19f699714a5a7a28ee5a415c0ac9940
Index: pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt:1.4 pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt:1.4 Tue Jul 13 11:48:58 2021
+++ pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt Wed Jul 19 08:05:51 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2021/07/13 11:48:58 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2023/07/19 08:05:51 wiz Exp $
openexr3 fix
---- CMakeLists.txt.orig 2021-07-13 11:32:17.221425394 +0000
+--- CMakeLists.txt.orig 2019-06-09 19:18:38.000000000 +0000
+++ CMakeLists.txt
@@ -188,7 +188,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
FIND_PACKAGE(PNG REQUIRED)
Added files:
Index: pkgsrc/graphics/luminance-hdr/patches/patch-src_Exif_ExifOperations.cpp
diff -u /dev/null pkgsrc/graphics/luminance-hdr/patches/patch-src_Exif_ExifOperations.cpp:1.3
--- /dev/null Wed Jul 19 08:05:52 2023
+++ pkgsrc/graphics/luminance-hdr/patches/patch-src_Exif_ExifOperations.cpp Wed Jul 19 08:05:51 2023
@@ -0,0 +1,87 @@
+$NetBSD: patch-src_Exif_ExifOperations.cpp,v 1.3 2023/07/19 08:05:51 wiz Exp $
+
+Fix build with exiv2 0.28.
+https://github.com/LuminanceHDR/LuminanceHDR/pull/273
+
+--- src/Exif/ExifOperations.cpp.orig 2019-06-09 19:18:38.000000000 +0000
++++ src/Exif/ExifOperations.cpp
+@@ -108,7 +108,7 @@ void copyExifData(const std::string &fro
+ #endif
+
+ try {
+- Exiv2::Image::AutoPtr sourceImage;
++ Exiv2::Image::UniquePtr sourceImage;
+ Exiv2::ExifData srcExifData;
+
+ if (!from.empty()) {
+@@ -128,7 +128,7 @@ void copyExifData(const std::string &fro
+ }
+
+ // 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 &fro
+ 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&
+ {
+ 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
+ } 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::str
+ << std::endl;
+
+ return -1.0;
+- } catch (Exiv2::AnyError &e) {
++ } catch (Exiv2::Error &e) {
+ return -1.0;
+ }
+ }
Index: pkgsrc/graphics/luminance-hdr/patches/patch-src_TransplantExif_TransplantExifDialog.cpp
diff -u /dev/null pkgsrc/graphics/luminance-hdr/patches/patch-src_TransplantExif_TransplantExifDialog.cpp:1.3
--- /dev/null Wed Jul 19 08:05:52 2023
+++ pkgsrc/graphics/luminance-hdr/patches/patch-src_TransplantExif_TransplantExifDialog.cpp Wed Jul 19 08:05:51 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_TransplantExif_TransplantExifDialog.cpp,v 1.3 2023/07/19 08:05:51 wiz Exp $
+
+Fix build with exiv2 0.28.
+https://github.com/LuminanceHDR/LuminanceHDR/pull/273
+
+--- src/TransplantExif/TransplantExifDialog.cpp.orig 2019-06-09 19:18:38.000000000 +0000
++++ src/TransplantExif/TransplantExifDialog.cpp
+@@ -347,7 +347,7 @@ void TransplantExifDialog::transplant_re
+ 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"));
+ }
Index: pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_exif_exifdata.cpp
diff -u /dev/null pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_exif_exifdata.cpp:1.1
--- /dev/null Wed Jul 19 08:05:52 2023
+++ pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_exif_exifdata.cpp Wed Jul 19 08:05:51 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_Libpfs_exif_exifdata.cpp,v 1.1 2023/07/19 08:05:51 wiz Exp $
+
+Fix build with exiv2 0.28.
+https://github.com/LuminanceHDR/LuminanceHDR/pull/273
+
+--- src/Libpfs/exif/exifdata.cpp.orig 2019-06-09 19:18:38.000000000 +0000
++++ src/Libpfs/exif/exifdata.cpp
+@@ -52,7 +52,7 @@ ExifData::ExifData(const std::string &fi
+ 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::strin
+ */
+ 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::strin
+ break;
+ }
+ }
+- } catch (Exiv2::AnyError &e) {
++ } catch (Exiv2::Error &e) {
+ return;
+ }
+ }
Home |
Main Index |
Thread Index |
Old Index