gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

media-gfx/luminance-hdr: treeclean

Browse Source 
Closes: https://bugs.gentoo.org/950474 (pkgremoved)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2026-01-14 23:35:25 +01:00
parent a43e09d8e0
commit f3e919b921
14 changed files with 0 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-gfx/luminance-hdr/Manifest
View File

@@ -1 +0,0 @@
DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e

22
media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch
View File

@@ -1,22 +0,0 @@
--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200
+++ b/CMakeLists.txt 2019-09-15 23:53:19.496802424 +0200
@@ -5,19 +5,6 @@
CMAKE_POLICY(SET CMP0053 NEW)
PROJECT("Luminance HDR")
-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$")
- message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-else()
- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
- "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel")
-endif()
-
-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$")
- message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT")
- add_definitions("-DQT_NO_DEBUG_OUTPUT")
-endif()
-
# assume built-in pthreads on MacOS
IF(APPLE)
enable_language(CXX)

15
media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch
View File

@@ -1,15 +0,0 @@
--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200
+++ b/CMakeLists.txt 2019-09-15 23:43:41.005292354 +0200
@@ -413,12 +413,6 @@
INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon
INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.desktop DESTINATION share/applications) #desktop entry
INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.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/doc) #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

15
media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch
View File

@@ -1,15 +0,0 @@
--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200
+++ b/CMakeLists.txt 2019-09-15 23:41:24.684413834 +0200
@@ -103,11 +103,7 @@
set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES})
endif()
-FIND_PACKAGE(Git)
-IF(GIT_FOUND)
- include(GetGitRevisionDescription)
- get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-ENDIF()
+SET(GIT_SHA1 "-- Gentoo build --")
IF(WIN32)

12
media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-boost-1.85.patch
View File

@@ -1,12 +0,0 @@
https://bugs.gentoo.org/932335
https://github.com/LuminanceHDR/LuminanceHDR/issues/283#issuecomment-2132239165
--- a/src/Libpfs/manip/resize.hxx
+++ b/src/Libpfs/manip/resize.hxx
@@ -23,6 +23,7 @@
#define PFS_RESIZE_HXX
#include <boost/math/constants/constants.hpp>
+#include <boost/numeric/conversion/bounds.hpp>
#include "copy.h"
#include "resize.h"
#include "../../sleef.c"

18
media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-clamp-redefinition.patch
View File

@@ -1,18 +0,0 @@
diff --git a/src/Libpfs/manip/gamma_levels.cpp b/src/Libpfs/manip/gamma_levels.cpp
index 67975111..c0fb1798 100644
--- a/src/Libpfs/manip/gamma_levels.cpp
+++ b/src/Libpfs/manip/gamma_levels.cpp
@@ -31,13 +31,6 @@
namespace {
-template <typename T>
-inline T clamp(const T &v, const T &lower_bound, const T &upper_bound) {
- if (v <= lower_bound) return lower_bound;
- if (v >= upper_bound) return upper_bound;
- return v;
-}
-
////! \note I assume that *in* contains only value between [0,1]
// void gamma_levels_array(const pfs::Array2D* in, pfs::Array2D* out,
// float black_in, float white_in,

82
media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-compilersettings-and-openmp.patch
View File

@@ -1,82 +0,0 @@
From b44ecdcbfdf4ee1eca2fdb431dfb7dfd63cc8b1f Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 21 Jan 2025 21:37:28 +0100
Subject: [PATCH] CMake: Cleanup CompilerSettings.cmake
>C++11 is a given, so don't tie down to now old standard;
fixes build w/ boost-1.87
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
build_files/Modules/CompilerSettings.cmake | 49 ++++------------------
1 file changed, 8 insertions(+), 41 deletions(-)
diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake
index 76dbc219..5e25a718 100644
--- a/build_files/Modules/CompilerSettings.cmake
+++ b/build_files/Modules/CompilerSettings.cmake
@@ -9,53 +9,20 @@ ADD_DEFINITIONS(-march=core2)
ENDIF()
ENDIF()
-#Activate C++11 support, when available
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- add_definitions(-DBRANCH_PREDICTION)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
- if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
- message(STATUS "C++11 activated for GCC ${GCC_VERSION}")
- set(CMAKE_CXX_STANDARD 11)
- add_definitions(-DLHDR_CXX11_ENABLED)
- elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
- message(WARNING "C++0x activated for GCC ${GCC_VERSION}. If you get any errors update to a compiler that fully supports C++11")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") # add_definitions("-std=gnu++0x")
- add_definitions(-DLHDR_CXX11_ENABLED)
- else()
- message(WARNING "C++11 NOT available. GCC >= 4.3 is needed.")
- endif()
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- message(STATUS "C++11 activated for Clang")
- set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 20)
+add_definitions(-DLHDR_CXX11_ENABLED)
+add_definitions(-DBRANCH_PREDICTION)
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if (APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-lc++abi -stdlib=libc++ -rpath @loader_path/../Frameworks/")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
- add_definitions(-DLHDR_CXX11_ENABLED)
- add_definitions(-DBRANCH_PREDICTION)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference -Wdelete-non-virtual-dtor -Wsign-compare -Wswitch")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wreturn-type -Wself-assign -Wunused-argument -Wunused-function -Wtautological-compare")
- #OpenMP support under Linux with clang
- if (UNIX)
- FIND_PACKAGE(OpenMP REQUIRED)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- endif()
-elseif(MSVC)
- message(STATUS "C++11 is active by default on Microsoft Visual Studio")
- add_definitions(-DLHDR_CXX11_ENABLED)
-else()
- message(WARNING "Your C++ compiler does not support C++11.")
endif()
-#OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3
-IF(MSVC)
- FIND_PACKAGE(OpenMP REQUIRED)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)
- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
- MESSAGE(STATUS "GCC >= 4.3")
+
+OPTION(USE_OPENMP "Use openmp threading support." ON)
+IF(USE_OPENMP)
+ IF(MSVC OR UNIX)
FIND_PACKAGE(OpenMP REQUIRED)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
--
2.45.3

