1 |
commit: eb1b6a890b2878e23d0f88e4aa9a0e85cee0b19a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 3 12:59:18 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 6 08:06:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1b6a89 |
7 |
|
8 |
media-gfx/enblend: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
media-gfx/enblend/Manifest | 1 - |
13 |
media-gfx/enblend/enblend-4.1.3-r1.ebuild | 78 --- |
14 |
media-gfx/enblend/enblend-4.1.3-r2.ebuild | 86 --- |
15 |
media-gfx/enblend/files/enblend-4.1.3-cmake.patch | 22 - |
16 |
.../files/enblend-4.1.3-texinfo-5-more.patch | 82 --- |
17 |
.../files/enblend-4.1.3-texinfo-5-upstream.patch | 633 --------------------- |
18 |
.../enblend/files/enblend-4.1.3-vigra_check.patch | 11 - |
19 |
media-gfx/enblend/metadata.xml | 4 - |
20 |
8 files changed, 917 deletions(-) |
21 |
|
22 |
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest |
23 |
index 1404379d87c..566364e01dc 100644 |
24 |
--- a/media-gfx/enblend/Manifest |
25 |
+++ b/media-gfx/enblend/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3 |
28 |
-DIST enblend-enfuse-4.1.3.tar.gz 862079 BLAKE2B 1ea6d909bbc32d6141090862f658cc29ee0156e898e133fa88a10d1ea1df1e3eb0b6481010a0b3c0795bce0345ff3a77d1916310bc7b39fb292478c622d4493a SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 |
29 |
|
30 |
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 6f9f1fa5833..00000000000 |
33 |
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,78 +0,0 @@ |
36 |
-# Copyright 1999-2016 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=5 |
40 |
- |
41 |
-inherit eutils cmake-utils |
42 |
- |
43 |
-MY_P="${PN}-enfuse-${PV/_rc/rc}" |
44 |
- |
45 |
-DESCRIPTION="Image Blending with Multiresolution Splines" |
46 |
-HOMEPAGE="http://enblend.sourceforge.net/" |
47 |
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz" |
48 |
- |
49 |
-LICENSE="GPL-2 VIGRA" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="amd64 x86" |
52 |
-IUSE="debug doc gpu image-cache openmp" |
53 |
- |
54 |
-REQUIRED_USE="openmp? ( !image-cache )" |
55 |
- |
56 |
-RDEPEND=" |
57 |
- >=dev-libs/boost-1.31.0:= |
58 |
- media-libs/glew |
59 |
- >=media-libs/lcms-2.5:2 |
60 |
- >=media-libs/libpng-1.2.43:0= |
61 |
- >=media-libs/openexr-1.0:= |
62 |
- media-libs/plotutils[X] |
63 |
- media-libs/tiff:= |
64 |
- >=media-libs/vigra-1.8.0[openexr] |
65 |
- sci-libs/gsl:= |
66 |
- virtual/jpeg:0= |
67 |
- debug? ( dev-libs/dmalloc ) |
68 |
- gpu? ( media-libs/freeglut )" |
69 |
-DEPEND="${RDEPEND} |
70 |
- media-gfx/imagemagick |
71 |
- sys-apps/help2man |
72 |
- virtual/pkgconfig |
73 |
- doc? ( |
74 |
- media-gfx/transfig |
75 |
- sci-visualization/gnuplot[gd] |
76 |
- virtual/latex-base |
77 |
- )" |
78 |
- |
79 |
-S="${WORKDIR}/${MY_P}" |
80 |
- |
81 |
-PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" ) |
82 |
- |
83 |
-src_prepare() { |
84 |
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die |
85 |
- sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die |
86 |
- cmake-utils_src_prepare |
87 |
- |
88 |
- epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch |
89 |
- epatch "${FILESDIR}"/${P}-texinfo-5-more.patch |
90 |
-} |
91 |
- |
92 |
-src_configure() { |
93 |
- local mycmakeargs=( |
94 |
- -DCMAKE_CXX_FLAGS_RELEASE="" |
95 |
- $(cmake-utils_use_enable debug DMALLOC) |
96 |
- $(cmake-utils_use doc DOC) |
97 |
- $(cmake-utils_use_enable image-cache IMAGECACHE) |
98 |
- $(cmake-utils_use_enable openmp) |
99 |
- $(cmake-utils_use_enable gpu) |
100 |
- ) |
101 |
- CMAKE_BUILD_TYPE="Release" |
102 |
- cmake-utils_src_configure |
103 |
-} |
104 |
- |
105 |
-src_compile() { |
106 |
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM. |
107 |
- cmake-utils_src_compile -j1 |
108 |
-} |
109 |
- |
110 |
-src_install() { |
111 |
- local DOCS=( AUTHORS ChangeLog NEWS README ) |
112 |
- cmake-utils_src_install |
113 |
-} |
114 |
|
115 |
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild |
116 |
deleted file mode 100644 |
117 |
index 296bc122df5..00000000000 |
118 |
--- a/media-gfx/enblend/enblend-4.1.3-r2.ebuild |
119 |
+++ /dev/null |
120 |
@@ -1,86 +0,0 @@ |
121 |
-# Copyright 1999-2017 Gentoo Foundation |
122 |
-# Distributed under the terms of the GNU General Public License v2 |
123 |
- |
124 |
-EAPI=6 |
125 |
- |
126 |
-inherit cmake-utils |
127 |
- |
128 |
-MY_P="${PN}-enfuse-${PV}" |
129 |
- |
130 |
-DESCRIPTION="Image Blending with Multiresolution Splines" |
131 |
-HOMEPAGE="http://enblend.sourceforge.net/" |
132 |
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz" |
133 |
- |
134 |
-LICENSE="GPL-2 VIGRA" |
135 |
-SLOT="0" |
136 |
-KEYWORDS="~amd64 ~x86" |
137 |
-IUSE="debug doc gpu openmp" |
138 |
- |
139 |
-RDEPEND=" |
140 |
- dev-libs/boost:= |
141 |
- media-libs/lcms:2 |
142 |
- media-libs/openexr:= |
143 |
- media-libs/tiff:= |
144 |
- media-libs/vigra[openexr] |
145 |
- sci-libs/gsl:= |
146 |
- debug? ( dev-libs/dmalloc ) |
147 |
- gpu? ( |
148 |
- media-libs/freeglut |
149 |
- media-libs/glew:* |
150 |
- virtual/glu |
151 |
- virtual/opengl |
152 |
- )" |
153 |
-DEPEND="${RDEPEND} |
154 |
- media-libs/libpng:0 |
155 |
- sys-apps/help2man |
156 |
- virtual/jpeg:0 |
157 |
- virtual/pkgconfig |
158 |
- doc? ( |
159 |
- media-gfx/transfig |
160 |
- sci-visualization/gnuplot[gd] |
161 |
- virtual/imagemagick-tools |
162 |
- virtual/latex-base |
163 |
- )" |
164 |
- |
165 |
-S="${WORKDIR}/${MY_P}" |
166 |
- |
167 |
-DOCS=( AUTHORS NEWS README ) |
168 |
- |
169 |
-PATCHES=( |
170 |
- "${FILESDIR}"/${P}-vigra_check.patch |
171 |
- "${FILESDIR}"/${P}-texinfo-5-upstream.patch |
172 |
- "${FILESDIR}"/${P}-texinfo-5-more.patch |
173 |
- "${FILESDIR}"/${P}-cmake.patch |
174 |
-) |
175 |
- |
176 |
-src_prepare() { |
177 |
- cmake-utils_src_prepare |
178 |
- |
179 |
- # CRLF in files, don't bother with patch |
180 |
- sed -i -e "/FIND_LIBRARY(LCMS2_LIBRARIES/s/lib32/lib/" \ |
181 |
- CMakeModules/FindLCMS2.cmake || die |
182 |
- sed -e "/FIND_LIBRARY(OPENGL_gl_LIBRARY/s/lib32/lib/" \ |
183 |
- -e "/NAMES.*MesaGLU/s/lib32/lib/" \ |
184 |
- -i CMakeModules/FindOpenGL.cmake || die |
185 |
- |
186 |
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die |
187 |
- sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die |
188 |
-} |
189 |
- |
190 |
-src_configure() { |
191 |
- local mycmakeargs=( |
192 |
- -DCMAKE_CXX_FLAGS_RELEASE="" |
193 |
- -DENABLE_DMALLOC=$(usex debug) |
194 |
- -DDOC=$(usex doc) |
195 |
- -DENABLE_GPU=$(usex gpu) |
196 |
- -DENABLE_IMAGECACHE=$(usex !openmp) |
197 |
- -DENABLE_OPENMP=$(usex openmp) |
198 |
- ) |
199 |
- CMAKE_BUILD_TYPE="Release" |
200 |
- cmake-utils_src_configure |
201 |
-} |
202 |
- |
203 |
-src_compile() { |
204 |
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM. |
205 |
- cmake-utils_src_compile -j1 |
206 |
-} |
207 |
|
208 |
diff --git a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch |
209 |
deleted file mode 100644 |
210 |
index e9fef85278d..00000000000 |
211 |
--- a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch |
212 |
+++ /dev/null |
213 |
@@ -1,22 +0,0 @@ |
214 |
---- a/CMakeLists.txt 2017-02-12 13:43:46.862787952 +0100 |
215 |
-+++ b/CMakeLists.txt 2017-02-12 13:50:03.461229021 +0100 |
216 |
-@@ -185,7 +185,6 @@ |
217 |
- FIND_PACKAGE(TIFF REQUIRED) |
218 |
- FIND_PACKAGE(Perl REQUIRED) |
219 |
- # this one is needed in doc. (Especially the program "convert") |
220 |
--FIND_PACKAGE(ImageMagick REQUIRED) |
221 |
- FIND_PACKAGE(GSL REQUIRED) |
222 |
- include_directories(${GSL_INCLUDE_DIR}) |
223 |
- LIST(APPEND common_libs ${LCMS2_LIBRARIES} ${TIFF_LIBRARIES} ${GSL_LIBRARIES}) |
224 |
-@@ -394,8 +393,9 @@ |
225 |
- add_subdirectory(src) |
226 |
- |
227 |
- # you really should have perl installed, when creating doc's |
228 |
--if (PERL_FOUND AND IMAGEMAGICK_FOUND AND DOC) |
229 |
-- # this should be set from comman line |
230 |
-+if (PERL_FOUND AND DOC) |
231 |
-+ FIND_PACKAGE(ImageMagick REQUIRED) |
232 |
-+ # this should be set from command line |
233 |
- # Possible values like described in README: @smallbook @afivepaper @afourpaper @afourwide @afourlatex |
234 |
- # @letter is default |
235 |
- set(EXTRATEXI2DVIFLAGS "@afourpaper" CACHE STRING "Papersize: @letter @smallbook @afivepaper @afourpaper @afourwide @afourlatex") |
236 |
|
237 |
diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch |
238 |
deleted file mode 100644 |
239 |
index dd63ae3697a..00000000000 |
240 |
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch |
241 |
+++ /dev/null |
242 |
@@ -1,82 +0,0 @@ |
243 |
-From 7ec0e758430f9e31fb9fc0f85d72339a307263d6 Mon Sep 17 00:00:00 2001 |
244 |
-From: Sebastian Pipping <sebastian@×××××××.org> |
245 |
-Date: Fri, 14 Aug 2015 03:09:57 +0200 |
246 |
-Subject: [PATCH] Texinfo: Fix parameter handling with macro "mainpurpose" |
247 |
- |
248 |
---- |
249 |
- doc/auxmac.texi | 6 +++--- |
250 |
- doc/enfuse.texi | 10 +++++----- |
251 |
- 2 files changed, 8 insertions(+), 8 deletions(-) |
252 |
- |
253 |
-diff --git a/doc/auxmac.texi b/doc/auxmac.texi |
254 |
-index 59520c3..ad35d6a 100644 |
255 |
---- a/doc/auxmac.texi |
256 |
-+++ b/doc/auxmac.texi |
257 |
-@@ -88,12 +88,12 @@ not displayed, because of lacking <acronym>SVG</acronym> and |
258 |
- |
259 |
- @c Text Fragments |
260 |
- |
261 |
--@macro mainpurpose |
262 |
-+@macro mainpurpose{purpose} |
263 |
- @ifinfo |
264 |
--@strong{Main Purpose}: |
265 |
-+@strong{Main Purpose}: \purpose\ |
266 |
- @end ifinfo |
267 |
- @ifnotinfo |
268 |
--@strong{Main Purpose: } |
269 |
-+@strong{Main Purpose: }\purpose\ |
270 |
- @end ifnotinfo |
271 |
- @end macro |
272 |
- |
273 |
-diff --git a/doc/enfuse.texi b/doc/enfuse.texi |
274 |
-index 92fe597..9e601ea 100644 |
275 |
---- a/doc/enfuse.texi |
276 |
-+++ b/doc/enfuse.texi |
277 |
-@@ -5164,7 +5164,7 @@ Fire in rapid succession. |
278 |
- @cindex series, simple |
279 |
- @cindex noise reduction |
280 |
- |
281 |
--@mainpurpose Reduce noise |
282 |
-+@mainpurpose{Reduce noise} |
283 |
- |
284 |
- @noindent |
285 |
- With the default settings, Enfuse computes a weighted average of the |
286 |
-@@ -5193,7 +5193,7 @@ be worth an extra run. |
287 |
- @cindex series, exposure |
288 |
- @cindex dynamic range increase |
289 |
- |
290 |
--@mainpurpose Increase manageable dynamic range |
291 |
-+@mainpurpose{Increase manageable dynamic range} |
292 |
- |
293 |
- @noindent |
294 |
- An exposure series is a set of images taken with identical parameters |
295 |
-@@ -5322,7 +5322,7 @@ the multiply occuring exposures and reducing noise. |
296 |
- @cindex series, flash exposure |
297 |
- @cindex dynamic range increase |
298 |
- |
299 |
--@mainpurpose ??? |
300 |
-+@mainpurpose{???} |
301 |
- |
302 |
- ... |
303 |
- |
304 |
-@@ -5333,7 +5333,7 @@ the multiply occuring exposures and reducing noise. |
305 |
- @cindex series, polarization |
306 |
- @cindex saturation enhancement |
307 |
- |
308 |
--@mainpurpose Reflection suppression, saturation enhancement |
309 |
-+@mainpurpose{Reflection suppression, saturation enhancement} |
310 |
- |
311 |
- In the current implementation of Enfuse, it is not possible in general |
312 |
- to fuse a polarization series. Naively abusing |
313 |
-@@ -5345,7 +5345,7 @@ to fuse a polarization series. Naively abusing |
314 |
- @cindex focus stacks |
315 |
- @cindex depth-of-focus increase |
316 |
- |
317 |
--@mainpurpose Synthetic Depth-of-Field Increase |
318 |
-+@mainpurpose{Synthetic Depth-of-Field Increase} |
319 |
- |
320 |
- A @dfn{focus stack} is a series of images where the distance of the |
321 |
- focal plane from the sensor varies. Sloppily speaking, the images |
322 |
--- |
323 |
-2.5.0 |
324 |
- |
325 |
|
326 |
diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch |
327 |
deleted file mode 100644 |
328 |
index ef04aa73633..00000000000 |
329 |
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch |
330 |
+++ /dev/null |
331 |
@@ -1,633 +0,0 @@ |
332 |
-# HG changeset patch |
333 |
-# User Chris <cspiel@×××××××××××××××××.net> |
334 |
-# Date 1438958604 -7200 |
335 |
-# Node ID 8387f0170f7b352baea887f77960e8066185a6cd |
336 |
-# Parent c1bcd2df4e3724f3bb0414d3a5e2e9302be78921 |
337 |
-Get the Texinfo documentation to translate again with makeinfo-5.2. |
338 |
- |
339 |
-This patch takes thus care of issue #1181678 |
340 |
- https://bugs.launchpad.net/enblend/+bug/1181678 |
341 |
- |
342 |
-We do not strive for a nicely formatted documentation anymore in the |
343 |
-Stable Branch, because the Development Branch already has a flawless |
344 |
-new documentation *not* based on Texinfo. |
345 |
- |
346 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/Makefile.am |
347 |
---- a/doc/Makefile.am Fri Aug 07 16:43:18 2015 +0200 |
348 |
-+++ b/doc/Makefile.am Fri Aug 07 16:43:24 2015 +0200 |
349 |
-@@ -46,7 +46,7 @@ |
350 |
- -I $(top_builddir) -I $(srcdir) \ |
351 |
- --css-include=@srcdir@/default.css \ |
352 |
- $(MAKEINFOHTMLFLAGS) |
353 |
--export TEXINPUTS=$(top_builddir):$(srcdir) |
354 |
-+export TEXINPUTS = .:$(top_builddir):$(srcdir): |
355 |
- |
356 |
- TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS) |
357 |
- |
358 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.tex |
359 |
---- a/doc/auxmac.tex Fri Aug 07 16:43:18 2015 +0200 |
360 |
-+++ b/doc/auxmac.tex Fri Aug 07 16:43:24 2015 +0200 |
361 |
-@@ -1,13 +1,6 @@ |
362 |
--\input thumbpdf.sty |
363 |
-- |
364 |
-- |
365 |
- % Auxilliary Macros. |
366 |
- % |
367 |
- % Include this file before texinfo.tex! |
368 |
- |
369 |
- \def\mathit#1{\hbox{\it #1}} |
370 |
- \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi} |
371 |
-- |
372 |
--% These definitions are required for older versions of texinfo.tex. |
373 |
--\def\geq{\ifmmode \ge\else $\ge$\fi} |
374 |
--\def\leq{\ifmmode \le\else $\le$\fi} |
375 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.texi |
376 |
---- a/doc/auxmac.texi Fri Aug 07 16:43:18 2015 +0200 |
377 |
-+++ b/doc/auxmac.texi Fri Aug 07 16:43:24 2015 +0200 |
378 |
-@@ -2,16 +2,6 @@ |
379 |
- @c Macro Definitions |
380 |
- @c |
381 |
- |
382 |
--@c redefined commands |
383 |
-- |
384 |
--@c Get the spacing of dimensions right. |
385 |
--@ifnottex |
386 |
--@macro dmn{unit} |
387 |
--@tie{}\unit\ |
388 |
--@end macro |
389 |
--@end ifnottex |
390 |
-- |
391 |
-- |
392 |
- @c extended commands |
393 |
- |
394 |
- @c Add a title to a DocBook element. |
395 |
-@@ -80,73 +70,6 @@ |
396 |
- |
397 |
- @c Operators |
398 |
- |
399 |
--@c Generate a nice representation of base^exponent. |
400 |
--@macro power{base, exponent} |
401 |
--@ifinfo |
402 |
--\base\^\exponent\ |
403 |
--@end ifinfo |
404 |
--@html |
405 |
--\base\<sup>\exponent\</sup> |
406 |
--@end html |
407 |
--@tex |
408 |
--$\base\^{\exponent\}$% |
409 |
--@end tex |
410 |
--@docbook |
411 |
--\base\<superscript>\exponent\</superscript> |
412 |
--@end docbook |
413 |
--@end macro |
414 |
-- |
415 |
-- |
416 |
--@macro classictimes |
417 |
--@ifinfo |
418 |
--x@c gobble following newline -- The Tricks of a Texinfo Wizard. |
419 |
--@end ifinfo |
420 |
--@html |
421 |
--× |
422 |
--@end html |
423 |
--@tex |
424 |
--\\ifmmode\\times\\else$\\times$\\fi% gobble following newline -- The Tricks of a TeX Wizard. |
425 |
--@end tex |
426 |
--@docbook |
427 |
--× |
428 |
--@end docbook |
429 |
--@end macro |
430 |
-- |
431 |
-- |
432 |
--@c Required for older versions of makeinfo. The definition of @geq |
433 |
--@c for TeX lives in auxmac.tex. |
434 |
--@ifnottex |
435 |
--@macro geq |
436 |
--@ifinfo |
437 |
-->=@c |
438 |
--@end ifinfo |
439 |
--@html |
440 |
--≥ |
441 |
--@end html |
442 |
--@docbook |
443 |
--≥ |
444 |
--@end docbook |
445 |
--@end macro |
446 |
--@end ifnottex |
447 |
-- |
448 |
-- |
449 |
--@c Required for older versions of makeinfo. The definition of @leq |
450 |
--@c for TeX lives in auxmac.tex. |
451 |
--@ifnottex |
452 |
--@macro leq |
453 |
--@ifinfo |
454 |
--<=@c |
455 |
--@end ifinfo |
456 |
--@html |
457 |
--≤ |
458 |
--@end html |
459 |
--@docbook |
460 |
--≤ |
461 |
--@end docbook |
462 |
--@end macro |
463 |
--@end ifnottex |
464 |
-- |
465 |
-- |
466 |
- @macro plusminus |
467 |
- @ifinfo |
468 |
- +/-@c |
469 |
-@@ -163,62 +86,6 @@ |
470 |
- @end macro |
471 |
- |
472 |
- |
473 |
--@c Special Characters |
474 |
-- |
475 |
--@macro inlineomega |
476 |
--@ifinfo |
477 |
--@math{omega}@c |
478 |
--@end ifinfo |
479 |
--@html |
480 |
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> |
481 |
-- <mi>ω</mi> |
482 |
--</mathinline> |
483 |
--@end html |
484 |
--@tex |
485 |
--$\\omega$% |
486 |
--@end tex |
487 |
--@docbook |
488 |
--ω |
489 |
--@end docbook |
490 |
--@end macro |
491 |
-- |
492 |
-- |
493 |
--@macro inlinesigma |
494 |
--@ifinfo |
495 |
--@math{sigma}@c |
496 |
--@end ifinfo |
497 |
--@html |
498 |
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> |
499 |
-- <mi>σ</mi> |
500 |
--</mathinline> |
501 |
--@end html |
502 |
--@tex |
503 |
--$\\sigma$% |
504 |
--@end tex |
505 |
--@docbook |
506 |
--σ |
507 |
--@end docbook |
508 |
--@end macro |
509 |
-- |
510 |
-- |
511 |
--@macro inlinexi |
512 |
--@ifinfo |
513 |
--@math{xi}@c |
514 |
--@end ifinfo |
515 |
--@html |
516 |
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> |
517 |
-- <mi>ξ</mi> |
518 |
--</mathinline> |
519 |
--@end html |
520 |
--@tex |
521 |
--$\\xi$% |
522 |
--@end tex |
523 |
--@docbook |
524 |
--ξ |
525 |
--@end docbook |
526 |
--@end macro |
527 |
-- |
528 |
-- |
529 |
- @c Text Fragments |
530 |
- |
531 |
- @macro mainpurpose |
532 |
-@@ -236,26 +103,3 @@ |
533 |
- @noindent |
534 |
- @strong{Summary of influential options} |
535 |
- @end macro |
536 |
-- |
537 |
-- |
538 |
--@macro semilog{significant, exponent} |
539 |
--@ifinfo |
540 |
--\significant\*10^\exponent\@c |
541 |
--@end ifinfo |
542 |
--@html |
543 |
--<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> |
544 |
-- <mn>\significant\</mn> |
545 |
-- <mo>×</mo> |
546 |
-- <msup> |
547 |
-- <mn>10</mn> |
548 |
-- <mn>\exponent\</mn> |
549 |
-- </msup> |
550 |
--</math> |
551 |
--@end html |
552 |
--@tex |
553 |
--\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi% |
554 |
--@end tex |
555 |
--@docbook |
556 |
--\significant\×10<superscript>\exponent\</superscript> |
557 |
--@end docbook |
558 |
--@end macro |
559 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/bug-reports.texi |
560 |
---- a/doc/bug-reports.texi Fri Aug 07 16:43:18 2015 +0200 |
561 |
-+++ b/doc/bug-reports.texi Fri Aug 07 16:43:24 2015 +0200 |
562 |
-@@ -77,7 +77,7 @@ |
563 |
- @item |
564 |
- A complete set of input images that will reproduce the bug. Strive |
565 |
- for a minimal set of @emph{small}@footnote{Images of a size less than |
566 |
--1500@classictimes{}1000 pixels qualify as small.} images. |
567 |
-+1500x1000 pixels qualify as small.} images. |
568 |
- |
569 |
- @item |
570 |
- The type of machine you are using, and the operating system name and |
571 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.info |
572 |
-Binary file doc/enblend.info has changed |
573 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.texi |
574 |
---- a/doc/enblend.texi Fri Aug 07 16:43:18 2015 +0200 |
575 |
-+++ b/doc/enblend.texi Fri Aug 07 16:43:24 2015 +0200 |
576 |
-@@ -508,9 +508,9 @@ |
577 |
- twice as large as the previous one. So, the zeroth layer, the |
578 |
- original image, obviously defines the image at single-pixel scale, the |
579 |
- first level works at two-pixel scale, and generally, the @math{n}-th |
580 |
--level contains image data at @power{2, n}-pixel scale. This is the |
581 |
-+level contains image data at 2^n-pixel scale. This is the |
582 |
- reason why an image of |
583 |
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be |
584 |
-+@math{width}x@/@math{height}@dmn{pixels} cannot be |
585 |
- deconstructed into a pyramid of more than |
586 |
- @ifinfo |
587 |
- @display |
588 |
-@@ -1194,11 +1194,11 @@ |
589 |
- |
590 |
- @itemize |
591 |
- @item |
592 |
--Minimum normalized value: @semilog{1.2, -38} |
593 |
-+Minimum normalized value: 1.2e-38 |
594 |
- @item |
595 |
--Epsilon: @semilog{1.2, -7} |
596 |
-+Epsilon: 1.2e-7 |
597 |
- @item |
598 |
--Maximum finite value: @semilog{3.4, 38} |
599 |
-+Maximum finite value: 3.4e38 |
600 |
- @end itemize |
601 |
- |
602 |
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 |
603 |
-@@ -1210,11 +1210,11 @@ |
604 |
- |
605 |
- @itemize |
606 |
- @item |
607 |
--Minimum normalized value: @semilog{2.2, -308} |
608 |
-+Minimum normalized value: 2.2e-308 |
609 |
- @item |
610 |
--Epsilon: @semilog{2.2, -16} |
611 |
-+Epsilon: 2.2e-16 |
612 |
- @item |
613 |
--Maximum finite value: @semilog{1.8, 308} |
614 |
-+Maximum finite value: 1.8e308 |
615 |
- @end itemize |
616 |
- @end table |
617 |
- |
618 |
-@@ -1236,11 +1236,11 @@ |
619 |
- |
620 |
- @itemize |
621 |
- @item |
622 |
--Minimum normalized value: @semilog{9.3, -10} |
623 |
-+Minimum normalized value: 9.3e-10 |
624 |
- @item |
625 |
--Epsilon: @semilog{2.0, -3} |
626 |
-+Epsilon: 2.0e-3 |
627 |
- @item |
628 |
--Maximum finite value: @semilog{4.3, 9} |
629 |
-+Maximum finite value: 4.3e9 |
630 |
- @end itemize |
631 |
- |
632 |
- @item -f @var{WIDTH}x@var{HEIGHT} |
633 |
-@@ -1250,7 +1250,7 @@ |
634 |
- @cindex canvas size |
635 |
- @cindex size, canvas |
636 |
- Ensure that the minimum ``canvas'' size of the output image is at |
637 |
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify |
638 |
-+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify |
639 |
- the @var{XOFFSET} and @var{YOFFSET}, too. |
640 |
- |
641 |
- @pindex nona @r{(Hugin)} |
642 |
-@@ -1572,7 +1572,7 @@ |
643 |
- @value{src::default-coarseness-factor}, this means, |
644 |
- option@tie{}@option{--coarse-mask} shrinks the overlapping |
645 |
- @emph{areas} by a factor of |
646 |
--@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}. |
647 |
-+@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}. |
648 |
- With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a |
649 |
- run of Enblend shrinks approximately by 80% and the maximum amount of |
650 |
- memory in use at a time is decreased to 60% (Enblend compiled with |
651 |
-@@ -2494,7 +2494,7 @@ |
652 |
- When using this option in conjunction with |
653 |
- option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the |
654 |
- smoothing occurs @emph{after} the overlap regions have been shrunken. |
655 |
--Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR} |
656 |
-+Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR} |
657 |
- times larger area in the original images. |
658 |
- |
659 |
- Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}. |
660 |
-@@ -2606,7 +2606,7 @@ |
661 |
- @rimage{seam-line-visualization} |
662 |
- |
663 |
- @caption{Seam-line visualization of a simple overlap. The |
664 |
--853@classictimes{}238@dmn{pixel} image is shown at a magification of |
665 |
-+853x238@dmn{pixel} image is shown at a magification of |
666 |
- 100%.} |
667 |
- |
668 |
- @shortcaption{Seam-line visualization} |
669 |
-@@ -2618,7 +2618,7 @@ |
670 |
- @rimage{seam-line-visualization, 15cm} |
671 |
- |
672 |
- @caption{Seam-line visualization of a simple overlap. The |
673 |
--853@classictimes{}238@dmn{pixel} image has been rescaled to a width of |
674 |
-+853x238@dmn{pixel} image has been rescaled to a width of |
675 |
- approximately 15@dmn{cm}.} |
676 |
- |
677 |
- @shortcaption{Seam-line visualization} |
678 |
-@@ -2629,7 +2629,7 @@ |
679 |
- @float Figure,Figure:seam-line-visualization |
680 |
- @rimage{seam-line-visualization, 15cm} |
681 |
- |
682 |
--@caption{Seam-line visualization of a simple overlap. The 853@classictimes{}238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} |
683 |
-+@caption{Seam-line visualization of a simple overlap. The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} |
684 |
- |
685 |
- @shortcaption{Seam-line visualization} |
686 |
- @end float |
687 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.info |
688 |
-Binary file doc/enfuse.info has changed |
689 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.texi |
690 |
---- a/doc/enfuse.texi Fri Aug 07 16:43:18 2015 +0200 |
691 |
-+++ b/doc/enfuse.texi Fri Aug 07 16:43:24 2015 +0200 |
692 |
-@@ -621,9 +621,9 @@ |
693 |
- twice as large as the previous one. So, the zeroth layer, the |
694 |
- original image, obviously defines the image at single-pixel scale, the |
695 |
- first level works at two-pixel scale, and generally, the @math{n}-th |
696 |
--level contains image data at @power{2, n}-pixel scale. This is the |
697 |
-+level contains image data at 2^n-pixel scale. This is the |
698 |
- reason why an image of |
699 |
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be |
700 |
-+@math{width}x@/@math{height}@dmn{pixels} cannot be |
701 |
- deconstructed into a pyramid of more than |
702 |
- @ifinfo |
703 |
- @display |
704 |
-@@ -1255,11 +1255,11 @@ |
705 |
- |
706 |
- @itemize |
707 |
- @item |
708 |
--Minimum normalized value: @semilog{1.2, -38} |
709 |
-+Minimum normalized value: 1.2e-38 |
710 |
- @item |
711 |
--Epsilon: @semilog{1.2, -7} |
712 |
-+Epsilon: 1.2e-7 |
713 |
- @item |
714 |
--Maximum finite value: @semilog{3.4, 38} |
715 |
-+Maximum finite value: 3.4e38 |
716 |
- @end itemize |
717 |
- |
718 |
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 |
719 |
-@@ -1271,11 +1271,11 @@ |
720 |
- |
721 |
- @itemize |
722 |
- @item |
723 |
--Minimum normalized value: @semilog{2.2, -308} |
724 |
-+Minimum normalized value: 2.2e-308 |
725 |
- @item |
726 |
--Epsilon: @semilog{2.2, -16} |
727 |
-+Epsilon: 2.2e-16 |
728 |
- @item |
729 |
--Maximum finite value: @semilog{1.8, 308} |
730 |
-+Maximum finite value: 1.8e308 |
731 |
- @end itemize |
732 |
- @end table |
733 |
- |
734 |
-@@ -1297,11 +1297,11 @@ |
735 |
- |
736 |
- @itemize |
737 |
- @item |
738 |
--Minimum normalized value: @semilog{9.3, -10} |
739 |
-+Minimum normalized value: 9.3e-10 |
740 |
- @item |
741 |
--Epsilon: @semilog{2.0, -3} |
742 |
-+Epsilon: 2.0e-3 |
743 |
- @item |
744 |
--Maximum finite value: @semilog{4.3, 9} |
745 |
-+Maximum finite value: 4.3e9 |
746 |
- @end itemize |
747 |
- |
748 |
- @item -f @var{WIDTH}x@var{HEIGHT} |
749 |
-@@ -1311,7 +1311,7 @@ |
750 |
- @cindex canvas size |
751 |
- @cindex size, canvas |
752 |
- Ensure that the minimum ``canvas'' size of the output image is at |
753 |
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify |
754 |
-+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify |
755 |
- the @var{XOFFSET} and @var{YOFFSET}, too. |
756 |
- |
757 |
- @pindex nona @r{(Hugin)} |
758 |
-@@ -1501,8 +1501,8 @@ |
759 |
- @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement |
760 |
- step, @var{LCE-FACTOR} is the weight factor (``strength''). |
761 |
- |
762 |
--@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original} |
763 |
--@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original}, |
764 |
-+@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original} |
765 |
-+@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original}, |
766 |
- @var{LCE-SCALE}). |
767 |
- |
768 |
- @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and |
769 |
-@@ -1531,7 +1531,7 @@ |
770 |
- @opindex --contrast-window-size |
771 |
- |
772 |
- Set the window @var{SIZE} for local contrast analysis. The window |
773 |
--will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If |
774 |
-+will be a square of @var{SIZE}x@/@var{SIZE} pixels. If |
775 |
- given an even @var{SIZE}, Enfuse will automatically use the next odd |
776 |
- number. |
777 |
- |
778 |
-@@ -1585,7 +1585,7 @@ |
779 |
- @opindex --entropy-window-size |
780 |
- |
781 |
- Window @var{SIZE} for local entropy analysis. The window will be a |
782 |
--square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. |
783 |
-+square of @var{SIZE}x@/@var{SIZE} pixels. |
784 |
- |
785 |
- In the entropy calculation @var{SIZE} values of 3 to 7 yield an |
786 |
- acceptable compromise of the locality of the information and the |
787 |
-@@ -2433,20 +2433,6 @@ |
788 |
- from 1 to the common height, and @math{i} from 1 to the number of |
789 |
- input images@tie{}@math{n}. |
790 |
- |
791 |
--@macro equationW{} |
792 |
--@ifnotdocbook |
793 |
--@ifnottex |
794 |
--(W) |
795 |
--@end ifnottex |
796 |
--@end ifnotdocbook |
797 |
--@tex |
798 |
--(W)% |
799 |
--@end tex |
800 |
--@docbook |
801 |
--<xref linkend="equ:pixel-weighting-function"/> |
802 |
--@end docbook |
803 |
--@end macro |
804 |
-- |
805 |
- Enfuse allows for weighting the contribution of each @math{P(i, x, y)} |
806 |
- to the final @math{Q(x, y)}: |
807 |
- @ifinfo |
808 |
-@@ -2454,7 +2440,7 @@ |
809 |
- @math{w(P(1, x, y)) * P(1, x, y) + |
810 |
- ... + |
811 |
- w(P(n, x, y)) * P(n, x, y) |
812 |
----> Q(x, y),}@w{ }@equationW{} |
813 |
-+--> Q(x, y),} |
814 |
- @end display |
815 |
- @end ifinfo |
816 |
- @html |
817 |
-@@ -2520,9 +2506,6 @@ |
818 |
- <mi>y</mi> |
819 |
- </mfenced> |
820 |
- </mrow> |
821 |
-- <mtext>,</mtext> |
822 |
-- <mspace width="4em"/> |
823 |
-- <mtext>@equationW{}</mtext> |
824 |
- </mrow> |
825 |
- </math> |
826 |
- @end html |
827 |
-@@ -2530,7 +2513,7 @@ |
828 |
- $$ |
829 |
- w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y) |
830 |
- \rightarrow |
831 |
-- Q(x, y),\hskip4em\hbox{@equationW{}} |
832 |
-+ Q(x, y) |
833 |
- $$ |
834 |
- @end tex |
835 |
- @docbook |
836 |
-@@ -2948,7 +2931,7 @@ |
837 |
- be extreme, favoring only a few pixels or even only one pixel in the |
838 |
- input stack. Extremes are not typical, however. |
839 |
- |
840 |
--Equal weights are another extreme that turns @equationW{} into an |
841 |
-+Equal weights are another extreme that turns the equation into an |
842 |
- arithmetic average. This is why we sometimes speak of the ``averaging |
843 |
- property'' of this weighting algorithm, like smoothing out noise. |
844 |
- |
845 |
-@@ -2969,7 +2952,7 @@ |
846 |
- wins, this is, gets weight@tie{}one, and all other pixels get the |
847 |
- weight of zero |
848 |
- (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The |
849 |
--Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{} |
850 |
-+Winner Takes It All.''}). With @option{--hard-mask} the equation |
851 |
- becomes |
852 |
- @ifinfo |
853 |
- @display |
854 |
-@@ -3114,8 +3097,8 @@ |
855 |
- |
856 |
- @noindent |
857 |
- Note that this ``averaging'' scheme lacks the nice noise-reduction |
858 |
--property of the weighted average@tie{}@equationW{}, because only a |
859 |
--single input pixel contributes to the output. |
860 |
-+property of the weighted average, because only a single input pixel |
861 |
-+contributes to the output. |
862 |
- |
863 |
- |
864 |
- @node Single Criterion Fusing |
865 |
-@@ -3562,7 +3545,7 @@ |
866 |
- |
867 |
- @noindent |
868 |
- It associates a probability@tie{}@math{p} with each of the @math{n} |
869 |
--different possible outcomes@tie{}@inlineomega{} of the random |
870 |
-+different possible outcomes@tie{}@math{omega} of the random |
871 |
- variable@tie{}@math{X}. |
872 |
- @cindex expectation value |
873 |
- Based on @math{w}, we define the @dfn{expectation value} or ``First |
874 |
-@@ -4189,7 +4172,7 @@ |
875 |
- @end docbook |
876 |
- |
877 |
- @noindent |
878 |
--The parameter@tie{}@inlinesigma{}, the argument of |
879 |
-+The parameter@tie{}@math{sigma}, the argument of |
880 |
- option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges |
881 |
- are detected by @math{g(x, y)}. We apply the Laplacian operator in |
882 |
- Cartesian coordinates |
883 |
-@@ -4401,7 +4384,7 @@ |
884 |
- </informalequation> |
885 |
- @end docbook |
886 |
- |
887 |
--where we have used the dimensionless distance@tie{}@inlinexi{} from |
888 |
-+where we have used the dimensionless distance@tie{}@math{xi} from |
889 |
- the origin |
890 |
- @ifinfo |
891 |
- @display |
892 |
-@@ -4556,7 +4539,7 @@ |
893 |
- @float Figure,Figure:laplacian-of-gaussian |
894 |
- @vimage{laplacian-of-gaussian} |
895 |
- |
896 |
--@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.} |
897 |
-+@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.} |
898 |
- |
899 |
- @shortcaption{Laplacian-of-Gaussian} |
900 |
- @end float |
901 |
-@@ -4656,10 +4639,10 @@ |
902 |
- @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only, |
903 |
- @acronym{LoG}-only, or a blend of both) scales to different image |
904 |
- sizes. In practice, this means that if you start with a set of |
905 |
--reduced size images, say 2808@classictimes{}1872 pixels, carefully |
906 |
-+reduced size images, say 2808x1872 pixels, carefully |
907 |
- optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find |
908 |
- @acronym{LoG}-only the best mode, and then switch to the original |
909 |
--resolution of 5616@classictimes{}3744 pixels, multiplying (or |
910 |
-+resolution of 5616x3744 pixels, multiplying (or |
911 |
- dividing) the parameters by four and sticking to @acronym{LoG}-only |
912 |
- might @emph{not} result in the best fused image. For best quality, |
913 |
- perform the parameter optimization and the search for the most |
914 |
-@@ -5080,9 +5063,9 @@ |
915 |
- Images should align well to be suitable for fusion. However, there is |
916 |
- no hard mathematical rule what ``well'' means. The alignment |
917 |
- requirements for 16@dmn{MPixel} images to yield a sharp |
918 |
--4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per |
919 |
-+4"x6" print at 300@dmn{dpi} (``dpi'' means dots per |
920 |
- inch) or even for web presentation are relatively low, whereas the |
921 |
--alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print |
922 |
-+alignment of 8@dmn{MPixel} images for a 12"x18" print |
923 |
- ought to be tight. |
924 |
- |
925 |
- @pindex hugin |
926 |
-@@ -5548,7 +5531,7 @@ |
927 |
- |
928 |
- Let us use an example to illustrate the problem of relating the |
929 |
- sharpness with the local contrast variations. Say we use a |
930 |
--5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge} |
931 |
-+5x5 contrast window. Moreover, let @code{sharp_edge} |
932 |
- and @code{smooth_edge} be two specific configurations: |
933 |
- |
934 |
- @example |
935 |
-@@ -5727,7 +5710,7 @@ |
936 |
- Apply the default grayscale projector: @code{average} and throw away |
937 |
- all edges with a curvature of less than 0.5% and replace the |
938 |
- @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use |
939 |
--a window of 7@classictimes{}7@dmn{pixel} window to compute the |
940 |
-+a window of 7x7@dmn{pixel} window to compute the |
941 |
- @acronym{SDev}. |
942 |
- @end table |
943 |
- |
944 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenblend.texi |
945 |
---- a/doc/versenblend.texi Fri Aug 07 16:43:18 2015 +0200 |
946 |
-+++ b/doc/versenblend.texi Fri Aug 07 16:43:24 2015 +0200 |
947 |
-@@ -1,4 +1,4 @@ |
948 |
--@set UPDATED 10 March 2014 |
949 |
--@set UPDATED-MONTH March 2014 |
950 |
-+@set UPDATED 15 June 2015 |
951 |
-+@set UPDATED-MONTH June 2015 |
952 |
- @set EDITION 4.1.3 |
953 |
- @set VERSION 4.1.3 |
954 |
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenfuse.texi |
955 |
---- a/doc/versenfuse.texi Fri Aug 07 16:43:18 2015 +0200 |
956 |
-+++ b/doc/versenfuse.texi Fri Aug 07 16:43:24 2015 +0200 |
957 |
-@@ -1,4 +1,4 @@ |
958 |
--@set UPDATED 10 March 2014 |
959 |
--@set UPDATED-MONTH March 2014 |
960 |
-+@set UPDATED 15 June 2015 |
961 |
-+@set UPDATED-MONTH June 2015 |
962 |
- @set EDITION 4.1.3 |
963 |
- @set VERSION 4.1.3 |
964 |
- |
965 |
|
966 |
diff --git a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch |
967 |
deleted file mode 100644 |
968 |
index d067df3c57a..00000000000 |
969 |
--- a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch |
970 |
+++ /dev/null |
971 |
@@ -1,11 +0,0 @@ |
972 |
---- a/ConfigureChecks.cmake 2013-10-07 10:50:00.000000000 +0400 |
973 |
-+++ b/ConfigureChecks.cmake 2015-03-31 13:42:40.179527224 +0300 |
974 |
-@@ -53,7 +53,7 @@ |
975 |
- if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK) |
976 |
- unset(VIGRA_SETIMAGEINDEX CACHE) |
977 |
- set(CMAKE_REQUIRED_INCLUDES ${VIGRA_INCLUDE_DIR}) |
978 |
-- set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES}) |
979 |
-+ set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES} -lpthread) |
980 |
- check_cxx_source_compiles( |
981 |
- " |
982 |
- #include <vigra/imageinfo.hxx> |
983 |
|
984 |
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml |
985 |
index 621b21a35cf..9495d45d212 100644 |
986 |
--- a/media-gfx/enblend/metadata.xml |
987 |
+++ b/media-gfx/enblend/metadata.xml |
988 |
@@ -5,10 +5,6 @@ |
989 |
<email>graphics@g.o</email> |
990 |
<name>Gentoo Graphics Project</name> |
991 |
</maintainer> |
992 |
- <use> |
993 |
- <flag name="gpu">GPU support for Enblend</flag> |
994 |
- <flag name="image-cache">allow for processing of large images</flag> |
995 |
- </use> |
996 |
<upstream> |
997 |
<remote-id type="sourceforge">enblend</remote-id> |
998 |
</upstream> |