diff options
Diffstat (limited to 'media-gfx/luminance-hdr')
| -rw-r--r-- | media-gfx/luminance-hdr/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch | 143 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch | 15 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch | 28 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild (renamed from media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild) | 45 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/metadata.xml | 2 |
6 files changed, 213 insertions, 22 deletions
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index ef8d09c6f1ef..064836479489 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -1 +1 @@ -DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1 +DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e 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 000000000000..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 &from, const std::string &to, + #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 &from, const std::string &to, + } + + // 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 &from, const std::string &to, + destinationImage->setExifData(srcExifData); + } + destinationImage->writeMetadata(); ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ } catch (Exiv2::Error &e) { ++#else + } catch (Exiv2::AnyError &e) { ++#endif + #ifndef NDEBUG + qDebug() << e.what(); + #endif +@@ -338,7 +350,11 @@ allowed for ev computation purposes. + + float getExposureTime(const std::string &filename) { + 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 &exifData = image->exifData(); + if (exifData.empty()) return -1; +@@ -374,14 +390,22 @@ float getExposureTime(const std::string &filename) { + } else { + return -1; + } ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ } catch (Exiv2::Error &e) { ++#else + } catch (Exiv2::AnyError &e) { ++#endif + return -1; + } + } + + float getAverageLuminance(const std::string &filename) { + 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 &exifData = image->exifData(); + +@@ -403,7 +427,11 @@ float getAverageLuminance(const std::string &filename) { + << std::endl; + + return -1.0; ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ } catch (Exiv2::Error &e) { ++#else + } catch (Exiv2::AnyError &e) { ++#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 &filename) { fromFile(filename); } + void ExifData::fromFile(const std::string &filename) { + 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 &exifData = image->exifData(); + +@@ -121,7 +125,11 @@ void ExifData::fromFile(const std::string &filename) { + */ + 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 &filename) { + break; + } + } ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ } catch (Exiv2::Error &e) { ++#else + } catch (Exiv2::AnyError &e) { ++#endif + return; + } + } +diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp +index 8364b595..a7683703 100644 +--- a/src/TransplantExif/TransplantExifDialog.cpp ++++ b/src/TransplantExif/TransplantExifDialog.cpp +@@ -347,7 +347,11 @@ void TransplantExifDialog::transplant_requested() { + QFile::encodeName((*i_dest)).constData(), + m_Ui->checkBox_dont_overwrite->isChecked()); + m_Ui->rightlist->item(index)->setBackground(QBrush("#a0ff87")); ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ } catch (Exiv2::Error &e) { ++#else + } catch (Exiv2::AnyError &e) { ++#endif + add_log_message("ERROR:" + QString::fromStdString(e.what())); + m_Ui->rightlist->item(index)->setBackground(QBrush("#ff743d")); + } diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch new file mode 100644 index 000000000000..58974ea998ee --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch @@ -0,0 +1,15 @@ +Source: arch linux + +diff --git a/src/Common/init_fftw.h b/src/Common/init_fftw.h +index af2fc02c..a4aad47f 100644 +--- a/src/Common/init_fftw.h ++++ b/src/Common/init_fftw.h +@@ -22,7 +22,7 @@ + #ifndef INIT_FFTW_H + #define INIT_FFTW_H + +-#include <boost/thread/mutex.hpp> ++#include <mutex> + + class FFTW_MUTEX { + public: diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch new file mode 100644 index 000000000000..9ab283298704 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch @@ -0,0 +1,28 @@ +Source: arch linux + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ff498d0..23f5c387 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) + FIND_PACKAGE(PNG REQUIRED) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + +-FIND_PACKAGE(OpenEXR REQUIRED) ++FIND_PACKAGE(OpenEXR CONFIG REQUIRED) + INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR") + + FIND_PACKAGE(GSL REQUIRED) +diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt +index 80617998..ce3c746e 100644 +--- a/src/Libpfs/CMakeLists.txt ++++ b/src/Libpfs/CMakeLists.txt +@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace) + ADD_SUBDIRECTORY(io) + + ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP}) +-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets) ++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE) diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild index 6ad066bc4226..ab363c98a273 100644 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake toolchain-funcs flag-o-matic xdg-utils @@ -11,15 +11,12 @@ SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="cpu_flags_x86_sse2 fits openmp test" RESTRICT="!test? ( test )" -BDEPEND=" - dev-qt/linguist-tools:5 -" RDEPEND=" - dev-libs/boost:0= + dev-libs/boost:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -32,30 +29,42 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= - media-libs/ilmbase:= media-libs/lcms:2 - media-libs/libpng:0= + media-libs/libjpeg-turbo:= + media-libs/libpng:= media-libs/libraw:= - media-libs/openexr:= - media-libs/tiff:0 + >=media-libs/openexr-3:0= + media-libs/tiff:= sci-libs/fftw:3.0=[threads] sci-libs/gsl:= - virtual/jpeg:0 fits? ( sci-libs/cfitsio:= ) " DEPEND="${RDEPEND} dev-cpp/eigen:3 test? ( dev-cpp/gtest ) " +BDEPEND="dev-qt/linguist-tools:5" PATCHES=( - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-no-git.patch - "${FILESDIR}"/${P}-docs.patch + "${FILESDIR}"/${P}-openexr3.patch + "${FILESDIR}"/${P}-fixheaders.patch + "${FILESDIR}"/${PN}-2.6.0-cmake.patch + "${FILESDIR}"/${PN}-2.6.0-no-git.patch + "${FILESDIR}"/${PN}-2.6.0-docs.patch "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch + # patch by ArchLinux + "${FILESDIR}"/${P}-exiv2-0.28.patch ) pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { if use cpu_flags_x86_sse2 ; then append-flags -msse2 else @@ -63,12 +72,8 @@ pkg_pretend() { die "SSE2 support missing" fi - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} + append-flags -std=c++17 -src_configure() { local mycmakeargs=( $(cmake_use_find_package fits CFITSIO) -DUSE_OPENMP="$(usex openmp)" diff --git a/media-gfx/luminance-hdr/metadata.xml b/media-gfx/luminance-hdr/metadata.xml index 98754110751f..5453ca8dd459 100644 --- a/media-gfx/luminance-hdr/metadata.xml +++ b/media-gfx/luminance-hdr/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> |