143
media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-exiv2-0.28.patch
View File

@@ -1,143 +0,0 @@
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"));
}

15
media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch
View File

@@ -1,15 +0,0 @@
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:

213
media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-no-qtwebengine.patch
View File

@@ -1,213 +0,0 @@
From 94f7edf3712b735219eb31eda71b7e188d718bdd Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 21 Jan 2025 19:35:21 +0100
Subject: [PATCH 1/2] CMake: UI: Drop bogus Qt5WebKit/Qt5WebEngineWidgets
dependency
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
src/UI/CMakeLists.txt | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt
index 96df52b4..4f6cb53e 100644
--- a/src/UI/CMakeLists.txt
+++ b/src/UI/CMakeLists.txt
@@ -50,14 +50,6 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
ADD_LIBRARY(ui STATIC ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H})
-IF(MINGW)
- TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::WebKitWidgets Qt5::Sql)
-ELSE()
- IF(Qt5WebEngineCore_FOUND)
- TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::WebEngineWidgets Qt5::Sql)
- ELSE()
- TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::WebKitWidgets Qt5::Sql)
- ENDIF()
-ENDIF()
+TARGET_LINK_LIBRARIES(ui Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::Sql)
SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE)
SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} ui PARENT_SCOPE)
--
2.45.3
From d3e354dba3e1e20d5bcf3d97222d951b857bcb23 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 20 Jan 2025 18:18:16 +0100
Subject: [PATCH 2/2] CMake: Hard-disable helpbrowser (with it Qt5WebEngine)
Gentoo-bug: https://bugs.gentoo.org/926664
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
CMakeLists.txt | 32 +++++++++++++++++++-------------
src/CMakeLists.txt | 4 +++-
src/MainWindow/MainWindow.cpp | 8 ++++++++
src/MainWindow/MainWindow.h | 4 ++++
src/MainWindow/MainWindow.ui | 1 +
5 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c8b093f..5f0aaa6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,8 @@ else( HAS_BRANCH_PREDICTION )
set( BRANCH_PREDICTION 0 )
endif( HAS_BRANCH_PREDICTION )
+option(WITH_HELPBROWSER "Build help browser" ON)
+
# find and setup Qt5 for this project
find_package(Qt5Core REQUIRED)
@@ -69,13 +71,15 @@ find_package(Qt5Gui REQUIRED)
# https://wiki.qt.io/New-Features-in-Qt-5.5#Deprecated_Functionality. Unfortunately,
# some Qt distributions still provide QtWebKit instead of QtWebEngine. So first we
# try to find QtWebEngine and if not found, we fall back to QtWebKit.
-find_package(Qt5WebEngineCore QUIET)
-if(Qt5WebEngineCore_FOUND)
- find_package(Qt5WebEngineWidgets REQUIRED)
-else()
- find_package(Qt5WebKit REQUIRED)
- find_package(Qt5WebKitWidgets REQUIRED)
- add_definitions(-DUSE_DEPRECATED_QTWEBKIT)
+if(WITH_HELPBROWSER)
+ find_package(Qt5WebEngineCore QUIET)
+ if(Qt5WebEngineCore_FOUND)
+ find_package(Qt5WebEngineWidgets REQUIRED)
+ else()
+ find_package(Qt5WebKit REQUIRED)
+ find_package(Qt5WebKitWidgets REQUIRED)
+ add_definitions(-DUSE_DEPRECATED_QTWEBKIT)
+ endif()
endif()
find_package(Qt5Xml REQUIRED)
find_package(Qt5Sql REQUIRED)
@@ -96,12 +100,14 @@ set(LIBS ${LIBS}
${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
-if(Qt5WebEngineCore_FOUND)
- message(STATUS "Building with QtWebEngine")
- set(LIBS ${LIBS} ${QT_QTWEBENGINE_LIBRARIES})
-else()
- message(STATUS "Building with QtWebKit")
- set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES})
+if(WITH_HELPBROWSER)
+ if(Qt5WebEngineCore_FOUND)
+ message(STATUS "Building with QtWebEngine")
+ set(LIBS ${LIBS} ${QT_QTWEBENGINE_LIBRARIES})
+ else()
+ message(STATUS "Building with QtWebKit")
+ set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES})
+ endif()
endif()
FIND_PACKAGE(Git)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5757bb9..8221c7ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,9 @@ ADD_SUBDIRECTORY(Exif)
ADD_SUBDIRECTORY(Fileformat)
ADD_SUBDIRECTORY(Alignment)
ADD_SUBDIRECTORY(HdrWizard)
-ADD_SUBDIRECTORY(HelpBrowser)
+if(WITH_HELPBROWSER)
+ ADD_SUBDIRECTORY(HelpBrowser)
+endif()
ADD_SUBDIRECTORY(Preferences)
ADD_SUBDIRECTORY(Projection)
ADD_SUBDIRECTORY(Resize)
diff --git a/src/MainWindow/MainWindow.cpp b/src/MainWindow/MainWindow.cpp
index 6459229a..b49d3d14 100644
--- a/src/MainWindow/MainWindow.cpp
+++ b/src/MainWindow/MainWindow.cpp
@@ -98,7 +98,9 @@
#include <HdrWizard/AutoAntighosting.h>
#include <HdrWizard/HdrWizard.h>
#include <HdrWizard/WhiteBalance.h>
+#ifdef WITH_HELPBROWSER
#include <HelpBrowser/helpbrowser.h>
+#endif
#include <LibpfsAdditions/formathelper.h>
#include <Preferences/PreferencesDialog.h>
#include <PreviewPanel/PreviewPanel.h>
@@ -208,7 +210,9 @@ int MainWindow::sm_counter = 0;
QMap<int, MainWindow *> MainWindow::sm_mainWindowMap =
QMap<int, MainWindow *>();
QScopedPointer<UpdateChecker> MainWindow::sm_updateChecker;
+#ifdef WITH_HELPBROWSER
HelpBrowser *MainWindow::sm_helpBrowser = nullptr;
+#endif
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent),
@@ -1059,6 +1063,7 @@ void MainWindow::on_normalSizeAct_triggered() {
}
// Zoom = Viewers (END)
+#ifdef WITH_HELPBROWSER
void MainWindow::on_documentationAction_triggered() {
if (sm_helpBrowser == nullptr) {
sm_helpBrowser =
@@ -1079,6 +1084,7 @@ void MainWindow::on_documentationAction_triggered() {
void MainWindow::helpBrowserClosed() {
sm_helpBrowser = nullptr;
}
+#endif
void MainWindow::enterWhatsThis() { QWhatsThis::enterWhatsThisMode(); }
@@ -1451,9 +1457,11 @@ void MainWindow::closeEvent(QCloseEvent *event) {
}
sm_NumMainWindows--;
if (sm_NumMainWindows == 0) {
+#ifdef WITH_HELPBROWSER
if (sm_helpBrowser) {
sm_helpBrowser->close();
}
+#endif
}
if (sm_NumMainWindows == 0) {
diff --git a/src/MainWindow/MainWindow.h b/src/MainWindow/MainWindow.h
index 029cf813..68aa2fd4 100644
--- a/src/MainWindow/MainWindow.h
+++ b/src/MainWindow/MainWindow.h
@@ -146,7 +146,9 @@ class MainWindow : public QMainWindow {
void on_normalSizeAct_triggered();
void updateMagnificationButtons(GenericViewer *);
+#ifdef WITH_HELPBROWSER
void on_documentationAction_triggered();
+#endif
void enterWhatsThis();
void on_OptionsAction_triggered();
@@ -180,7 +182,9 @@ class MainWindow : public QMainWindow {
void enableCrop(bool);
void disableCrop();
+#ifdef WITH_HELPBROWSER
void helpBrowserClosed();
+#endif
void on_actionDonate_triggered();
void onUpdateAvailable();
diff --git a/src/MainWindow/MainWindow.ui b/src/MainWindow/MainWindow.ui
index 775bfb2c..e4734a43 100644
--- a/src/MainWindow/MainWindow.ui
+++ b/src/MainWindow/MainWindow.ui
@@ -423,6 +423,7 @@
</property>
</action>
<action name="documentationAction">
+ <property name="enabled"><bool>false</bool></property>
<property name="icon">
<iconset theme="help-contents">
<normaloff>.</normaloff>.</iconset>
--
2.45.3

28
media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch
View File

@@ -1,28 +0,0 @@
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)

98
media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r2.ebuild
View File

@@ -1,98 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake toolchain-funcs xdg-utils
DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
SRC_URI="https://downloads.sourceforge.net/qtpfsgui/${P/_/.}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64"
IUSE="fits openmp test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/boost:=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libraw:=
>=media-libs/openexr-3:0=
media-libs/tiff:=
sci-libs/fftw:3.0=[threads]
sci-libs/gsl:=
fits? ( sci-libs/cfitsio:= )
"
DEPEND="${RDEPEND}
dev-cpp/eigen:3
test? ( dev-cpp/gtest )
"
BDEPEND="dev-qt/linguist-tools:5"
PATCHES=(
"${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.6.1.1-boost-1.85.patch
# downstream; fix build w/ boost-1.87, openmp automagic
"${FILESDIR}"/${P}-clamp-redefinition.patch
"${FILESDIR}"/${P}-compilersettings-and-openmp.patch
# patch by ArchLinux
"${FILESDIR}"/${P}-exiv2-0.28.patch
# inspired by FreeBSD
"${FILESDIR}"/${P}-no-qtwebengine.patch
)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
local mycmakeargs=(
-DWITH_HELPBROWSER=OFF
$(cmake_use_find_package fits CFITSIO)
-DUSE_OPENMP="$(usex openmp)"
)
cmake_src_configure
}
src_install() {
cmake_src_install
mkdir -p "${D}/usr/share/metainfo" || die
mv "${D}/usr/share/appdata/"* "${D}/usr/share/metainfo/" || die
rmdir "${D}/usr/share/appdata" || die
}
pkg_postinst() {
xdg_icon_cache_update
xdg_desktop_database_update
xdg_mimeinfo_database_update
}
pkg_postrm() {
xdg_icon_cache_update
xdg_desktop_database_update
xdg_mimeinfo_database_update
}

38
media-gfx/luminance-hdr/metadata.xml
View File

@@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Huettel</name>
</maintainer>
<longdescription lang="en">
Qtpfsgui is an open source graphical user interface application that aims
to provide a workflow for HDR imaging.
Supported HDR formats:
* OpenEXR (extension: exr)
* Radiance RGBE (extension: hdr)
* Tiff formats: 16bit, 32bit (float) and LogLuv (extension: tiff)
* Raw image formats (extension: various)
* PFS native format (extension: pfs)
Supported LDR formats:
* JPEG, PNG, PPM, PBM, TIFF(8 bit)
Supported features:
* Create an HDR file from a set of images (formats: JPEG, TIFF 8bit and
16bit, RAW) of the same scene taken at different exposure setting.
* Save and load HDR images.
* Rotate and resize HDR images.
* Tonemap HDR images.
* Copy exif data between sets of images.
* Supports internationalization.
</longdescription>
<use>
<flag name="fits">Enable support for the FITS format</flag>
</use>
<upstream>
<remote-id type="github">LuminanceHDR/LuminanceHDR</remote-id>
<remote-id type="sourceforge">qtpfsgui</remote-id>
</upstream>
</pkgmetadata>

5
profiles/package.mask
View File

@@ -150,11 +150,6 @@ media-sound/qmidiroute
# Removal on 2026-01-15
media-sound/mp3diags
# Andreas Sturmlechner <asturm@gentoo.org> (2025-12-14)
# Last release depends on Qt5, upstream appears dormant. Bug #950474
# Removal on 2026-01-15
media-gfx/luminance-hdr
# Michał Górny <mgorny@gentoo.org> (2025-12-12)
# Upstream has switched to LLM-first coding which has already caused
# a number of suspicious bugs. At this point, new versions