Compare commits
16 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| ca5144a89d | |||
| 4bba62e61a | |||
| 78ef159350 | |||
| 774f802f2a | |||
| 28b72eca52 | |||
| 382949bde9 | |||
| 3dca90ed80 | |||
| 200ee424b4 | |||
| 0f752c4532 | |||
| ab3b906ef8 | |||
| 6f1b965144 | |||
| 24c147c427 | |||
| a0546b9ebf | |||
| 10d9cc1dfb | |||
| 935904c89a | |||
| 4e310c1dab |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:74fe94a841e62601ca4ca5742859e665e9f2ac9e83a1c450e351ad52e698e537
|
||||
size 9434548
|
||||
3
LuminanceHDR-2.6.0+git313.634b489.tar.xz
Normal file
3
LuminanceHDR-2.6.0+git313.634b489.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3f60616962ddbec0248eff976ea2d41b8bed6fb30937fbc89e65465711bd891d
|
||||
size 9431112
|
||||
@@ -1,3 +1,31 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 3 15:29:13 UTC 2026 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add eigen-cmake.patch to fix build with newer Eigen libraries.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 22 21:21:09 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
- Remove unused BuildRequires: update-desktop-files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 10 06:49:26 UTC 2025 - Paolo Stivanin <info@paolostivanin.com>
|
||||
|
||||
- Update to version 2.6.0+git313.634b489:
|
||||
* Update to the latest GPLv2 license text
|
||||
* Set CMake min. version to a range, 3.3...3.12: support CMake 4.0
|
||||
* Fix building with Boost >= 1.85.0
|
||||
* Add developer ID net.sourceforge.qtpfsgui in AppData
|
||||
* Fix deprecated top-level developer_name in AppData XML
|
||||
- Add fix-boost_system.patch
|
||||
- Drop upstreamed fix-boost1_85.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 6 06:49:27 UTC 2025 - Paolo Stivanin <info@paolostivanin.com>
|
||||
|
||||
- Add clamp.patch
|
||||
- Add fix-boost-1.87.0.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 22 13:13:41 UTC 2024 - info@paolostivanin.com
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package LuminanceHDR
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -15,11 +15,16 @@
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1590
|
||||
%global force_gcc_version 12
|
||||
%endif
|
||||
|
||||
%define _lto_cflags %{nil}
|
||||
%define liblcms2_name liblcms2-2
|
||||
|
||||
Name: LuminanceHDR
|
||||
Version: 2.6.0+git304.6107989
|
||||
Version: 2.6.0+git313.634b489
|
||||
Release: 0
|
||||
Summary: Complete workflow for HDR imaging
|
||||
License: GPL-3.0-or-later
|
||||
@@ -28,43 +33,47 @@ URL: https://github.com/LuminanceHDR/LuminanceHDR
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE use-system-rtprocess.patch
|
||||
Patch0: use-system-rtprocess.patch
|
||||
# PATCH-FIX-UPSTREAM fix-boost1_85.patch pr#284
|
||||
Patch1: fix-boost1_85.patch
|
||||
# PATCH-FIX-OPENSUSE fix-version.patch
|
||||
Patch2: fix-version.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: fix-boost_system.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch2: clamp.patch
|
||||
Patch3: fix-version.patch
|
||||
Patch4: fix-boost-1.87.0.patch
|
||||
Patch5: eigen-cmake.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: librtprocess-devel
|
||||
BuildRequires: libqt5-qtbase-common-devel
|
||||
BuildRequires: libqt5-linguist-devel
|
||||
BuildRequires: fftw3-devel
|
||||
BuildRequires: fftw3-openmp-devel
|
||||
BuildRequires: fftw3-threads-devel
|
||||
BuildRequires: gcc%{?force_gcc_version}-c++ >= 12
|
||||
BuildRequires: libboost_atomic-devel
|
||||
BuildRequires: libboost_program_options-devel
|
||||
%if 0%{?suse_version} < 1600
|
||||
BuildRequires: libboost_system-devel
|
||||
%endif
|
||||
BuildRequires: libboost_thread-devel
|
||||
BuildRequires: libexiv2-devel >= 0.27.0
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libqt5-linguist-devel
|
||||
BuildRequires: libqt5-qtbase-common-devel
|
||||
BuildRequires: librtprocess-devel
|
||||
BuildRequires: openexr-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: cmake(Qt5Concurrent)
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5Network)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: cmake(Qt5Sql)
|
||||
BuildRequires: cmake(Qt5WebEngine)
|
||||
BuildRequires: cmake(Qt5Svg)
|
||||
BuildRequires: cmake(Qt5WebEngine)
|
||||
BuildRequires: cmake(Qt5Xml)
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libboost_thread-devel
|
||||
BuildRequires: libboost_program_options-devel
|
||||
BuildRequires: libboost_atomic-devel
|
||||
BuildRequires: openexr-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libexiv2-devel >= 0.27.0
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(cfitsio)
|
||||
BuildRequires: pkgconfig(eigen3)
|
||||
BuildRequires: pkgconfig(gsl)
|
||||
BuildRequires: pkgconfig(libraw)
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(lcms2) >= 2.6
|
||||
BuildRequires: pkgconfig(lensfun)
|
||||
BuildRequires: pkgconfig(libraw)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(libtiff-4)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
@@ -93,10 +102,9 @@ Supported features:
|
||||
* Copy EXIF data between sets of images
|
||||
* Supports internationalization
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: This package provides documentation for %{name}
|
||||
BuildArch: noarch
|
||||
Summary: This package provides documentation for %{name}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
This package contains the documentation for Luminance HDR.
|
||||
@@ -105,7 +113,8 @@ This package contains the documentation for Luminance HDR.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%cmake
|
||||
%cmake \
|
||||
-DCMAKE_CXX_COMPILER=%{_bindir}/g++%{?force_gcc_version:-%force_gcc_version}
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
|
||||
6
_service
6
_service
@@ -1,5 +1,5 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<service name="tar_scm" mode="manual">
|
||||
<param name="url">https://github.com/LuminanceHDR/LuminanceHDR.git/</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
|
||||
@@ -10,11 +10,11 @@
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">LuminanceHDR</param>
|
||||
</service>
|
||||
<service mode="disabled" name="recompress">
|
||||
<service mode="manual" name="recompress">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service mode="disabled" name="set_version">
|
||||
<service mode="manual" name="set_version">
|
||||
<param name="basename">LuminanceHDR</param>
|
||||
</service>
|
||||
</services>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/LuminanceHDR/LuminanceHDR.git/</param>
|
||||
<param name="changesrevision">6107989a7978577524ec556b690e337f9a6d7b1f</param></service></servicedata>
|
||||
<param name="changesrevision">634b48931af2b17bb30bc746da616dfb361127f9</param></service></servicedata>
|
||||
19
clamp.patch
Normal file
19
clamp.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
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,
|
||||
|
||||
47
eigen-cmake.patch
Normal file
47
eigen-cmake.patch
Normal file
@@ -0,0 +1,47 @@
|
||||
From: Jan Engelhardt <ej@inai.de>
|
||||
Date: 2026-02-03 16:28:54.000013795 +0100
|
||||
|
||||
As per eigen3-3.4.1:/usr/share/eigen3/cmake/UseEigen3.cmake,
|
||||
the modern way to use Eigen3 is as follows...
|
||||
|
||||
[This resolves a build failure with eigen3-5.x, which has
|
||||
abandoned setting EIGEN3_INCLUDE_DIR.]
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 --
|
||||
src/TonemappingOperators/CMakeLists.txt | 2 +-
|
||||
2 files changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
Index: LuminanceHDR-2.6.0+git313.634b489/CMakeLists.txt
|
||||
===================================================================
|
||||
--- LuminanceHDR-2.6.0+git313.634b489.orig/CMakeLists.txt
|
||||
+++ LuminanceHDR-2.6.0+git313.634b489/CMakeLists.txt
|
||||
@@ -132,7 +132,6 @@ IF(WIN32)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -Werror=unknown-pragmas")
|
||||
ENDIF()
|
||||
FIND_PACKAGE(Eigen3 REQUIRED)
|
||||
- INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
|
||||
ELSE()
|
||||
SET(LIBRAW_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../DEPs/include/libraw")
|
||||
SET(FFTWF_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../DEPs/include/fftw3")
|
||||
@@ -174,7 +173,6 @@ ELSE()
|
||||
INCLUDE_DIRECTORIES(${LCMS2_INCLUDE_DIR})
|
||||
|
||||
FIND_PACKAGE(Eigen3 REQUIRED)
|
||||
- INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
|
||||
ENDIF()
|
||||
|
||||
IF(WIN32)
|
||||
Index: LuminanceHDR-2.6.0+git313.634b489/src/TonemappingOperators/CMakeLists.txt
|
||||
===================================================================
|
||||
--- LuminanceHDR-2.6.0+git313.634b489.orig/src/TonemappingOperators/CMakeLists.txt
|
||||
+++ LuminanceHDR-2.6.0+git313.634b489/src/TonemappingOperators/CMakeLists.txt
|
||||
@@ -24,7 +24,7 @@ FILE(GLOB FILES_H *.h)
|
||||
FILE(GLOB FILES_CPP *.cpp)
|
||||
|
||||
ADD_LIBRARY(pfstmo STATIC ${TM_LIBPFS_H} ${TM_LIBPFS_CPP} ${FILES_H} ${FILES_CPP})
|
||||
-TARGET_LINK_LIBRARIES(pfstmo pfs Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
+TARGET_LINK_LIBRARIES(pfstmo pfs Qt5::Core Qt5::Gui Qt5::Widgets Eigen3::Eigen)
|
||||
|
||||
SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfstmo PARENT_SCOPE)
|
||||
SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfstmo PARENT_SCOPE)
|
||||
10
fix-boost-1.87.0.patch
Normal file
10
fix-boost-1.87.0.patch
Normal file
@@ -0,0 +1,10 @@
|
||||
--- a/build_files/Modules/CompilerSettings.cmake 2021-01-11 10:41:28.000000000 +0100
|
||||
+++ b/build_files/Modules/CompilerSettings.cmake 2025-01-20 21:03:25.709389950 +0100
|
||||
@@ -15,7 +15,6 @@
|
||||
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")
|
||||
@@ -1,14 +0,0 @@
|
||||
--- LuminanceHDR-2.6.0~git.20240411/src/Libpfs/manip/resize.hxx.orig 2024-06-13 08:01:46.772261556 +0200
|
||||
+++ LuminanceHDR-2.6.0~git.20240411/src/Libpfs/manip/resize.hxx 2024-06-13 08:03:50.606277430 +0200
|
||||
@@ -22,6 +22,11 @@
|
||||
#ifndef PFS_RESIZE_HXX
|
||||
#define PFS_RESIZE_HXX
|
||||
|
||||
+#include <boost/version.hpp>
|
||||
+
|
||||
+#if BOOST_VERSION >= 108500
|
||||
+#include <boost/numeric/conversion/bounds.hpp>
|
||||
+#endif
|
||||
#include <boost/math/constants/constants.hpp>
|
||||
#include "copy.h"
|
||||
#include "resize.h"
|
||||
26
fix-boost_system.patch
Normal file
26
fix-boost_system.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
--- LuminanceHDR-2.6.0+git313.634b489/CMakeLists.txt.orig 2025-10-10 09:14:33.213255371 +0200
|
||||
+++ LuminanceHDR-2.6.0+git313.634b489/CMakeLists.txt 2025-10-10 09:15:01.060483228 +0200
|
||||
@@ -180,7 +180,22 @@
|
||||
IF(WIN32)
|
||||
SET(Boost_USE_STATIC_LIBS ON)
|
||||
ENDIF()
|
||||
-FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options thread chrono system date_time atomic)
|
||||
+#
|
||||
+# --- Boost.System header-only compatibility (Boost >= 1.82) ---
|
||||
+# On newer distributions (SLE16+, Tumbleweed, etc.) boost_system is header-only,
|
||||
+# so FindBoost will fail if "system" is requested as a component.
|
||||
+# We detect this and create an interface target to keep compatibility.
|
||||
+#
|
||||
+find_package(Boost REQUIRED COMPONENTS program_options thread chrono date_time atomic)
|
||||
+
|
||||
+if(TARGET Boost::system OR DEFINED Boost_SYSTEM_LIBRARY OR EXISTS "${Boost_LIBRARY_DIRS}/libboost_system.so")
|
||||
+ message(STATUS "Using compiled Boost.System library")
|
||||
+ list(APPEND Boost_LIBRARIES ${Boost_SYSTEM_LIBRARY})
|
||||
+else()
|
||||
+ message(STATUS "Boost.System is header-only in this configuration")
|
||||
+ add_library(Boost::system INTERFACE IMPORTED)
|
||||
+ target_include_directories(Boost::system INTERFACE ${Boost_INCLUDE_DIRS})
|
||||
+endif()
|
||||
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
|
||||
|
||||
FIND_PACKAGE(exiv2 REQUIRED 0.27.0)
|
||||
Reference in New Issue
Block a user