Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/files/, media-gfx/luminance-hdr/
Date: Fri, 25 Feb 2022 20:53:31
Message-Id: 1645822395.f183705a78237d697d57279c392fe4afb27b9ae3.dilfridge@gentoo
1 commit: f183705a78237d697d57279c392fe4afb27b9ae3
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 25 20:52:56 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 25 20:53:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f183705a
7
8 media-gfx/luminance-hdr: Version bump, for un-slotted OpenEXR 3
9
10 Bug: https://bugs.gentoo.org/833486
11 Bug: https://bugs.gentoo.org/833487
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
14
15 media-gfx/luminance-hdr/Manifest | 1 +
16 .../files/luminance-hdr-2.6.1.1-fixheaders.patch | 15 ++++
17 .../files/luminance-hdr-2.6.1.1-openexr3.patch | 28 ++++++
18 .../luminance-hdr/luminance-hdr-2.6.1.1.ebuild | 100 +++++++++++++++++++++
19 4 files changed, 144 insertions(+)
20
21 diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
22 index ef8d09c6f1ef..7c5171716fc9 100644
23 --- a/media-gfx/luminance-hdr/Manifest
24 +++ b/media-gfx/luminance-hdr/Manifest
25 @@ -1 +1,2 @@
26 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
27 +DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e
28
29 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
30 new file mode 100644
31 index 000000000000..58974ea998ee
32 --- /dev/null
33 +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch
34 @@ -0,0 +1,15 @@
35 +Source: arch linux
36 +
37 +diff --git a/src/Common/init_fftw.h b/src/Common/init_fftw.h
38 +index af2fc02c..a4aad47f 100644
39 +--- a/src/Common/init_fftw.h
40 ++++ b/src/Common/init_fftw.h
41 +@@ -22,7 +22,7 @@
42 + #ifndef INIT_FFTW_H
43 + #define INIT_FFTW_H
44 +
45 +-#include <boost/thread/mutex.hpp>
46 ++#include <mutex>
47 +
48 + class FFTW_MUTEX {
49 + public:
50
51 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
52 new file mode 100644
53 index 000000000000..9ab283298704
54 --- /dev/null
55 +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch
56 @@ -0,0 +1,28 @@
57 +Source: arch linux
58 +
59 +diff --git a/CMakeLists.txt b/CMakeLists.txt
60 +index 8ff498d0..23f5c387 100644
61 +--- a/CMakeLists.txt
62 ++++ b/CMakeLists.txt
63 +@@ -191,7 +191,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
64 + FIND_PACKAGE(PNG REQUIRED)
65 + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
66 +
67 +-FIND_PACKAGE(OpenEXR REQUIRED)
68 ++FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
69 + INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR")
70 +
71 + FIND_PACKAGE(GSL REQUIRED)
72 +diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt
73 +index 80617998..ce3c746e 100644
74 +--- a/src/Libpfs/CMakeLists.txt
75 ++++ b/src/Libpfs/CMakeLists.txt
76 +@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace)
77 + ADD_SUBDIRECTORY(io)
78 +
79 + ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP})
80 +-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets)
81 ++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR)
82 +
83 + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE)
84 + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE)
85
86 diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
87 new file mode 100644
88 index 000000000000..faa03a474af5
89 --- /dev/null
90 +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
91 @@ -0,0 +1,100 @@
92 +# Copyright 1999-2022 Gentoo Authors
93 +# Distributed under the terms of the GNU General Public License v2
94 +
95 +EAPI=8
96 +
97 +inherit cmake toolchain-funcs flag-o-matic xdg-utils
98 +
99 +DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
100 +HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
101 +SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2"
102 +
103 +LICENSE="GPL-2"
104 +SLOT="0"
105 +KEYWORDS="~amd64 ~x86"
106 +IUSE="cpu_flags_x86_sse2 fits openmp test"
107 +RESTRICT="!test? ( test )"
108 +
109 +BDEPEND="
110 + dev-qt/linguist-tools:5
111 +"
112 +RDEPEND="
113 + dev-libs/boost:0=
114 + dev-qt/qtconcurrent:5
115 + dev-qt/qtcore:5
116 + dev-qt/qtdeclarative:5
117 + dev-qt/qtgui:5
118 + dev-qt/qtnetwork:5
119 + dev-qt/qtprintsupport:5
120 + dev-qt/qtsql:5
121 + dev-qt/qtsvg:5
122 + dev-qt/qtwebengine:5[widgets]
123 + dev-qt/qtwidgets:5
124 + dev-qt/qtxml:5
125 + media-gfx/exiv2:=
126 + media-libs/lcms:2
127 + media-libs/libpng:0=
128 + media-libs/libraw:=
129 + >=media-libs/openexr-3:0=
130 + media-libs/tiff:0
131 + sci-libs/fftw:3.0=[threads]
132 + sci-libs/gsl:=
133 + virtual/jpeg:0
134 + fits? ( sci-libs/cfitsio:= )
135 +"
136 +DEPEND="${RDEPEND}
137 + dev-cpp/eigen:3
138 + test? ( dev-cpp/gtest )
139 +"
140 +
141 +PATCHES=(
142 + "${FILESDIR}"/${P}-openexr3.patch
143 + "${FILESDIR}"/${P}-fixheaders.patch
144 + "${FILESDIR}"/${PN}-2.6.0-cmake.patch
145 + "${FILESDIR}"/${PN}-2.6.0-no-git.patch
146 + "${FILESDIR}"/${PN}-2.6.0-docs.patch
147 + "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
148 +)
149 +
150 +pkg_pretend() {
151 + if use cpu_flags_x86_sse2 ; then
152 + append-flags -msse2
153 + else
154 + eerror "This package requires a CPU supporting the SSE2 instruction set."
155 + die "SSE2 support missing"
156 + fi
157 +
158 + if use openmp ; then
159 + tc-has-openmp || die "Please switch to an openmp compatible compiler"
160 + fi
161 +
162 + append-flags -std=c++17
163 +}
164 +
165 +src_configure() {
166 + local mycmakeargs=(
167 + $(cmake_use_find_package fits CFITSIO)
168 + -DUSE_OPENMP="$(usex openmp)"
169 + )
170 + cmake_src_configure
171 +}
172 +
173 +src_install() {
174 + cmake_src_install
175 +
176 + mkdir -p "${D}/usr/share/metainfo" || die
177 + mv "${D}/usr/share/appdata/"* "${D}/usr/share/metainfo/" || die
178 + rmdir "${D}/usr/share/appdata" || die
179 +}
180 +
181 +pkg_postinst() {
182 + xdg_icon_cache_update
183 + xdg_desktop_database_update
184 + xdg_mimeinfo_database_update
185 +}
186 +
187 +pkg_postrm() {
188 + xdg_icon_cache_update
189 + xdg_desktop_database_update
190 + xdg_mimeinfo_database_update
191 +}