[gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/, media-gfx/luminance-hdr/files/
commit: 45054d191a69f21406abb12f69f42e2836dc2efa
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 8 13:44:08 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 8 14:05:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45054d19
media-gfx/luminance-hdr: Fix build with >=exiv2-0.28
Closes: https://bugs.gentoo.org/906490
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/luminance-hdr-2.6.1.1-exiv2-0.28.patch | 143 +
.../luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild | 6 +-
2 files changed, 146 insertions(+), 3 deletions(-)
diff --git
a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch
b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch
new file mode 100644
index ..704b768c005b
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch
@@ -0,0 +1,143 @@
+diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp
+index dd3d22a6..4cfe6b70 100644
+--- a/src/Exif/ExifOperations.cpp
b/src/Exif/ExifOperations.cpp
+@@ -108,7 +108,11 @@ void copyExifData(const std::string , const
std::string ,
+ #endif
+
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++Exiv2::Image::UniquePtr sourceImage;
++#else
+ Exiv2::Image::AutoPtr sourceImage;
++#endif
+ Exiv2::ExifData srcExifData;
+
+ if (!from.empty()) {
+@@ -128,7 +132,11 @@ void copyExifData(const std::string , const
std::string ,
+ }
+
+ // get destination exif data
++#if EXIV2_TEST_VERSION (0, 28, 0)
++Exiv2::Image::UniquePtr destinationImage =
Exiv2::ImageFactory::open(to);
++#else
+ Exiv2::Image::AutoPtr destinationImage =
Exiv2::ImageFactory::open(to);
++#endif
+
+ if (dontOverwrite) {
+ // doesn't throw anything if it is empty
+@@ -212,7 +220,11 @@ void copyExifData(const std::string , const
std::string ,
+ destinationImage->setExifData(srcExifData);
+ }
+ destinationImage->writeMetadata();
++#if EXIV2_TEST_VERSION (0, 28, 0)
++} catch (Exiv2::Error ) {
++#else
+ } catch (Exiv2::AnyError ) {
++#endif
+ #ifndef NDEBUG
+ qDebug() << e.what();
+ #endif
+@@ -338,7 +350,11 @@ allowed for ev computation purposes.
+
+ float getExposureTime(const std::string ) {
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+ Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+ image->readMetadata();
+ Exiv2::ExifData = image->exifData();
+ if (exifData.empty()) return -1;
+@@ -374,14 +390,22 @@ float getExposureTime(const std::string ) {
+ } else {
+ return -1;
+ }
++#if EXIV2_TEST_VERSION (0, 28, 0)
++} catch (Exiv2::Error ) {
++#else
+ } catch (Exiv2::AnyError ) {
++#endif
+ return -1;
+ }
+ }
+
+ float getAverageLuminance(const std::string ) {
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+ Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+ image->readMetadata();
+ Exiv2::ExifData = image->exifData();
+
+@@ -403,7 +427,11 @@ float getAverageLuminance(const std::string ) {
+ << std::endl;
+
+ return -1.0;
++#if EXIV2_TEST_VERSION (0, 28, 0)
++} catch (Exiv2::Error ) {
++#else
+ } catch (Exiv2::AnyError ) {
++#endif
+ return -1.0;
+ }
+ }
+diff --git a/src/Libpfs/exif/exifdata.cpp b/src/Libpfs/exif/exifdata.cpp
+index 38472eff..79085e43 100644
+--- a/src/Libpfs/exif/exifdata.cpp
b/src/Libpfs/exif/exifdata.cpp
+@@ -52,7 +52,11 @@ ExifData::ExifData(const std::string ) {
fromFile(filename); }
+ void ExifData::fromFile(const std::string ) {
+ reset();
+ try {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++::Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+ ::Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+ image->readMetadata();
+ ::Exiv2::ExifData = image->exifData();
+
+@@ -121,7 +125,11 @@ void ExifData::fromFile(const std::string ) {
+ */
+ if ((it = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation")))
!=
+ exifData.end()) {
++#if EXIV2_TEST_VERSION (0, 28, 0)
++long rotation = it->toUint32();
++#else
+ long rotation = it->toLong();
++#endif
+ switch (rotation) {
+ case 3:
+ m_orientation = 180;
+@@ -134,7 +142,11 @@ void ExifData::fromFile(const std::string ) {
+ break;
+ }
+ }
++#if EXIV2_TEST_VERSION (0, 28, 0)
++} catch (Exiv2::Error ) {
++#else
+ } catch (Exiv2::AnyError ) {
++#endif
+ return;
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/, media-gfx/luminance-hdr/files/
commit: 218b73f64d95677b66183a5025f0a8c9df3f7a9a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 13 19:36:25 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 13 21:24:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218b73f6
media-gfx/luminance-hdr: Drop 2.5.1-r1
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/luminance-hdr/Manifest | 1 -
.../files/luminance-hdr-2.5.1-docs.patch | 17
.../files/luminance-hdr-2.5.1-exiv2-0.27.1.patch | 22 -
.../files/luminance-hdr-2.5.1-exiv2-0.27.patch | 25 --
.../files/luminance-hdr-2.5.1-fits-automagic.patch | 17
.../files/luminance-hdr-2.5.1-no-git.patch | 17
.../luminance-hdr/luminance-hdr-2.5.1-r1.ebuild| 95 --
7 files changed, 194 deletions(-)
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 08af1d16280..ef8d09c6f1e 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,2 +1 @@
-DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B
02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604
SHA512
5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B
0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576
SHA512
6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
deleted file mode 100644
index 48c156a382e..000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't install extra docs and fix install dir.
-
luminance-hdr-2.3.1/CMakeLists.txt
-+++ luminance-hdr-2.3.1/CMakeLists.txt
-@@ -281,12 +281,6 @@
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png
DESTINATION share/icons/hicolor/48x48/apps) # icon
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION
share/applications) #desktop entry
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.appdata.xml DESTINATION
share/appdata) #appstream
--INSTALL(FILES
--${CMAKE_SOURCE_DIR}/AUTHORS
--${CMAKE_SOURCE_DIR}/README.md
--${CMAKE_SOURCE_DIR}/LICENSE
--${CMAKE_SOURCE_DIR}/Changelog
--DESTINATION share/luminance-hdr) #info files
- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION
share/luminance-hdr) # help directory
- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION
share/luminance-hdr) # hdrhtml directory
- # Microsoft Windows
diff --git
a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
deleted file mode 100644
index 16b5256e935..000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8c3f1571bfa7bb702228bb283e37e58c8b322d5b Mon Sep 17 00:00:00 2001
-From: Benitoite
-Date: Fri, 26 Apr 2019 18:07:52 -0700
-Subject: [PATCH] ExifOperations: include exiv2/exiv2.hpp
-
-Because type `AnyError` requires definition in the exiv2 namespace.
- src/Exif/ExifOperations.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp
-index 07ca742c..dd3d22a6 100644
a/src/Exif/ExifOperations.cpp
-+++ b/src/Exif/ExifOperations.cpp
-@@ -35,6 +35,7 @@
- #include
-
- #include
-+#include
- #include
-
- #include "Common/config.h"
\ No newline at end of file
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
deleted file mode 100644
index 7b52c883e40..000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001
-From: Benitoite
-Date: Sun, 16 Dec 2018 22:18:37 -0800
-Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp
-
-AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or
exiv2/version.hpp
-Also, version.hpp says use exiv2.hpp
-
-* 2018-12-29 ast...@gentoo.org: Backported to 2.5.1
- src/TransplantExif/TransplantExifDialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/TransplantExif/TransplantExifDialog.cpp
b/src/TransplantExif/TransplantExifDialog.cpp
-index c38a51e4..1fac2e0f 100644
a/src/TransplantExif/TransplantExifDialog.cpp
-+++ b/src/TransplantExif/TransplantExifDialog.cpp
-@@ -26,6
[gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/, media-gfx/luminance-hdr/files/
commit: 8f6a858f3f76ab3d0ba8acda28f2981d24cceeda
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 29 11:40:31 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 29 13:31:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6a858f
media-gfx/luminance-hdr: Fix build with exiv2-0.27
Closes: https://bugs.gentoo.org/673728
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/luminance-hdr-2.5.1-exiv2-0.27.patch | 25 ++
.../luminance-hdr/luminance-hdr-2.5.1-r1.ebuild| 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
new file mode 100644
index 000..7b52c883e40
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
@@ -0,0 +1,25 @@
+From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001
+From: Benitoite
+Date: Sun, 16 Dec 2018 22:18:37 -0800
+Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp
+
+AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or
exiv2/version.hpp
+Also, version.hpp says use exiv2.hpp
+
+* 2018-12-29 ast...@gentoo.org: Backported to 2.5.1
+---
+ src/TransplantExif/TransplantExifDialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/TransplantExif/TransplantExifDialog.cpp
b/src/TransplantExif/TransplantExifDialog.cpp
+index c38a51e4..1fac2e0f 100644
+--- a/src/TransplantExif/TransplantExifDialog.cpp
b/src/TransplantExif/TransplantExifDialog.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "Common/global.h"
+ #include "Common/config.h"
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
index 39c345486d1..e8bae1039b5 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.5.1-docs.patch
"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
+ "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27.patch
)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/, media-gfx/luminance-hdr/files/
commit: 755c3249cba6db5b275ad58c972b1332d25605e5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 14 19:51:51 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 16 07:03:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755c3249
media-gfx/luminance-hdr: Drop 2.4.0
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-gfx/luminance-hdr/Manifest | 1 -
.../files/luminance-hdr-2.3.1-docs.patch | 17
.../files/luminance-hdr-2.3.1-no-git.patch | 54
.../luminance-hdr-2.3.1-openmp-automagic.patch | 40 -
.../files/luminance-hdr-2.4.0-fits-automagic.patch | 36
.../files/luminance-hdr-2.4.0-qtprinter.patch | 99 --
.../files/luminance-hdr-2.4.0-qtquick.patch| 13 ---
media-gfx/luminance-hdr/luminance-hdr-2.4.0.ebuild | 86 ---
8 files changed, 346 deletions(-)
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 2e474e03980..5a667dceda6 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,2 +1 @@
-DIST luminance-hdr-2.4.0.tar.bz2 10507522 BLAKE2B
b8dc777211b63e4e03466612e1c4b7c685f921db292712c749fc14d9638a69fd735990fd5412c7376a7452911cb15212448afc03aa8407f0d6f9c65fac5d5769
SHA512
aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702
DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B
02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604
SHA512
5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
deleted file mode 100644
index 514ded78220..000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't install extra docs and fix install dir.
-
luminance-hdr-2.3.1/CMakeLists.txt
-+++ luminance-hdr-2.3.1/CMakeLists.txt
-@@ -250,12 +250,6 @@
-
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/images/luminance-hdr.png DESTINATION
share/icons/hicolor/48x48/apps) # icon
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION
share/applications) #desktop entry
--INSTALL(FILES
--${CMAKE_SOURCE_DIR}/AUTHORS
--${CMAKE_SOURCE_DIR}/README
--${CMAKE_SOURCE_DIR}/LICENSE
--${CMAKE_SOURCE_DIR}/Changelog
--DESTINATION share/luminance-hdr) #info files
- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION
share/luminance-hdr) # help directory
- # Microsoft Windows
- ELSEIF(WIN32)
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch
b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch
deleted file mode 100644
index fe95265a684..000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Don't try to define the git version of the release.
-
luminance-hdr-2.3.1/CMakeLists.txt
-+++ luminance-hdr-2.3.1/CMakeLists.txt
-@@ -32,12 +32,6 @@
- ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
- ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
-
--FIND_PACKAGE(Git)
--IF(GIT_FOUND)
--include(GetGitRevisionDescription)
--get_git_head_revision(GIT_REFSPEC GIT_SHA1)
--ENDIF()
--
- IF(WIN32)
- # Windows Section
-
luminance-hdr-2.3.1.orig/src/Common/CMakeLists.txt
-+++ luminance-hdr-2.3.1/src/Common/CMakeLists.txt
-@@ -1,5 +1,3 @@
--CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in
--${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp @ONLY)
- CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/global.hxx.in
- ${CMAKE_CURRENT_BINARY_DIR}/global.hxx @ONLY)
- CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
-@@ -32,8 +30,7 @@
-
- ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}
${FILES_UI_H}
- ${CMAKE_CURRENT_BINARY_DIR}/global.hxx
--${CMAKE_CURRENT_BINARY_DIR}/config.h
--${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp)
-+${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
- SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H}
${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
- SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} common PARENT_SCOPE)
luminance-hdr-2.3.1.orig/src/UI/UMessageBox.cpp
-+++ luminance-hdr-2.3.1/src/UI/UMessageBox.cpp
-@@ -28,7 +28,6 @@
-
- #include "UI/UMessageBox.h"
-
--#include "Common/GitSHA1.h"
- #include "Common/config.h"
- #include "Common/archs.h"
- #include "ui_about.h"
-@@ -92,7 +91,7 @@
- ui.authorsBox->setOpenExternalLinks(true);
- ui.thanksToBox->setOpenExternalLinks(true);
- ui.GPLbox->setTextInteractionFlags(Qt::TextSelectableByMouse);
--
