1 |
commit: f4a7cee26469d2116e815c907e618707054a7467 |
2 |
Author: Francesco Riosa <vivo75 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Aug 6 16:30:09 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 6 22:03:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a7cee2 |
7 |
|
8 |
media-gfx/rawtherapee-5.2: version bump + cleanup. |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/626108 |
11 |
Gentoo-Bug: https://bugs.gentoo.org/520932 |
12 |
Gentoo-Bug: https://bugs.gentoo.org/615058 |
13 |
|
14 |
Closes: https://github.com/gentoo/gentoo/pull/5326 |
15 |
|
16 |
media-gfx/rawtherapee/Manifest | 3 +- |
17 |
.../files/rawtherapee-4.2-CVE-2015-3885.patch | 28 ---------- |
18 |
.../files/rawtherapee-4.2-build-cxx11-2.patch | 14 ----- |
19 |
.../files/rawtherapee-4.2-build-cxx11.patch | 20 ------- |
20 |
.../rawtherapee/files/rawtherapee-4.2-cxx11.patch | 27 ---------- |
21 |
.../rawtherapee/files/rawtherapee-4.2-sigc26.patch | 47 ----------------- |
22 |
media-gfx/rawtherapee/metadata.xml | 2 +- |
23 |
media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild | 61 ---------------------- |
24 |
...wtherapee-5.0.ebuild => rawtherapee-5.2.ebuild} | 17 +++--- |
25 |
9 files changed, 11 insertions(+), 208 deletions(-) |
26 |
|
27 |
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest |
28 |
index 63d0437721a..67032d336ab 100644 |
29 |
--- a/media-gfx/rawtherapee/Manifest |
30 |
+++ b/media-gfx/rawtherapee/Manifest |
31 |
@@ -1,3 +1,2 @@ |
32 |
-DIST rawtherapee-4.2.tar.xz 7787664 SHA256 fa4c13e8842df096b19d2dabaed5a61f5f9d4547f7b4f0dc6b77f80bdec16479 SHA512 feec61aeb84804cf01ff03fa9d7309f0eb3c04c43818c8397cc6f3ee762aca19484bce7594414d2141248b9740bdd4269fd86f76dcf391c61d4647fa169d48f6 WHIRLPOOL 56cc3e95ae7484cb91cd6c5fd32504b3fbfb17b9d50a38fa490300ff1b096e80a1d5060db3619c34f8b214dd413bfaab57a9748f5a365a87d257e75c753f307a |
33 |
-DIST rawtherapee-5.0-gtk3.tar.xz 10442940 SHA256 25c6bb738535d1efa905bd21fb732bdea352d589d9740a730ec409a49e7eacd8 SHA512 febcde98ada1059d6553a1dc2a86235adaf5fb8ca81b9f744748d3e8ef52109048ce43996f261796b2f345f2ce4a27c4ccc219b33ccfb79c2c2fa6476f19b41a WHIRLPOOL 479a7f37f523c533cf268edc8f2c710ded867febc13df3c4156040ca4d36ad86ff4af2613e9155506eb6a4620d4323fdc3d3f1374c4332393ba57b4b01bcc948 |
34 |
DIST rawtherapee-5.1.tar.xz 10785516 SHA256 fb742065a6b2e1b89df67c70395e52ee1ebd537c86dfc473b41e7af171655b67 SHA512 6a881fe24a4109c7db39cb8bee500eb2f9357c479ddb32b3c9b7987aa5d12e4f10083533b5657a0e0f0713fe4ebc58e0dcf204eb8d5c5b656f3e7867a775ab19 WHIRLPOOL 0fc24843015750ab4747311d5ac6f40e5ebd9cedaa9c78e73c7fa7250dcbda9ea1260b7f6fc9a0c91559be4530a84e3826f991d9b9199d7caf25691ad78fd78b |
35 |
+DIST rawtherapee-5.2.tar.xz 10819936 SHA256 5c32679bfb77eca36c26288483be75696086459b7a59bd4437e371ea1bf827b6 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d WHIRLPOOL 02c71705b76df25e86b6ba5bf6439a3a2966e84dfa968b0a82c1dbe0c6297af826d2ffff6e973a56db21f5821d0a4eead6c05422bc6cb36269ed18b829bad1df |
36 |
|
37 |
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch |
38 |
deleted file mode 100644 |
39 |
index 3de7d7e6b12..00000000000 |
40 |
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch |
41 |
+++ /dev/null |
42 |
@@ -1,28 +0,0 @@ |
43 |
-Author: Philip Rinn <rinni@×××××××××.org> |
44 |
-Description: Fix CVE-2015-3885 |
45 |
-Source: https://github.com/rawstudio/rawstudio/commit/983bda1f0fa5fa86884381208274198a620f006e |
46 |
-Last-update: 2015-05-14 |
47 |
---- a/rtengine/dcraw.c |
48 |
-+++ b/rtengine/dcraw.c |
49 |
-@@ -824,7 +824,8 @@ |
50 |
- |
51 |
- int CLASS ljpeg_start (struct jhead *jh, int info_only) |
52 |
- { |
53 |
-- int c, tag, len; |
54 |
-+ int c, tag; |
55 |
-+ ushort len; |
56 |
- uchar data[0x10000]; |
57 |
- const uchar *dp; |
58 |
- |
59 |
---- a/rtengine/dcraw.cc |
60 |
-+++ b/rtengine/dcraw.cc |
61 |
-@@ -787,7 +787,8 @@ |
62 |
- |
63 |
- int CLASS ljpeg_start (struct jhead *jh, int info_only) |
64 |
- { |
65 |
-- int c, tag, len; |
66 |
-+ int c, tag; |
67 |
-+ ushort len; |
68 |
- uchar data[0x10000]; |
69 |
- const uchar *dp; |
70 |
- |
71 |
|
72 |
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch |
73 |
deleted file mode 100644 |
74 |
index 0d79e25d649..00000000000 |
75 |
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch |
76 |
+++ /dev/null |
77 |
@@ -1,14 +0,0 @@ |
78 |
-Author: Philip Rinn <rinni@×××××××××.org> |
79 |
-Description: Fix build with C++11 as char is unsigned on some architectures |
80 |
-Last-update: 2015-11-04 |
81 |
---- a/rtengine/dcraw.cc |
82 |
-+++ b/rtengine/dcraw.cc |
83 |
-@@ -2054,7 +2054,7 @@ |
84 |
- |
85 |
- void CLASS kodak_radc_load_raw() |
86 |
- { |
87 |
-- static const char src[] = { |
88 |
-+ static const signed char src[] = { |
89 |
- 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, |
90 |
- 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, |
91 |
- 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, |
92 |
|
93 |
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch |
94 |
deleted file mode 100644 |
95 |
index 4832dc3f67a..00000000000 |
96 |
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch |
97 |
+++ /dev/null |
98 |
@@ -1,20 +0,0 @@ |
99 |
-Author: Philip Rinn <rinni@×××××××××.org> |
100 |
-Description: Fix build with C++11 |
101 |
-Last-update: 2015-11-03 |
102 |
---- a/rtengine/dcraw.cc |
103 |
-+++ b/rtengine/dcraw.cc |
104 |
-@@ -136,10 +136,10 @@ |
105 |
- |
106 |
- #define SQR(x) rtengine::SQR(x) |
107 |
- #define ABS(x) (((int)(x) ^ ((int)(x) >> 31)) - ((int)(x) >> 31)) |
108 |
--#define MIN(a,b) rtengine::min(a,static_cast<typeof(a)>(b)) |
109 |
--#define MAX(a,b) rtengine::max(a,static_cast<typeof(a)>(b)) |
110 |
--#define LIM(x,min,max) rtengine::LIM(x,static_cast<typeof(x)>(min),static_cast<typeof(x)>(max)) |
111 |
--#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<typeof(x)>(y),static_cast<typeof(x)>(z)) |
112 |
-+#define MIN(a,b) rtengine::min(a,static_cast<__typeof__(a)>(b)) |
113 |
-+#define MAX(a,b) rtengine::max(a,static_cast<__typeof__(a)>(b)) |
114 |
-+#define LIM(x,min,max) rtengine::LIM(x,static_cast<__typeof__(x)>(min),static_cast<__typeof__(x)>(max)) |
115 |
-+#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<__typeof__(x)>(y),static_cast<typeof__(x)>(z)) |
116 |
- #define CLIP(x) rtengine::CLIP(x) |
117 |
- #define SWAP(a,b) { a=a+b; b=a-b; a=a-b; } |
118 |
- |
119 |
|
120 |
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch |
121 |
deleted file mode 100644 |
122 |
index 48acb5fc6ff..00000000000 |
123 |
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch |
124 |
+++ /dev/null |
125 |
@@ -1,27 +0,0 @@ |
126 |
-From 39ef59ddeb7679c71274b1da3faadd395b650c73 Mon Sep 17 00:00:00 2001 |
127 |
-From: Adam Reichold <adam.reichold@××××××××.de> |
128 |
-Date: Sun, 29 Nov 2015 11:48:30 +0100 |
129 |
-Subject: [PATCH] Build with '-std=c++11' if libsigc++ version 2.5.1 is used as |
130 |
- it does require it. |
131 |
- |
132 |
---- |
133 |
- CMakeLists.txt | 4 ++-- |
134 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
135 |
- |
136 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
137 |
-index dd5fcbc..6153484 100644 |
138 |
---- a/CMakeLists.txt |
139 |
-+++ b/CMakeLists.txt |
140 |
-@@ -278,10 +278,10 @@ if (OPTION_OMP) |
141 |
- endif (OPENMP_FOUND) |
142 |
- endif (OPTION_OMP) |
143 |
- |
144 |
--if(USE_EXPERIMENTAL_LANG_VERSIONS) |
145 |
-+if(USE_EXPERIMENTAL_LANG_VERSIONS OR NOT (SIGC_VERSION VERSION_LESS 2.5.1)) |
146 |
- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu1x") |
147 |
- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") |
148 |
--endif (USE_EXPERIMENTAL_LANG_VERSIONS) |
149 |
-+endif () |
150 |
- |
151 |
- # find out whether we are building out of source |
152 |
- get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE) |
153 |
|
154 |
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch |
155 |
deleted file mode 100644 |
156 |
index 356cee90e39..00000000000 |
157 |
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch |
158 |
+++ /dev/null |
159 |
@@ -1,47 +0,0 @@ |
160 |
-Author: Philip Rinn <rinni@×××××××××.org> |
161 |
-Description: Fix build with sigc++ >= 2.5.2 |
162 |
-Last-update: 2015-11-03 |
163 |
---- a/rtgui/adjuster.cc |
164 |
-+++ b/rtgui/adjuster.cc |
165 |
-@@ -17,7 +17,7 @@ |
166 |
- * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. |
167 |
- */ |
168 |
- #include "adjuster.h" |
169 |
--#include <sigc++/class_slot.h> |
170 |
-+#include <sigc++/slot.h> |
171 |
- #include <cmath> |
172 |
- #include "multilangmgr.h" |
173 |
- #include "../rtengine/rtengine.h" |
174 |
---- a/rtgui/thresholdadjuster.cc |
175 |
-+++ b/rtgui/thresholdadjuster.cc |
176 |
-@@ -17,7 +17,7 @@ |
177 |
- * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. |
178 |
- */ |
179 |
- #include "thresholdadjuster.h" |
180 |
--#include <sigc++/class_slot.h> |
181 |
-+#include <sigc++/slot.h> |
182 |
- #include <cmath> |
183 |
- #include "multilangmgr.h" |
184 |
- #include "../rtengine/rtengine.h" |
185 |
---- a/rtgui/preferences.cc |
186 |
-+++ b/rtgui/preferences.cc |
187 |
-@@ -16,7 +16,7 @@ |
188 |
- * You should have received a copy of the GNU General Public License |
189 |
- * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. |
190 |
- */ |
191 |
--#include <sigc++/class_slot.h> |
192 |
-+#include <sigc++/slot.h> |
193 |
- #include "preferences.h" |
194 |
- #include "multilangmgr.h" |
195 |
- #include "splash.h" |
196 |
---- a/rtgui/tonecurve.cc |
197 |
-+++ b/rtgui/tonecurve.cc |
198 |
-@@ -18,7 +18,7 @@ |
199 |
- */ |
200 |
- #include "tonecurve.h" |
201 |
- #include "adjuster.h" |
202 |
--#include <sigc++/class_slot.h> |
203 |
-+#include <sigc++/slot.h> |
204 |
- #include <iomanip> |
205 |
- #include "ppversion.h" |
206 |
- #include "edit.h" |
207 |
|
208 |
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml |
209 |
index c6263623297..370756f32bc 100644 |
210 |
--- a/media-gfx/rawtherapee/metadata.xml |
211 |
+++ b/media-gfx/rawtherapee/metadata.xml |
212 |
@@ -2,7 +2,7 @@ |
213 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
214 |
<pkgmetadata> |
215 |
<maintainer type="person"> |
216 |
- <email>vivo75+gentoo_bugzilla@×××××.com</email> |
217 |
+ <email>vivo75@×××××.com</email> |
218 |
<name>Francesco Riosa</name> |
219 |
</maintainer> |
220 |
<maintainer type="project"> |
221 |
|
222 |
diff --git a/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild |
223 |
deleted file mode 100644 |
224 |
index 71ee7204dde..00000000000 |
225 |
--- a/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild |
226 |
+++ /dev/null |
227 |
@@ -1,61 +0,0 @@ |
228 |
-# Copyright 1999-2017 Gentoo Foundation |
229 |
-# Distributed under the terms of the GNU General Public License v2 |
230 |
- |
231 |
-EAPI=5 |
232 |
- |
233 |
-inherit cmake-utils toolchain-funcs |
234 |
- |
235 |
-DESCRIPTION="A powerful cross-platform raw image processing program" |
236 |
-HOMEPAGE="http://www.rawtherapee.com/" |
237 |
-SRC_URI="http://rawtherapee.com/shared/source/${P}.tar.xz" |
238 |
- |
239 |
-LICENSE="GPL-3" |
240 |
-SLOT="0" |
241 |
-KEYWORDS="~amd64 ~x86" |
242 |
-IUSE="bzip2 openmp" |
243 |
- |
244 |
-RDEPEND="bzip2? ( app-arch/bzip2 ) |
245 |
- >=x11-libs/gtk+-2.24.18:2 |
246 |
- >=dev-cpp/gtkmm-2.12:2.4 |
247 |
- >=dev-cpp/glibmm-2.16:2 |
248 |
- dev-libs/expat |
249 |
- dev-libs/libsigc++:2 |
250 |
- media-libs/libcanberra[gtk] |
251 |
- media-libs/tiff:0 |
252 |
- media-libs/libpng:0 |
253 |
- media-libs/libiptcdata |
254 |
- media-libs/lcms:2 |
255 |
- sci-libs/fftw:3.0 |
256 |
- sys-libs/zlib |
257 |
- virtual/jpeg:0" |
258 |
-DEPEND="${RDEPEND} |
259 |
- app-arch/xz-utils |
260 |
- virtual/pkgconfig" |
261 |
- |
262 |
-PATCHES=( |
263 |
- # Upstream patches for fixing build with current libstdc++ |
264 |
- # A newer snapshot/version will make this unneeded |
265 |
- "${FILESDIR}"/${P}-cxx11.patch |
266 |
- "${FILESDIR}"/${P}-CVE-2015-3885.patch |
267 |
- "${FILESDIR}"/${P}-build-cxx11.patch |
268 |
- "${FILESDIR}"/${P}-build-cxx11-2.patch |
269 |
- "${FILESDIR}"/${P}-sigc26.patch |
270 |
-) |
271 |
- |
272 |
-pkg_pretend() { |
273 |
- if use openmp ; then |
274 |
- tc-has-openmp || die "Please switch to an openmp compatible compiler" |
275 |
- fi |
276 |
-} |
277 |
- |
278 |
-src_configure() { |
279 |
- local mycmakeargs=( |
280 |
- $(cmake-utils_use openmp OPTION_OMP) |
281 |
- $(cmake-utils_use_with bzip2 BZIP) |
282 |
- -DDOCDIR=/usr/share/doc/${PF} |
283 |
- -DCREDITSDIR=/usr/share/${PN} |
284 |
- -DLICENCEDIR=/usr/share/${PN} |
285 |
- -DCACHE_NAME_SUFFIX="" |
286 |
- ) |
287 |
- cmake-utils_src_configure |
288 |
-} |
289 |
|
290 |
diff --git a/media-gfx/rawtherapee/rawtherapee-5.0.ebuild b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild |
291 |
similarity index 83% |
292 |
rename from media-gfx/rawtherapee/rawtherapee-5.0.ebuild |
293 |
rename to media-gfx/rawtherapee/rawtherapee-5.2.ebuild |
294 |
index 141d13abcc1..38848a678a8 100644 |
295 |
--- a/media-gfx/rawtherapee/rawtherapee-5.0.ebuild |
296 |
+++ b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild |
297 |
@@ -8,16 +8,16 @@ inherit cmake-utils toolchain-funcs flag-o-matic |
298 |
DESCRIPTION="A powerful cross-platform raw image processing program" |
299 |
HOMEPAGE="http://www.rawtherapee.com/" |
300 |
|
301 |
-MY_P=${P/_p1/-r1} |
302 |
-SRC_URI="http://rawtherapee.com/shared/source/${MY_P}-gtk3.tar.xz" |
303 |
+MY_P=${P/_rc/-rc} |
304 |
+SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz" |
305 |
|
306 |
LICENSE="GPL-3" |
307 |
SLOT="0" |
308 |
KEYWORDS="~amd64 ~x86" |
309 |
-IUSE="bzip2 openmp" |
310 |
|
311 |
-RDEPEND="bzip2? ( app-arch/bzip2 ) |
312 |
- x11-libs/gtk+:3 |
313 |
+IUSE="openmp" |
314 |
+ |
315 |
+RDEPEND="x11-libs/gtk+:3 |
316 |
dev-libs/expat |
317 |
dev-libs/libsigc++:2 |
318 |
media-libs/libcanberra[gtk3] |
319 |
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND} |
320 |
virtual/pkgconfig |
321 |
dev-cpp/gtkmm:3.0" |
322 |
|
323 |
-S="${WORKDIR}/${MY_P}-gtk3" |
324 |
+S="${WORKDIR}/${MY_P}" |
325 |
|
326 |
pkg_pretend() { |
327 |
if use openmp ; then |
328 |
@@ -51,14 +51,15 @@ pkg_pretend() { |
329 |
|
330 |
src_configure() { |
331 |
filter-flags -ffast-math |
332 |
+ # In case we add an ebuild for klt we can (i)use that one, |
333 |
+ # see http://cecas.clemson.edu/~stb/klt/ |
334 |
local mycmakeargs=( |
335 |
-DOPTION_OMP=$(usex openmp) |
336 |
- -DBZIP=$(usex bzip2) |
337 |
-DDOCDIR=/usr/share/doc/${PF} |
338 |
-DCREDITSDIR=/usr/share/${PN} |
339 |
-DLICENCEDIR=/usr/share/${PN} |
340 |
-DCACHE_NAME_SUFFIX="" |
341 |
- -DCMAKE_CXX_FLAGS="-std=c++11" |
342 |
+ -DWITH_SYSTEM_KLT="off" |
343 |
) |
344 |
cmake-utils_src_configure |
345 |
} |