Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@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: Wed, 31 Jan 2018 16:39:49
Message-Id: 1517416602.0d49100b3b536136a20e433b5cab0dead88c261e.tamiko@gentoo
1 commit: 0d49100b3b536136a20e433b5cab0dead88c261e
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 30 23:10:15 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 31 16:36:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d49100b
7
8 media-gfx/luminance-hdr: version bump to 2.5.1
9
10 - Updated to EAPI 6
11
12 - Ported no-git patch to 2.5.1 and made it more robust by simply
13 setting GIT_SHA1 to an arbitrary string.
14
15 - Ported fits-automagic and openmp-automagic patches
16
17 - Updated dependencies:
18 dev-qt/qtwebkit -> dev-qt/qtwebengine
19 sci-libs/ccfits -> sci-libs/cfitsio
20
21 Closes: https://bugs.gentoo.org/618154
22 Closes: https://bugs.gentoo.org/630052
23 Package-Manager: Portage-2.3.21, Repoman-2.3.6
24
25 media-gfx/luminance-hdr/Manifest | 1 +
26 .../files/luminance-hdr-2.5.1-docs.patch | 17 +++++
27 .../files/luminance-hdr-2.5.1-fits-automagic.patch | 17 +++++
28 .../files/luminance-hdr-2.5.1-no-git.patch | 17 +++++
29 .../luminance-hdr-2.5.1-openmp-automagic.patch | 32 +++++++++
30 media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild | 84 ++++++++++++++++++++++
31 6 files changed, 168 insertions(+)
32
33 diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
34 index 1eaa8d8afcc..2e474e03980 100644
35 --- a/media-gfx/luminance-hdr/Manifest
36 +++ b/media-gfx/luminance-hdr/Manifest
37 @@ -1 +1,2 @@
38 DIST luminance-hdr-2.4.0.tar.bz2 10507522 BLAKE2B b8dc777211b63e4e03466612e1c4b7c685f921db292712c749fc14d9638a69fd735990fd5412c7376a7452911cb15212448afc03aa8407f0d6f9c65fac5d5769 SHA512 aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702
39 +DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
40
41 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
42 new file mode 100644
43 index 00000000000..48c156a382e
44 --- /dev/null
45 +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
46 @@ -0,0 +1,17 @@
47 +Don't install extra docs and fix install dir.
48 +
49 +--- luminance-hdr-2.3.1/CMakeLists.txt
50 ++++ luminance-hdr-2.3.1/CMakeLists.txt
51 +@@ -281,12 +281,6 @@
52 + INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon
53 + INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION share/applications) #desktop entry
54 + INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.appdata.xml DESTINATION share/appdata) #appstream
55 +- INSTALL(FILES
56 +- ${CMAKE_SOURCE_DIR}/AUTHORS
57 +- ${CMAKE_SOURCE_DIR}/README.md
58 +- ${CMAKE_SOURCE_DIR}/LICENSE
59 +- ${CMAKE_SOURCE_DIR}/Changelog
60 +- DESTINATION share/luminance-hdr) #info files
61 + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory
62 + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory
63 + # Microsoft Windows
64
65 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch
66 new file mode 100644
67 index 00000000000..c3b57861671
68 --- /dev/null
69 +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch
70 @@ -0,0 +1,17 @@
71 +diff --git a/CMakeLists.txt b/CMakeLists.txt
72 +index 36cf008..1b75700 100644
73 +--- a/CMakeLists.txt
74 ++++ b/CMakeLists.txt
75 +@@ -132,7 +132,11 @@ INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR})
76 + FIND_PACKAGE(JPEG REQUIRED)
77 + INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR})
78 +
79 +-FIND_PACKAGE(CFITSIO)
80 ++OPTION(USE_FITS "Enable FITS support." ON)
81 ++IF(USE_FITS)
82 ++ FIND_PACKAGE(CFITSIO REQUIRED)
83 ++ENDIF()
84 ++
85 + IF(CFITSIO_FOUND)
86 + INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR})
87 + SET(LIBS ${LIBS} ${CFITSIO_LIBRARIES})
88
89 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch
90 new file mode 100644
91 index 00000000000..8665785736e
92 --- /dev/null
93 +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch
94 @@ -0,0 +1,17 @@
95 +diff --git a/CMakeLists.txt b/CMakeLists.txt
96 +index 7e8975f..2e5ea5b 100644
97 +--- a/CMakeLists.txt
98 ++++ b/CMakeLists.txt
99 +@@ -59,11 +59,7 @@ set(LIBS ${LIBS}
100 + ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
101 + ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
102 +
103 +-FIND_PACKAGE(Git)
104 +-IF(GIT_FOUND)
105 +- include(GetGitRevisionDescription)
106 +- get_git_head_revision(GIT_REFSPEC GIT_SHA1)
107 +-ENDIF()
108 ++SET(GIT_SHA1 "-- gentoo build --")
109 +
110 + IF(WIN32)
111 + # Windows Section
112
113 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch
114 new file mode 100644
115 index 00000000000..f0399d271a5
116 --- /dev/null
117 +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch
118 @@ -0,0 +1,32 @@
119 +diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake
120 +index f55c130..81e1916 100644
121 +--- a/build_files/Modules/CompilerSettings.cmake
122 ++++ b/build_files/Modules/CompilerSettings.cmake
123 +@@ -45,16 +45,19 @@ else()
124 + message(WARNING "Your C++ compiler does not support C++11.")
125 + endif()
126 + #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3
127 +-IF(MSVC)
128 +- FIND_PACKAGE(OpenMP REQUIRED)
129 +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
130 +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
131 +-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)
132 +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
133 +- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
134 +- MESSAGE(STATUS "GCC >= 4.3")
135 ++OPTION(USE_OPENMP "Use openmp threading support." ON)
136 ++IF(USE_OPENMP)
137 ++ IF(MSVC)
138 + FIND_PACKAGE(OpenMP REQUIRED)
139 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
140 + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
141 ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)
142 ++ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
143 ++ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
144 ++ MESSAGE(STATUS "GCC >= 4.3")
145 ++ FIND_PACKAGE(OpenMP REQUIRED)
146 ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
147 ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
148 ++ ENDIF()
149 + ENDIF()
150 + ENDIF()
151
152 diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild
153 new file mode 100644
154 index 00000000000..8bf884629bc
155 --- /dev/null
156 +++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild
157 @@ -0,0 +1,84 @@
158 +# Copyright 1999-2018 Gentoo Foundation
159 +# Distributed under the terms of the GNU General Public License v2
160 +
161 +EAPI=6
162 +
163 +inherit cmake-utils toolchain-funcs eutils flag-o-matic
164 +
165 +MY_P=${P/_/.}
166 +DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
167 +HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
168 +SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
169 +
170 +LICENSE="GPL-2"
171 +SLOT="0"
172 +KEYWORDS="~amd64 ~x86"
173 +LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
174 +IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}"
175 +
176 +RDEPEND="
177 + dev-libs/boost:0=
178 + dev-qt/qtconcurrent:5
179 + dev-qt/qtcore:5
180 + dev-qt/qtdeclarative:5
181 + dev-qt/qtgui:5
182 + dev-qt/qtnetwork:5
183 + dev-qt/qtprintsupport:5
184 + dev-qt/qtsql:5
185 + dev-qt/qtwebengine:5
186 + >=media-gfx/exiv2-0.14:0=
187 + media-libs/lcms:2
188 + media-libs/libpng:0=
189 + >=media-libs/libraw-0.13.4:=
190 + media-libs/ilmbase:=
191 + >=media-libs/openexr-1.2.2-r2:=
192 + >=media-libs/tiff-3.8.2-r2:0
193 + sci-libs/fftw:3.0[threads]
194 + fits? ( sci-libs/cfitsio )
195 + sci-libs/gsl
196 + virtual/jpeg:0
197 +"
198 +DEPEND="${RDEPEND}
199 + dev-qt/linguist-tools:5
200 + test? ( dev-cpp/gtest )
201 +"
202 +
203 +DOCS=( AUTHORS BUGS Changelog README.md TODO )
204 +
205 +PATCHES=(
206 + "${FILESDIR}"/${PN}-2.5.1-no-git.patch
207 + "${FILESDIR}"/${PN}-2.5.1-docs.patch
208 + "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
209 + "${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
210 +)
211 +
212 +pkg_pretend() {
213 + if use cpu_flags_x86_sse2 ; then
214 + append-flags -msse2
215 + else
216 + eerror "This package requires a CPU supporting the SSE2 instruction set."
217 + die "SSE2 support missing"
218 + fi
219 +
220 + if use openmp ; then
221 + tc-has-openmp || die "Please switch to an openmp compatible compiler"
222 + fi
223 +}
224 +
225 +src_configure() {
226 + mycmakeargs=(
227 + -DUSE_OPENMP="$(usex openmp)"
228 + -DUSE_FITS="$(usex fits)"
229 + )
230 + cmake-utils_src_configure
231 +}
232 +
233 +src_install() {
234 + cmake-utils_src_install
235 +
236 + for lang in ${LANGS} ; do
237 + if ! use l10n_${lang} ; then
238 + rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
239 + fi
240 + done
241 +}