Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/, media-gfx/luminance-hdr/files/
Date: Wed, 13 Nov 2019 21:25:07
Message-Id: 1573680256.218b73f64d95677b66183a5025f0a8c9df3f7a9a.asturm@gentoo
1 commit: 218b73f64d95677b66183a5025f0a8c9df3f7a9a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 13 19:36:25 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 13 21:24:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218b73f6
7
8 media-gfx/luminance-hdr: Drop 2.5.1-r1
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.18
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/luminance-hdr/Manifest | 1 -
14 .../files/luminance-hdr-2.5.1-docs.patch | 17 ----
15 .../files/luminance-hdr-2.5.1-exiv2-0.27.1.patch | 22 -----
16 .../files/luminance-hdr-2.5.1-exiv2-0.27.patch | 25 ------
17 .../files/luminance-hdr-2.5.1-fits-automagic.patch | 17 ----
18 .../files/luminance-hdr-2.5.1-no-git.patch | 17 ----
19 .../luminance-hdr/luminance-hdr-2.5.1-r1.ebuild | 95 ----------------------
20 7 files changed, 194 deletions(-)
21
22 diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
23 index 08af1d16280..ef8d09c6f1e 100644
24 --- a/media-gfx/luminance-hdr/Manifest
25 +++ b/media-gfx/luminance-hdr/Manifest
26 @@ -1,2 +1 @@
27 -DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
28 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
29
30 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
31 deleted file mode 100644
32 index 48c156a382e..00000000000
33 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
34 +++ /dev/null
35 @@ -1,17 +0,0 @@
36 -Don't install extra docs and fix install dir.
37 -
38 ---- luminance-hdr-2.3.1/CMakeLists.txt
39 -+++ luminance-hdr-2.3.1/CMakeLists.txt
40 -@@ -281,12 +281,6 @@
41 - INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon
42 - INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION share/applications) #desktop entry
43 - INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.appdata.xml DESTINATION share/appdata) #appstream
44 -- INSTALL(FILES
45 -- ${CMAKE_SOURCE_DIR}/AUTHORS
46 -- ${CMAKE_SOURCE_DIR}/README.md
47 -- ${CMAKE_SOURCE_DIR}/LICENSE
48 -- ${CMAKE_SOURCE_DIR}/Changelog
49 -- DESTINATION share/luminance-hdr) #info files
50 - INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory
51 - INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory
52 - # Microsoft Windows
53
54 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
55 deleted file mode 100644
56 index 16b5256e935..00000000000
57 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
58 +++ /dev/null
59 @@ -1,22 +0,0 @@
60 -From 8c3f1571bfa7bb702228bb283e37e58c8b322d5b Mon Sep 17 00:00:00 2001
61 -From: Benitoite <kd6kxr@×××××.com>
62 -Date: Fri, 26 Apr 2019 18:07:52 -0700
63 -Subject: [PATCH] ExifOperations: include exiv2/exiv2.hpp
64 -
65 -Because type `AnyError` requires definition in the exiv2 namespace.
66 ----
67 - src/Exif/ExifOperations.cpp | 1 +
68 - 1 file changed, 1 insertion(+)
69 -
70 -diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp
71 -index 07ca742c..dd3d22a6 100644
72 ---- a/src/Exif/ExifOperations.cpp
73 -+++ b/src/Exif/ExifOperations.cpp
74 -@@ -35,6 +35,7 @@
75 - #include <boost/assign/list_of.hpp>
76 -
77 - #include <exif.hpp>
78 -+#include <exiv2/exiv2.hpp>
79 - #include <image.hpp>
80 -
81 - #include "Common/config.h"
82 \ No newline at end of file
83
84 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
85 deleted file mode 100644
86 index 7b52c883e40..00000000000
87 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
88 +++ /dev/null
89 @@ -1,25 +0,0 @@
90 -From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001
91 -From: Benitoite <kd6kxr@×××××.com>
92 -Date: Sun, 16 Dec 2018 22:18:37 -0800
93 -Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp
94 -
95 -AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or exiv2/version.hpp
96 -Also, version.hpp says use exiv2.hpp
97 -
98 -* 2018-12-29 asturm@g.o: Backported to 2.5.1
99 ----
100 - src/TransplantExif/TransplantExifDialog.cpp | 1 +
101 - 1 file changed, 1 insertion(+)
102 -
103 -diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp
104 -index c38a51e4..1fac2e0f 100644
105 ---- a/src/TransplantExif/TransplantExifDialog.cpp
106 -+++ b/src/TransplantExif/TransplantExifDialog.cpp
107 -@@ -26,6 +26,7 @@
108 - #include <QFileInfo>
109 - #include <image.hpp>
110 - #include <exif.hpp>
111 -+#include <exiv2/exiv2.hpp>
112 -
113 - #include "Common/global.h"
114 - #include "Common/config.h"
115
116 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
117 deleted file mode 100644
118 index c3b57861671..00000000000
119 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch
120 +++ /dev/null
121 @@ -1,17 +0,0 @@
122 -diff --git a/CMakeLists.txt b/CMakeLists.txt
123 -index 36cf008..1b75700 100644
124 ---- a/CMakeLists.txt
125 -+++ b/CMakeLists.txt
126 -@@ -132,7 +132,11 @@ INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR})
127 - FIND_PACKAGE(JPEG REQUIRED)
128 - INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR})
129 -
130 --FIND_PACKAGE(CFITSIO)
131 -+OPTION(USE_FITS "Enable FITS support." ON)
132 -+IF(USE_FITS)
133 -+ FIND_PACKAGE(CFITSIO REQUIRED)
134 -+ENDIF()
135 -+
136 - IF(CFITSIO_FOUND)
137 - INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR})
138 - SET(LIBS ${LIBS} ${CFITSIO_LIBRARIES})
139
140 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
141 deleted file mode 100644
142 index 8665785736e..00000000000
143 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch
144 +++ /dev/null
145 @@ -1,17 +0,0 @@
146 -diff --git a/CMakeLists.txt b/CMakeLists.txt
147 -index 7e8975f..2e5ea5b 100644
148 ---- a/CMakeLists.txt
149 -+++ b/CMakeLists.txt
150 -@@ -59,11 +59,7 @@ set(LIBS ${LIBS}
151 - ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
152 - ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
153 -
154 --FIND_PACKAGE(Git)
155 --IF(GIT_FOUND)
156 -- include(GetGitRevisionDescription)
157 -- get_git_head_revision(GIT_REFSPEC GIT_SHA1)
158 --ENDIF()
159 -+SET(GIT_SHA1 "-- gentoo build --")
160 -
161 - IF(WIN32)
162 - # Windows Section
163
164 diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
165 deleted file mode 100644
166 index 33c04975b7f..00000000000
167 --- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
168 +++ /dev/null
169 @@ -1,95 +0,0 @@
170 -# Copyright 1999-2019 Gentoo Authors
171 -# Distributed under the terms of the GNU General Public License v2
172 -
173 -EAPI=6
174 -
175 -inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
176 -
177 -MY_P=${P/_/.}
178 -DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
179 -HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
180 -SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
181 -
182 -LICENSE="GPL-2"
183 -SLOT="0"
184 -KEYWORDS="amd64 x86"
185 -LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
186 -IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}"
187 -
188 -RDEPEND="
189 - dev-libs/boost:0=
190 - dev-qt/qtconcurrent:5
191 - dev-qt/qtcore:5
192 - dev-qt/qtdeclarative:5
193 - dev-qt/qtgui:5
194 - dev-qt/qtnetwork:5
195 - dev-qt/qtprintsupport:5
196 - dev-qt/qtsql:5
197 - dev-qt/qtwebengine:5[widgets]
198 - >=media-gfx/exiv2-0.14:0=
199 - media-libs/lcms:2
200 - media-libs/libpng:0=
201 - >=media-libs/libraw-0.13.4:=
202 - media-libs/ilmbase:=
203 - >=media-libs/openexr-1.2.2-r2:=
204 - >=media-libs/tiff-3.8.2-r2:0
205 - sci-libs/fftw:3.0=[threads]
206 - fits? ( sci-libs/cfitsio:= )
207 - sci-libs/gsl
208 - virtual/jpeg:0
209 -"
210 -DEPEND="${RDEPEND}
211 - dev-qt/linguist-tools:5
212 - test? ( dev-cpp/gtest )
213 -"
214 -
215 -DOCS=( AUTHORS BUGS Changelog README.md TODO )
216 -
217 -PATCHES=(
218 - "${FILESDIR}"/${PN}-2.5.1-no-git.patch
219 - "${FILESDIR}"/${PN}-2.5.1-docs.patch
220 - "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
221 - "${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
222 - "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27{,.1}.patch
223 -)
224 -
225 -pkg_pretend() {
226 - if use cpu_flags_x86_sse2 ; then
227 - append-flags -msse2
228 - else
229 - eerror "This package requires a CPU supporting the SSE2 instruction set."
230 - die "SSE2 support missing"
231 - fi
232 -
233 - if use openmp ; then
234 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
235 - fi
236 -}
237 -
238 -src_configure() {
239 - local mycmakeargs=(
240 - -DUSE_OPENMP="$(usex openmp)"
241 - -DUSE_FITS="$(usex fits)"
242 - )
243 - cmake-utils_src_configure
244 -}
245 -
246 -src_install() {
247 - cmake-utils_src_install
248 -
249 - for lang in ${LANGS} ; do
250 - if ! use l10n_${lang} ; then
251 - rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
252 - fi
253 - done
254 -}
255 -
256 -pkg_postinst() {
257 - xdg_desktop_database_update
258 - xdg_mimeinfo_database_update
259 -}
260 -
261 -pkg_postrm() {
262 - xdg_desktop_database_update
263 - xdg_mimeinfo_database_update
264 -}