* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2015-08-14 1:26 Sebastian Pipping
0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2015-08-14 1:26 UTC (permalink / raw
To: gentoo-commits
commit: 13d95cfe56b912f73214117a4af28560370305a4
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 01:22:28 2015 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 01:25:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d95cfe
media-gfx/enblend: Fix texinfo compilation (bug #479978)
Upstream patch (with version patching removed) from
https://bugs.launchpad.net/enblend/+bug/1181678/comments/16
http://hg.code.sf.net/p/enblend/code/rev/8387f0170f7b
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
media-gfx/enblend/enblend-4.1.3-r1.ebuild | 79 +++
.../files/enblend-4.1.3-texinfo-5-more.patch | 82 +++
.../files/enblend-4.1.3-texinfo-5-upstream.patch | 633 +++++++++++++++++++++
3 files changed, 794 insertions(+)
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
new file mode 100644
index 0000000..1984998
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+MY_P="${PN}-enfuse-${PV/_rc/rc}"
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 VIGRA"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~x86"
+IUSE="debug doc gpu image-cache openmp"
+
+REQUIRED_USE="openmp? ( !image-cache )"
+
+RDEPEND="
+ >=dev-libs/boost-1.31.0:=
+ media-libs/glew
+ >=media-libs/lcms-2.5:2
+ >=media-libs/libpng-1.2.43:0=
+ >=media-libs/openexr-1.0:=
+ media-libs/plotutils[X]
+ media-libs/tiff:=
+ >=media-libs/vigra-1.8.0[openexr]
+ sci-libs/gsl
+ virtual/jpeg:0=
+ debug? ( dev-libs/dmalloc )
+ gpu? ( media-libs/freeglut )"
+DEPEND="${RDEPEND}
+ media-gfx/imagemagick
+ sys-apps/help2man
+ virtual/pkgconfig
+ doc? (
+ media-gfx/transfig
+ sci-visualization/gnuplot[gd]
+ virtual/latex-base
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" )
+
+src_prepare() {
+ sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
+ sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
+ cmake-utils_src_prepare
+
+ epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
+ epatch "${FILESDIR}"/${P}-texinfo-5-more.patch
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_FLAGS_RELEASE=""
+ $(cmake-utils_use_enable debug DMALLOC)
+ $(cmake-utils_use doc DOC)
+ $(cmake-utils_use_enable image-cache IMAGECACHE)
+ $(cmake-utils_use_enable openmp)
+ $(cmake-utils_use_enable gpu)
+ )
+ CMAKE_BUILD_TYPE="Release"
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
+ cmake-utils_src_compile -j1
+}
+
+src_install() {
+ local DOCS=( AUTHORS ChangeLog NEWS README )
+ cmake-utils_src_install
+}
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
new file mode 100644
index 0000000..dd63ae3
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
@@ -0,0 +1,82 @@
+From 7ec0e758430f9e31fb9fc0f85d72339a307263d6 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 14 Aug 2015 03:09:57 +0200
+Subject: [PATCH] Texinfo: Fix parameter handling with macro "mainpurpose"
+
+---
+ doc/auxmac.texi | 6 +++---
+ doc/enfuse.texi | 10 +++++-----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/doc/auxmac.texi b/doc/auxmac.texi
+index 59520c3..ad35d6a 100644
+--- a/doc/auxmac.texi
++++ b/doc/auxmac.texi
+@@ -88,12 +88,12 @@ not displayed, because of lacking <acronym>SVG</acronym> and
+
+ @c Text Fragments
+
+-@macro mainpurpose
++@macro mainpurpose{purpose}
+ @ifinfo
+-@strong{Main Purpose}:
++@strong{Main Purpose}: \purpose\
+ @end ifinfo
+ @ifnotinfo
+-@strong{Main Purpose: }
++@strong{Main Purpose: }\purpose\
+ @end ifnotinfo
+ @end macro
+
+diff --git a/doc/enfuse.texi b/doc/enfuse.texi
+index 92fe597..9e601ea 100644
+--- a/doc/enfuse.texi
++++ b/doc/enfuse.texi
+@@ -5164,7 +5164,7 @@ Fire in rapid succession.
+ @cindex series, simple
+ @cindex noise reduction
+
+-@mainpurpose Reduce noise
++@mainpurpose{Reduce noise}
+
+ @noindent
+ With the default settings, Enfuse computes a weighted average of the
+@@ -5193,7 +5193,7 @@ be worth an extra run.
+ @cindex series, exposure
+ @cindex dynamic range increase
+
+-@mainpurpose Increase manageable dynamic range
++@mainpurpose{Increase manageable dynamic range}
+
+ @noindent
+ An exposure series is a set of images taken with identical parameters
+@@ -5322,7 +5322,7 @@ the multiply occuring exposures and reducing noise.
+ @cindex series, flash exposure
+ @cindex dynamic range increase
+
+-@mainpurpose ???
++@mainpurpose{???}
+
+ ...
+
+@@ -5333,7 +5333,7 @@ the multiply occuring exposures and reducing noise.
+ @cindex series, polarization
+ @cindex saturation enhancement
+
+-@mainpurpose Reflection suppression, saturation enhancement
++@mainpurpose{Reflection suppression, saturation enhancement}
+
+ In the current implementation of Enfuse, it is not possible in general
+ to fuse a polarization series. Naively abusing
+@@ -5345,7 +5345,7 @@ to fuse a polarization series. Naively abusing
+ @cindex focus stacks
+ @cindex depth-of-focus increase
+
+-@mainpurpose Synthetic Depth-of-Field Increase
++@mainpurpose{Synthetic Depth-of-Field Increase}
+
+ A @dfn{focus stack} is a series of images where the distance of the
+ focal plane from the sensor varies. Sloppily speaking, the images
+--
+2.5.0
+
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
new file mode 100644
index 0000000..ef04aa7
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch
@@ -0,0 +1,633 @@
+# HG changeset patch
+# User Chris <cspiel@users.sourceforge.net>
+# Date 1438958604 -7200
+# Node ID 8387f0170f7b352baea887f77960e8066185a6cd
+# Parent c1bcd2df4e3724f3bb0414d3a5e2e9302be78921
+Get the Texinfo documentation to translate again with makeinfo-5.2.
+
+This patch takes thus care of issue #1181678
+ https://bugs.launchpad.net/enblend/+bug/1181678
+
+We do not strive for a nicely formatted documentation anymore in the
+Stable Branch, because the Development Branch already has a flawless
+new documentation *not* based on Texinfo.
+
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/Makefile.am
+--- a/doc/Makefile.am Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/Makefile.am Fri Aug 07 16:43:24 2015 +0200
+@@ -46,7 +46,7 @@
+ -I $(top_builddir) -I $(srcdir) \
+ --css-include=@srcdir@/default.css \
+ $(MAKEINFOHTMLFLAGS)
+-export TEXINPUTS=$(top_builddir):$(srcdir)
++export TEXINPUTS = .:$(top_builddir):$(srcdir):
+
+ TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
+
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.tex
+--- a/doc/auxmac.tex Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/auxmac.tex Fri Aug 07 16:43:24 2015 +0200
+@@ -1,13 +1,6 @@
+-\input thumbpdf.sty
+-
+-
+ % Auxilliary Macros.
+ %
+ % Include this file before texinfo.tex!
+
+ \def\mathit#1{\hbox{\it #1}}
+ \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi}
+-
+-% These definitions are required for older versions of texinfo.tex.
+-\def\geq{\ifmmode \ge\else $\ge$\fi}
+-\def\leq{\ifmmode \le\else $\le$\fi}
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.texi
+--- a/doc/auxmac.texi Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/auxmac.texi Fri Aug 07 16:43:24 2015 +0200
+@@ -2,16 +2,6 @@
+ @c Macro Definitions
+ @c
+
+-@c redefined commands
+-
+-@c Get the spacing of dimensions right.
+-@ifnottex
+-@macro dmn{unit}
+-@tie{}\unit\
+-@end macro
+-@end ifnottex
+-
+-
+ @c extended commands
+
+ @c Add a title to a DocBook element.
+@@ -80,73 +70,6 @@
+
+ @c Operators
+
+-@c Generate a nice representation of base^exponent.
+-@macro power{base, exponent}
+-@ifinfo
+-\base\^\exponent\
+-@end ifinfo
+-@html
+-\base\<sup>\exponent\</sup>
+-@end html
+-@tex
+-$\base\^{\exponent\}$%
+-@end tex
+-@docbook
+-\base\<superscript>\exponent\</superscript>
+-@end docbook
+-@end macro
+-
+-
+-@macro classictimes
+-@ifinfo
+-x@c gobble following newline -- The Tricks of a Texinfo Wizard.
+-@end ifinfo
+-@html
+-×
+-@end html
+-@tex
+-\\ifmmode\\times\\else$\\times$\\fi% gobble following newline -- The Tricks of a TeX Wizard.
+-@end tex
+-@docbook
+-×
+-@end docbook
+-@end macro
+-
+-
+-@c Required for older versions of makeinfo. The definition of @geq
+-@c for TeX lives in auxmac.tex.
+-@ifnottex
+-@macro geq
+-@ifinfo
+->=@c
+-@end ifinfo
+-@html
+-≥
+-@end html
+-@docbook
+-≥
+-@end docbook
+-@end macro
+-@end ifnottex
+-
+-
+-@c Required for older versions of makeinfo. The definition of @leq
+-@c for TeX lives in auxmac.tex.
+-@ifnottex
+-@macro leq
+-@ifinfo
+-<=@c
+-@end ifinfo
+-@html
+-≤
+-@end html
+-@docbook
+-≤
+-@end docbook
+-@end macro
+-@end ifnottex
+-
+-
+ @macro plusminus
+ @ifinfo
+ +/-@c
+@@ -163,62 +86,6 @@
+ @end macro
+
+
+-@c Special Characters
+-
+-@macro inlineomega
+-@ifinfo
+-@math{omega}@c
+-@end ifinfo
+-@html
+-<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mi>ω</mi>
+-</mathinline>
+-@end html
+-@tex
+-$\\omega$%
+-@end tex
+-@docbook
+-ω
+-@end docbook
+-@end macro
+-
+-
+-@macro inlinesigma
+-@ifinfo
+-@math{sigma}@c
+-@end ifinfo
+-@html
+-<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mi>σ</mi>
+-</mathinline>
+-@end html
+-@tex
+-$\\sigma$%
+-@end tex
+-@docbook
+-σ
+-@end docbook
+-@end macro
+-
+-
+-@macro inlinexi
+-@ifinfo
+-@math{xi}@c
+-@end ifinfo
+-@html
+-<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mi>ξ</mi>
+-</mathinline>
+-@end html
+-@tex
+-$\\xi$%
+-@end tex
+-@docbook
+-ξ
+-@end docbook
+-@end macro
+-
+-
+ @c Text Fragments
+
+ @macro mainpurpose
+@@ -236,26 +103,3 @@
+ @noindent
+ @strong{Summary of influential options}
+ @end macro
+-
+-
+-@macro semilog{significant, exponent}
+-@ifinfo
+-\significant\*10^\exponent\@c
+-@end ifinfo
+-@html
+-<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mn>\significant\</mn>
+- <mo>×</mo>
+- <msup>
+- <mn>10</mn>
+- <mn>\exponent\</mn>
+- </msup>
+-</math>
+-@end html
+-@tex
+-\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi%
+-@end tex
+-@docbook
+-\significant\×10<superscript>\exponent\</superscript>
+-@end docbook
+-@end macro
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/bug-reports.texi
+--- a/doc/bug-reports.texi Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/bug-reports.texi Fri Aug 07 16:43:24 2015 +0200
+@@ -77,7 +77,7 @@
+ @item
+ A complete set of input images that will reproduce the bug. Strive
+ for a minimal set of @emph{small}@footnote{Images of a size less than
+-1500@classictimes{}1000 pixels qualify as small.} images.
++1500x1000 pixels qualify as small.} images.
+
+ @item
+ The type of machine you are using, and the operating system name and
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.info
+Binary file doc/enblend.info has changed
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.texi
+--- a/doc/enblend.texi Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/enblend.texi Fri Aug 07 16:43:24 2015 +0200
+@@ -508,9 +508,9 @@
+ twice as large as the previous one. So, the zeroth layer, the
+ original image, obviously defines the image at single-pixel scale, the
+ first level works at two-pixel scale, and generally, the @math{n}-th
+-level contains image data at @power{2, n}-pixel scale. This is the
++level contains image data at 2^n-pixel scale. This is the
+ reason why an image of
+-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
++@math{width}x@/@math{height}@dmn{pixels} cannot be
+ deconstructed into a pyramid of more than
+ @ifinfo
+ @display
+@@ -1194,11 +1194,11 @@
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{1.2, -38}
++Minimum normalized value: 1.2e-38
+ @item
+-Epsilon: @semilog{1.2, -7}
++Epsilon: 1.2e-7
+ @item
+-Maximum finite value: @semilog{3.4, 38}
++Maximum finite value: 3.4e38
+ @end itemize
+
+ @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
+@@ -1210,11 +1210,11 @@
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{2.2, -308}
++Minimum normalized value: 2.2e-308
+ @item
+-Epsilon: @semilog{2.2, -16}
++Epsilon: 2.2e-16
+ @item
+-Maximum finite value: @semilog{1.8, 308}
++Maximum finite value: 1.8e308
+ @end itemize
+ @end table
+
+@@ -1236,11 +1236,11 @@
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{9.3, -10}
++Minimum normalized value: 9.3e-10
+ @item
+-Epsilon: @semilog{2.0, -3}
++Epsilon: 2.0e-3
+ @item
+-Maximum finite value: @semilog{4.3, 9}
++Maximum finite value: 4.3e9
+ @end itemize
+
+ @item -f @var{WIDTH}x@var{HEIGHT}
+@@ -1250,7 +1250,7 @@
+ @cindex canvas size
+ @cindex size, canvas
+ Ensure that the minimum ``canvas'' size of the output image is at
+-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
++least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
+ the @var{XOFFSET} and @var{YOFFSET}, too.
+
+ @pindex nona @r{(Hugin)}
+@@ -1572,7 +1572,7 @@
+ @value{src::default-coarseness-factor}, this means,
+ option@tie{}@option{--coarse-mask} shrinks the overlapping
+ @emph{areas} by a factor of
+-@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}.
++@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}.
+ With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a
+ run of Enblend shrinks approximately by 80% and the maximum amount of
+ memory in use at a time is decreased to 60% (Enblend compiled with
+@@ -2494,7 +2494,7 @@
+ When using this option in conjunction with
+ option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the
+ smoothing occurs @emph{after} the overlap regions have been shrunken.
+-Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR}
++Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR}
+ times larger area in the original images.
+
+ Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}.
+@@ -2606,7 +2606,7 @@
+ @rimage{seam-line-visualization}
+
+ @caption{Seam-line visualization of a simple overlap. The
+-853@classictimes{}238@dmn{pixel} image is shown at a magification of
++853x238@dmn{pixel} image is shown at a magification of
+ 100%.}
+
+ @shortcaption{Seam-line visualization}
+@@ -2618,7 +2618,7 @@
+ @rimage{seam-line-visualization, 15cm}
+
+ @caption{Seam-line visualization of a simple overlap. The
+-853@classictimes{}238@dmn{pixel} image has been rescaled to a width of
++853x238@dmn{pixel} image has been rescaled to a width of
+ approximately 15@dmn{cm}.}
+
+ @shortcaption{Seam-line visualization}
+@@ -2629,7 +2629,7 @@
+ @float Figure,Figure:seam-line-visualization
+ @rimage{seam-line-visualization, 15cm}
+
+-@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}.}
++@caption{Seam-line visualization of a simple overlap. The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
+
+ @shortcaption{Seam-line visualization}
+ @end float
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.info
+Binary file doc/enfuse.info has changed
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.texi
+--- a/doc/enfuse.texi Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/enfuse.texi Fri Aug 07 16:43:24 2015 +0200
+@@ -621,9 +621,9 @@
+ twice as large as the previous one. So, the zeroth layer, the
+ original image, obviously defines the image at single-pixel scale, the
+ first level works at two-pixel scale, and generally, the @math{n}-th
+-level contains image data at @power{2, n}-pixel scale. This is the
++level contains image data at 2^n-pixel scale. This is the
+ reason why an image of
+-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
++@math{width}x@/@math{height}@dmn{pixels} cannot be
+ deconstructed into a pyramid of more than
+ @ifinfo
+ @display
+@@ -1255,11 +1255,11 @@
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{1.2, -38}
++Minimum normalized value: 1.2e-38
+ @item
+-Epsilon: @semilog{1.2, -7}
++Epsilon: 1.2e-7
+ @item
+-Maximum finite value: @semilog{3.4, 38}
++Maximum finite value: 3.4e38
+ @end itemize
+
+ @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
+@@ -1271,11 +1271,11 @@
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{2.2, -308}
++Minimum normalized value: 2.2e-308
+ @item
+-Epsilon: @semilog{2.2, -16}
++Epsilon: 2.2e-16
+ @item
+-Maximum finite value: @semilog{1.8, 308}
++Maximum finite value: 1.8e308
+ @end itemize
+ @end table
+
+@@ -1297,11 +1297,11 @@
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{9.3, -10}
++Minimum normalized value: 9.3e-10
+ @item
+-Epsilon: @semilog{2.0, -3}
++Epsilon: 2.0e-3
+ @item
+-Maximum finite value: @semilog{4.3, 9}
++Maximum finite value: 4.3e9
+ @end itemize
+
+ @item -f @var{WIDTH}x@var{HEIGHT}
+@@ -1311,7 +1311,7 @@
+ @cindex canvas size
+ @cindex size, canvas
+ Ensure that the minimum ``canvas'' size of the output image is at
+-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
++least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
+ the @var{XOFFSET} and @var{YOFFSET}, too.
+
+ @pindex nona @r{(Hugin)}
+@@ -1501,8 +1501,8 @@
+ @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement
+ step, @var{LCE-FACTOR} is the weight factor (``strength'').
+
+-@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original}
+-@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original},
++@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original}
++@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original},
+ @var{LCE-SCALE}).
+
+ @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and
+@@ -1531,7 +1531,7 @@
+ @opindex --contrast-window-size
+
+ Set the window @var{SIZE} for local contrast analysis. The window
+-will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If
++will be a square of @var{SIZE}x@/@var{SIZE} pixels. If
+ given an even @var{SIZE}, Enfuse will automatically use the next odd
+ number.
+
+@@ -1585,7 +1585,7 @@
+ @opindex --entropy-window-size
+
+ Window @var{SIZE} for local entropy analysis. The window will be a
+-square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.
++square of @var{SIZE}x@/@var{SIZE} pixels.
+
+ In the entropy calculation @var{SIZE} values of 3 to 7 yield an
+ acceptable compromise of the locality of the information and the
+@@ -2433,20 +2433,6 @@
+ from 1 to the common height, and @math{i} from 1 to the number of
+ input images@tie{}@math{n}.
+
+-@macro equationW{}
+-@ifnotdocbook
+-@ifnottex
+-(W)
+-@end ifnottex
+-@end ifnotdocbook
+-@tex
+-(W)%
+-@end tex
+-@docbook
+-<xref linkend="equ:pixel-weighting-function"/>
+-@end docbook
+-@end macro
+-
+ Enfuse allows for weighting the contribution of each @math{P(i, x, y)}
+ to the final @math{Q(x, y)}:
+ @ifinfo
+@@ -2454,7 +2440,7 @@
+ @math{w(P(1, x, y)) * P(1, x, y) +
+ ... +
+ w(P(n, x, y)) * P(n, x, y)
+---> Q(x, y),}@w{ }@equationW{}
++--> Q(x, y),}
+ @end display
+ @end ifinfo
+ @html
+@@ -2520,9 +2506,6 @@
+ <mi>y</mi>
+ </mfenced>
+ </mrow>
+- <mtext>,</mtext>
+- <mspace width="4em"/>
+- <mtext>@equationW{}</mtext>
+ </mrow>
+ </math>
+ @end html
+@@ -2530,7 +2513,7 @@
+ $$
+ w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y)
+ \rightarrow
+- Q(x, y),\hskip4em\hbox{@equationW{}}
++ Q(x, y)
+ $$
+ @end tex
+ @docbook
+@@ -2948,7 +2931,7 @@
+ be extreme, favoring only a few pixels or even only one pixel in the
+ input stack. Extremes are not typical, however.
+
+-Equal weights are another extreme that turns @equationW{} into an
++Equal weights are another extreme that turns the equation into an
+ arithmetic average. This is why we sometimes speak of the ``averaging
+ property'' of this weighting algorithm, like smoothing out noise.
+
+@@ -2969,7 +2952,7 @@
+ wins, this is, gets weight@tie{}one, and all other pixels get the
+ weight of zero
+ (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The
+-Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{}
++Winner Takes It All.''}). With @option{--hard-mask} the equation
+ becomes
+ @ifinfo
+ @display
+@@ -3114,8 +3097,8 @@
+
+ @noindent
+ Note that this ``averaging'' scheme lacks the nice noise-reduction
+-property of the weighted average@tie{}@equationW{}, because only a
+-single input pixel contributes to the output.
++property of the weighted average, because only a single input pixel
++contributes to the output.
+
+
+ @node Single Criterion Fusing
+@@ -3562,7 +3545,7 @@
+
+ @noindent
+ It associates a probability@tie{}@math{p} with each of the @math{n}
+-different possible outcomes@tie{}@inlineomega{} of the random
++different possible outcomes@tie{}@math{omega} of the random
+ variable@tie{}@math{X}.
+ @cindex expectation value
+ Based on @math{w}, we define the @dfn{expectation value} or ``First
+@@ -4189,7 +4172,7 @@
+ @end docbook
+
+ @noindent
+-The parameter@tie{}@inlinesigma{}, the argument of
++The parameter@tie{}@math{sigma}, the argument of
+ option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges
+ are detected by @math{g(x, y)}. We apply the Laplacian operator in
+ Cartesian coordinates
+@@ -4401,7 +4384,7 @@
+ </informalequation>
+ @end docbook
+
+-where we have used the dimensionless distance@tie{}@inlinexi{} from
++where we have used the dimensionless distance@tie{}@math{xi} from
+ the origin
+ @ifinfo
+ @display
+@@ -4556,7 +4539,7 @@
+ @float Figure,Figure:laplacian-of-gaussian
+ @vimage{laplacian-of-gaussian}
+
+-@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
++@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.}
+
+ @shortcaption{Laplacian-of-Gaussian}
+ @end float
+@@ -4656,10 +4639,10 @@
+ @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only,
+ @acronym{LoG}-only, or a blend of both) scales to different image
+ sizes. In practice, this means that if you start with a set of
+-reduced size images, say 2808@classictimes{}1872 pixels, carefully
++reduced size images, say 2808x1872 pixels, carefully
+ optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find
+ @acronym{LoG}-only the best mode, and then switch to the original
+-resolution of 5616@classictimes{}3744 pixels, multiplying (or
++resolution of 5616x3744 pixels, multiplying (or
+ dividing) the parameters by four and sticking to @acronym{LoG}-only
+ might @emph{not} result in the best fused image. For best quality,
+ perform the parameter optimization and the search for the most
+@@ -5080,9 +5063,9 @@
+ Images should align well to be suitable for fusion. However, there is
+ no hard mathematical rule what ``well'' means. The alignment
+ requirements for 16@dmn{MPixel} images to yield a sharp
+-4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per
++4"x6" print at 300@dmn{dpi} (``dpi'' means dots per
+ inch) or even for web presentation are relatively low, whereas the
+-alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print
++alignment of 8@dmn{MPixel} images for a 12"x18" print
+ ought to be tight.
+
+ @pindex hugin
+@@ -5548,7 +5531,7 @@
+
+ Let us use an example to illustrate the problem of relating the
+ sharpness with the local contrast variations. Say we use a
+-5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge}
++5x5 contrast window. Moreover, let @code{sharp_edge}
+ and @code{smooth_edge} be two specific configurations:
+
+ @example
+@@ -5727,7 +5710,7 @@
+ Apply the default grayscale projector: @code{average} and throw away
+ all edges with a curvature of less than 0.5% and replace the
+ @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use
+-a window of 7@classictimes{}7@dmn{pixel} window to compute the
++a window of 7x7@dmn{pixel} window to compute the
+ @acronym{SDev}.
+ @end table
+
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenblend.texi
+--- a/doc/versenblend.texi Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/versenblend.texi Fri Aug 07 16:43:24 2015 +0200
+@@ -1,4 +1,4 @@
+-@set UPDATED 10 March 2014
+-@set UPDATED-MONTH March 2014
++@set UPDATED 15 June 2015
++@set UPDATED-MONTH June 2015
+ @set EDITION 4.1.3
+ @set VERSION 4.1.3
+diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenfuse.texi
+--- a/doc/versenfuse.texi Fri Aug 07 16:43:18 2015 +0200
++++ b/doc/versenfuse.texi Fri Aug 07 16:43:24 2015 +0200
+@@ -1,4 +1,4 @@
+-@set UPDATED 10 March 2014
+-@set UPDATED-MONTH March 2014
++@set UPDATED 15 June 2015
++@set UPDATED-MONTH June 2015
+ @set EDITION 4.1.3
+ @set VERSION 4.1.3
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2015-08-16 18:15 Sebastian Pipping
0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2015-08-16 18:15 UTC (permalink / raw
To: gentoo-commits
commit: add7eb2e0a138b25c98cbef9ce286ac830754faa
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 18:14:36 2015 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 18:14:59 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add7eb2e
media-gfx/enblend: Fix texinfo compilation (bug #479978)
media-gfx/enblend/enblend-4.1.1-r3.ebuild | 79 +++
.../files/enblend-4.1.1-texinfo-5-upstream.patch | 617 +++++++++++++++++++++
2 files changed, 696 insertions(+)
diff --git a/media-gfx/enblend/enblend-4.1.1-r3.ebuild b/media-gfx/enblend/enblend-4.1.1-r3.ebuild
new file mode 100644
index 0000000..2e46825
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.1-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+MY_P="${PN}-enfuse-${PV/_rc/rc}"
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 VIGRA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc gpu image-cache openmp"
+
+REQUIRED_USE="openmp? ( !image-cache )"
+
+RDEPEND="
+ media-libs/glew
+ =media-libs/lcms-2*
+ >=media-libs/libpng-1.2.43:0=
+ >=media-libs/openexr-1.0:=
+ media-libs/plotutils[X]
+ media-libs/tiff
+ >=media-libs/vigra-1.8.0
+ sci-libs/gsl
+ virtual/jpeg:0=
+ debug? ( dev-libs/dmalloc )
+ gpu? ( media-libs/freeglut )"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.31.0:=
+ virtual/pkgconfig
+ doc? (
+ media-gfx/imagemagick
+ media-gfx/transfig
+ sci-visualization/gnuplot[gd]
+ virtual/latex-base
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-4.1.3-vigra_check.patch
+
+ sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
+ sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
+ cmake-utils_src_prepare
+
+ epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
+ epatch "${FILESDIR}"/${PN}-4.1.3-texinfo-5-more.patch
+
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_FLAGS_RELEASE=""
+ $(cmake-utils_use_enable debug DMALLOC)
+ $(cmake-utils_use doc DOC)
+ $(cmake-utils_use_enable image-cache IMAGECACHE)
+ $(cmake-utils_use_enable openmp)
+ $(cmake-utils_use_enable gpu)
+ )
+ CMAKE_BUILD_TYPE="Release"
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
+ cmake-utils_src_compile -j1
+}
+
+src_install() {
+ local DOCS=( AUTHORS ChangeLog NEWS README )
+ cmake-utils_src_install
+}
diff --git a/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch
new file mode 100644
index 0000000..8399f23
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch
@@ -0,0 +1,617 @@
+From 0a60c121addb1b850f52281d898bdf1e04d920ad Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 16 Aug 2015 20:01:15 +0200
+Subject: [PATCH] Port enblend-4.1.3-texinfo-5-upstream.patch to 4.1.1
+
+---
+ doc/Makefile.am | 2 +-
+ doc/auxmac.tex | 7 ---
+ doc/auxmac.texi | 156 ---------------------------------------------------
+ doc/bug-reports.texi | 2 +-
+ doc/enblend.texi | 34 +++++------
+ doc/enfuse.texi | 81 +++++++++++---------------
+ 6 files changed, 51 insertions(+), 231 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 22c7fbc..40bb394 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = @AM_MAKEINFOHTMLFLAGS@ \
+ -I $(top_builddir) -I $(srcdir) \
+ --css-include=@srcdir@/default.css \
+ $(MAKEINFOHTMLFLAGS)
+-export TEXINPUTS=$(top_builddir):$(srcdir)
++export TEXINPUTS = .:$(top_builddir):$(srcdir):
+
+ TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
+
+diff --git a/doc/auxmac.tex b/doc/auxmac.tex
+index 812d58d..524830f 100644
+--- a/doc/auxmac.tex
++++ b/doc/auxmac.tex
+@@ -1,13 +1,6 @@
+-\input thumbpdf.sty
+-
+-
+ % Auxilliary Macros.
+ %
+ % Include this file before texinfo.tex!
+
+ \def\mathit#1{\hbox{\it #1}}
+ \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi}
+-
+-% These definitions are required for older versions of texinfo.tex.
+-\def\geq{\ifmmode \ge\else $\ge$\fi}
+-\def\leq{\ifmmode \le\else $\le$\fi}
+diff --git a/doc/auxmac.texi b/doc/auxmac.texi
+index 98c679f..59520c3 100644
+--- a/doc/auxmac.texi
++++ b/doc/auxmac.texi
+@@ -2,16 +2,6 @@
+ @c Macro Definitions
+ @c
+
+-@c redefined commands
+-
+-@c Get the spacing of dimensions right.
+-@ifnottex
+-@macro dmn{unit}
+-@tie{}\unit\
+-@end macro
+-@end ifnottex
+-
+-
+ @c extended commands
+
+ @c Add a title to a DocBook element.
+@@ -80,73 +70,6 @@ not displayed, because of lacking <acronym>SVG</acronym> and
+
+ @c Operators
+
+-@c Generate a nice representation of base^exponent.
+-@macro power{base, exponent}
+-@ifinfo
+-\base\^\exponent\
+-@end ifinfo
+-@html
+-\base\<sup>\exponent\</sup>
+-@end html
+-@tex
+-$\base\^{\exponent\}$%
+-@end tex
+-@docbook
+-\base\<superscript>\exponent\</superscript>
+-@end docbook
+-@end macro
+-
+-
+-@macro classictimes
+-@ifinfo
+-x@c gobble following newline -- The Tricks of a Texinfo Wizard.
+-@end ifinfo
+-@html
+-×
+-@end html
+-@tex
+-\\ifmmode\\times\\else$\\times$\\fi% gobble following newline -- The Tricks of a TeX Wizard.
+-@end tex
+-@docbook
+-×
+-@end docbook
+-@end macro
+-
+-
+-@c Required for older versions of makeinfo. The definition of @geq
+-@c for TeX lives in auxmac.tex.
+-@ifnottex
+-@macro geq
+-@ifinfo
+->=@c
+-@end ifinfo
+-@html
+-≥
+-@end html
+-@docbook
+-≥
+-@end docbook
+-@end macro
+-@end ifnottex
+-
+-
+-@c Required for older versions of makeinfo. The definition of @leq
+-@c for TeX lives in auxmac.tex.
+-@ifnottex
+-@macro leq
+-@ifinfo
+-<=@c
+-@end ifinfo
+-@html
+-≤
+-@end html
+-@docbook
+-≤
+-@end docbook
+-@end macro
+-@end ifnottex
+-
+-
+ @macro plusminus
+ @ifinfo
+ +/-@c
+@@ -163,62 +86,6 @@ x@c gobble following newline -- The Tricks of a Texinfo Wizard.
+ @end macro
+
+
+-@c Special Characters
+-
+-@macro inlineomega
+-@ifinfo
+-@math{omega}@c
+-@end ifinfo
+-@html
+-<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mi>ω</mi>
+-</mathinline>
+-@end html
+-@tex
+-$\\omega$%
+-@end tex
+-@docbook
+-ω
+-@end docbook
+-@end macro
+-
+-
+-@macro inlinesigma
+-@ifinfo
+-@math{sigma}@c
+-@end ifinfo
+-@html
+-<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mi>σ</mi>
+-</mathinline>
+-@end html
+-@tex
+-$\\sigma$%
+-@end tex
+-@docbook
+-σ
+-@end docbook
+-@end macro
+-
+-
+-@macro inlinexi
+-@ifinfo
+-@math{xi}@c
+-@end ifinfo
+-@html
+-<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mi>ξ</mi>
+-</mathinline>
+-@end html
+-@tex
+-$\\xi$%
+-@end tex
+-@docbook
+-ξ
+-@end docbook
+-@end macro
+-
+-
+ @c Text Fragments
+
+ @macro mainpurpose
+@@ -236,26 +103,3 @@ $\\xi$%
+ @noindent
+ @strong{Summary of influential options}
+ @end macro
+-
+-
+-@macro semilog{significant, exponent}
+-@ifinfo
+-\significant\*10^\exponent\@c
+-@end ifinfo
+-@html
+-<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
+- <mn>\significant\</mn>
+- <mo>×</mo>
+- <msup>
+- <mn>10</mn>
+- <mn>\exponent\</mn>
+- </msup>
+-</math>
+-@end html
+-@tex
+-\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi%
+-@end tex
+-@docbook
+-\significant\×10<superscript>\exponent\</superscript>
+-@end docbook
+-@end macro
+diff --git a/doc/bug-reports.texi b/doc/bug-reports.texi
+index 56f8196..82c7476 100644
+--- a/doc/bug-reports.texi
++++ b/doc/bug-reports.texi
+@@ -78,7 +78,7 @@ this by running it with the options @option{--version} and
+ @item
+ A complete set of input images that will reproduce the bug. Strive
+ for a minimal set of @emph{small}@footnote{Images of a size less than
+-1500@classictimes{}1000 pixels qualify as small.} images.
++1500x1000 pixels qualify as small.} images.
+
+ @item
+ The type of machine you are using, and the operating system name and
+diff --git a/doc/enblend.texi b/doc/enblend.texi
+index 17b7c3d..a9a00e8 100644
+--- a/doc/enblend.texi
++++ b/doc/enblend.texi
+@@ -508,9 +508,9 @@ As a guideline, remember that each new level works on a linear scale
+ twice as large as the previous one. So, the zeroth layer, the
+ original image, obviously defines the image at single-pixel scale, the
+ first level works at two-pixel scale, and generally, the @math{n}-th
+-level contains image data at @power{2, n}-pixel scale. This is the
++level contains image data at 2^n-pixel scale. This is the
+ reason why an image of
+-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
++@math{width}x@/@math{height}@dmn{pixels} cannot be
+ deconstructed into a pyramid of more than
+ @ifinfo
+ @display
+@@ -1194,11 +1194,11 @@ For floating-point format, use
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{1.2, -38}
++Minimum normalized value: 1.2e-38
+ @item
+-Epsilon: @semilog{1.2, -7}
++Epsilon: 1.2e-7
+ @item
+-Maximum finite value: @semilog{3.4, 38}
++Maximum finite value: 3.4e38
+ @end itemize
+
+ @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
+@@ -1210,11 +1210,11 @@ Maximum finite value: @semilog{3.4, 38}
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{2.2, -308}
++Minimum normalized value: 2.2e-308
+ @item
+-Epsilon: @semilog{2.2, -16}
++Epsilon: 2.2e-16
+ @item
+-Maximum finite value: @semilog{1.8, 308}
++Maximum finite value: 1.8e308
+ @end itemize
+ @end table
+
+@@ -1236,11 +1236,11 @@ floating-point numbers.
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{9.3, -10}
++Minimum normalized value: 9.3e-10
+ @item
+-Epsilon: @semilog{2.0, -3}
++Epsilon: 2.0e-3
+ @item
+-Maximum finite value: @semilog{4.3, 9}
++Maximum finite value: 4.3e9
+ @end itemize
+
+ @item -f @var{WIDTH}x@var{HEIGHT}
+@@ -1250,7 +1250,7 @@ Maximum finite value: @semilog{4.3, 9}
+ @cindex canvas size
+ @cindex size, canvas
+ Ensure that the minimum ``canvas'' size of the output image is at
+-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
++least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
+ the @var{XOFFSET} and @var{YOFFSET}, too.
+
+ @pindex nona @r{(Hugin)}
+@@ -1572,7 +1572,7 @@ If omitted @var{FACTOR} defaults to
+ @value{src::default-coarseness-factor}, this means,
+ option@tie{}@option{--coarse-mask} shrinks the overlapping
+ @emph{areas} by a factor of
+-@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}.
++@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}.
+ With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a
+ run of Enblend shrinks approximately by 80% and the maximum amount of
+ memory in use at a time is decreased to 60% (Enblend compiled with
+@@ -2494,7 +2494,7 @@ option@tie{}@option{--visualize} to directly judge the effect.
+ When using this option in conjunction with
+ option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the
+ smoothing occurs @emph{after} the overlap regions have been shrunken.
+-Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR}
++Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR}
+ times larger area in the original images.
+
+ Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}.
+@@ -2606,7 +2606,7 @@ of the image and the final seam-line
+ @rimage{seam-line-visualization}
+
+ @caption{Seam-line visualization of a simple overlap. The
+-853@classictimes{}238@dmn{pixel} image is shown at a magification of
++853x238@dmn{pixel} image is shown at a magification of
+ 100%.}
+
+ @shortcaption{Seam-line visualization}
+@@ -2618,7 +2618,7 @@ of the image and the final seam-line
+ @rimage{seam-line-visualization, 15cm}
+
+ @caption{Seam-line visualization of a simple overlap. The
+-853@classictimes{}238@dmn{pixel} image has been rescaled to a width of
++853x238@dmn{pixel} image has been rescaled to a width of
+ approximately 15@dmn{cm}.}
+
+ @shortcaption{Seam-line visualization}
+@@ -2629,7 +2629,7 @@ approximately 15@dmn{cm}.}
+ @float Figure,Figure:seam-line-visualization
+ @rimage{seam-line-visualization, 15cm}
+
+-@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}.}
++@caption{Seam-line visualization of a simple overlap. The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
+
+ @shortcaption{Seam-line visualization}
+ @end float
+diff --git a/doc/enfuse.texi b/doc/enfuse.texi
+index 0dd8c23..59c1dfe 100644
+--- a/doc/enfuse.texi
++++ b/doc/enfuse.texi
+@@ -621,9 +621,9 @@ As a guideline, remember that each new level works on a linear scale
+ twice as large as the previous one. So, the zeroth layer, the
+ original image, obviously defines the image at single-pixel scale, the
+ first level works at two-pixel scale, and generally, the @math{n}-th
+-level contains image data at @power{2, n}-pixel scale. This is the
++level contains image data at 2^n-pixel scale. This is the
+ reason why an image of
+-@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
++@math{width}x@/@math{height}@dmn{pixels} cannot be
+ deconstructed into a pyramid of more than
+ @ifinfo
+ @display
+@@ -1255,11 +1255,11 @@ For floating-point format, use
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{1.2, -38}
++Minimum normalized value: 1.2e-38
+ @item
+-Epsilon: @semilog{1.2, -7}
++Epsilon: 1.2e-7
+ @item
+-Maximum finite value: @semilog{3.4, 38}
++Maximum finite value: 3.4e38
+ @end itemize
+
+ @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
+@@ -1271,11 +1271,11 @@ Maximum finite value: @semilog{3.4, 38}
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{2.2, -308}
++Minimum normalized value: 2.2e-308
+ @item
+-Epsilon: @semilog{2.2, -16}
++Epsilon: 2.2e-16
+ @item
+-Maximum finite value: @semilog{1.8, 308}
++Maximum finite value: 1.8e308
+ @end itemize
+ @end table
+
+@@ -1297,11 +1297,11 @@ floating-point numbers.
+
+ @itemize
+ @item
+-Minimum normalized value: @semilog{9.3, -10}
++Minimum normalized value: 9.3e-10
+ @item
+-Epsilon: @semilog{2.0, -3}
++Epsilon: 2.0e-3
+ @item
+-Maximum finite value: @semilog{4.3, 9}
++Maximum finite value: 4.3e9
+ @end itemize
+
+ @item -f @var{WIDTH}x@var{HEIGHT}
+@@ -1311,7 +1311,7 @@ Maximum finite value: @semilog{4.3, 9}
+ @cindex canvas size
+ @cindex size, canvas
+ Ensure that the minimum ``canvas'' size of the output image is at
+-least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
++least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
+ the @var{XOFFSET} and @var{YOFFSET}, too.
+
+ @pindex nona @r{(Hugin)}
+@@ -1501,8 +1501,8 @@ A positive @var{LCE-SCALE} turns on local contrast enhancement
+ @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement
+ step, @var{LCE-FACTOR} is the weight factor (``strength'').
+
+-@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original}
+-@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original},
++@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original}
++@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original},
+ @var{LCE-SCALE}).
+
+ @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and
+@@ -1531,7 +1531,7 @@ left unchanged. This effectively suppresses weak edges.
+ @opindex --contrast-window-size
+
+ Set the window @var{SIZE} for local contrast analysis. The window
+-will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If
++will be a square of @var{SIZE}x@/@var{SIZE} pixels. If
+ given an even @var{SIZE}, Enfuse will automatically use the next odd
+ number.
+
+@@ -1585,7 +1585,7 @@ output image.
+ @opindex --entropy-window-size
+
+ Window @var{SIZE} for local entropy analysis. The window will be a
+-square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.
++square of @var{SIZE}x@/@var{SIZE} pixels.
+
+ In the entropy calculation @var{SIZE} values of 3 to 7 yield an
+ acceptable compromise of the locality of the information and the
+@@ -2433,20 +2433,6 @@ where @math{x} runs from 1 to the common width of the images, @math{y}
+ from 1 to the common height, and @math{i} from 1 to the number of
+ input images@tie{}@math{n}.
+
+-@macro equationW{}
+-@ifnotdocbook
+-@ifnottex
+-(W)
+-@end ifnottex
+-@end ifnotdocbook
+-@tex
+-(W)%
+-@end tex
+-@docbook
+-<xref linkend="equ:pixel-weighting-function"/>
+-@end docbook
+-@end macro
+-
+ Enfuse allows for weighting the contribution of each @math{P(i, x, y)}
+ to the final @math{Q(x, y)}:
+ @ifinfo
+@@ -2454,7 +2440,7 @@ to the final @math{Q(x, y)}:
+ @math{w(P(1, x, y)) * P(1, x, y) +
+ ... +
+ w(P(n, x, y)) * P(n, x, y)
+---> Q(x, y),}@w{ }@equationW{}
++--> Q(x, y),}
+ @end display
+ @end ifinfo
+ @html
+@@ -2520,9 +2506,6 @@ w(P(n, x, y)) * P(n, x, y)
+ <mi>y</mi>
+ </mfenced>
+ </mrow>
+- <mtext>,</mtext>
+- <mspace width="4em"/>
+- <mtext>@equationW{}</mtext>
+ </mrow>
+ </math>
+ @end html
+@@ -2530,7 +2513,7 @@ w(P(n, x, y)) * P(n, x, y)
+ $$
+ w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y)
+ \rightarrow
+- Q(x, y),\hskip4em\hbox{@equationW{}}
++ Q(x, y)
+ $$
+ @end tex
+ @docbook
+@@ -2948,7 +2931,7 @@ contributes as much as its weight demands. Of course the weights can
+ be extreme, favoring only a few pixels or even only one pixel in the
+ input stack. Extremes are not typical, however.
+
+-Equal weights are another extreme that turns @equationW{} into an
++Equal weights are another extreme that turns the equation into an
+ arithmetic average. This is why we sometimes speak of the ``averaging
+ property'' of this weighting algorithm, like smoothing out noise.
+
+@@ -2969,7 +2952,7 @@ Trouper'') weighting mode, where the pixel with the highest weight
+ wins, this is, gets weight@tie{}one, and all other pixels get the
+ weight of zero
+ (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The
+-Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{}
++Winner Takes It All.''}). With @option{--hard-mask} the equation
+ becomes
+ @ifinfo
+ @display
+@@ -3114,8 +3097,8 @@ where
+
+ @noindent
+ Note that this ``averaging'' scheme lacks the nice noise-reduction
+-property of the weighted average@tie{}@equationW{}, because only a
+-single input pixel contributes to the output.
++property of the weighted average, because only a single input pixel
++contributes to the output.
+
+
+ @node Single Criterion Fusing
+@@ -3562,7 +3545,7 @@ $$
+
+ @noindent
+ It associates a probability@tie{}@math{p} with each of the @math{n}
+-different possible outcomes@tie{}@inlineomega{} of the random
++different possible outcomes@tie{}@math{omega} of the random
+ variable@tie{}@math{X}.
+ @cindex expectation value
+ Based on @math{w}, we define the @dfn{expectation value} or ``First
+@@ -4189,7 +4172,7 @@ $$
+ @end docbook
+
+ @noindent
+-The parameter@tie{}@inlinesigma{}, the argument of
++The parameter@tie{}@math{sigma}, the argument of
+ option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges
+ are detected by @math{g(x, y)}. We apply the Laplacian operator in
+ Cartesian coordinates
+@@ -4401,7 +4384,7 @@ $$
+ </informalequation>
+ @end docbook
+
+-where we have used the dimensionless distance@tie{}@inlinexi{} from
++where we have used the dimensionless distance@tie{}@math{xi} from
+ the origin
+ @ifinfo
+ @display
+@@ -4556,7 +4539,7 @@ $R = \sqrt{x^2 + y^2}$.
+ @float Figure,Figure:laplacian-of-gaussian
+ @vimage{laplacian-of-gaussian}
+
+-@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
++@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.}
+
+ @shortcaption{Laplacian-of-Gaussian}
+ @end float
+@@ -4656,10 +4639,10 @@ Experience has shown that neither the parameters @var{EDGESCALE} and
+ @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only,
+ @acronym{LoG}-only, or a blend of both) scales to different image
+ sizes. In practice, this means that if you start with a set of
+-reduced size images, say 2808@classictimes{}1872 pixels, carefully
++reduced size images, say 2808x1872 pixels, carefully
+ optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find
+ @acronym{LoG}-only the best mode, and then switch to the original
+-resolution of 5616@classictimes{}3744 pixels, multiplying (or
++resolution of 5616x3744 pixels, multiplying (or
+ dividing) the parameters by four and sticking to @acronym{LoG}-only
+ might @emph{not} result in the best fused image. For best quality,
+ perform the parameter optimization and the search for the most
+@@ -5080,9 +5063,9 @@ centers around the image effects.
+ Images should align well to be suitable for fusion. However, there is
+ no hard mathematical rule what ``well'' means. The alignment
+ requirements for 16@dmn{MPixel} images to yield a sharp
+-4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per
++4"x6" print at 300@dmn{dpi} (``dpi'' means dots per
+ inch) or even for web presentation are relatively low, whereas the
+-alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print
++alignment of 8@dmn{MPixel} images for a 12"x18" print
+ ought to be tight.
+
+ @pindex hugin
+@@ -5548,7 +5531,7 @@ next section.
+
+ Let us use an example to illustrate the problem of relating the
+ sharpness with the local contrast variations. Say we use a
+-5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge}
++5x5 contrast window. Moreover, let @code{sharp_edge}
+ and @code{smooth_edge} be two specific configurations:
+
+ @example
+@@ -5727,7 +5710,7 @@ Use @acronym{LoG} to detect edges on a scale of 0.3@dmn{pixels}.
+ Apply the default grayscale projector: @code{average} and throw away
+ all edges with a curvature of less than 0.5% and replace the
+ @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use
+-a window of 7@classictimes{}7@dmn{pixel} window to compute the
++a window of 7x7@dmn{pixel} window to compute the
+ @acronym{SDev}.
+ @end table
+
+--
+2.5.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2015-09-25 15:01 Markus Meier
0 siblings, 0 replies; 6+ messages in thread
From: Markus Meier @ 2015-09-25 15:01 UTC (permalink / raw
To: gentoo-commits
commit: e7d131fac26db3d6c850d8822e430f7256bed96c
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 15:01:13 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 15:01:13 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d131fa
media-gfx/enblend: remove old
Package-Manager: portage-2.2.20.1
media-gfx/enblend/Manifest | 2 -
media-gfx/enblend/enblend-4.1.1-r1.ebuild | 73 ---
media-gfx/enblend/enblend-4.1.1-r2.ebuild | 75 ---
media-gfx/enblend/enblend-4.1.1-r3.ebuild | 79 ---
media-gfx/enblend/enblend-4.1.1.ebuild | 81 ---
media-gfx/enblend/enblend-4.1.2.ebuild | 74 ---
media-gfx/enblend/enblend-4.1.3.ebuild | 77 ---
.../files/enblend-4.1.1-texinfo-5-upstream.patch | 617 ---------------------
8 files changed, 1078 deletions(-)
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 8e9dbf3..a505c8f 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,3 +1 @@
-DIST enblend-enfuse-4.1.1.tar.gz 850214 SHA256 9d0947633ebaa0dc1211331b31009408de6fe2108751ad4190760e3a9f181bc9 SHA512 dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f WHIRLPOOL c9938499116f26f3bfe6eae874414722a15380cbda959c82315bb124cb7b58456550174b0d43355d924cb6e107ef3ee4d1b83f8adc82d7144d974b66207ff965
-DIST enblend-enfuse-4.1.2.tar.gz 869265 SHA256 6dc2682d366776ff771fd6c9ae709bcfef0b7b00cac9e620b56d13bf81faaf6e SHA512 8d4fa80bb455276e79e7ee4e757c8774bb0380fa2ef56835e18a02fda12b710eaad0a90f2849dc2297eb7cd477dc7134a90a61708373928463595d726ded0259 WHIRLPOOL e0834b7e9461ae3d29e52cd21cd8c41384356026f3e62b7c60cbb60ba02edc23c844862afac001cb20b5da828a11ec7f9bd4d604ab77177ca318e400ccf70650
DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48
diff --git a/media-gfx/enblend/enblend-4.1.1-r1.ebuild b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
deleted file mode 100644
index 20e2832..0000000
--- a/media-gfx/enblend/enblend-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
- media-libs/glew
- =media-libs/lcms-2*
- >=media-libs/libpng-1.2.43:0=
- >=media-libs/openexr-1.0:=
- media-libs/plotutils[X]
- media-libs/tiff
- >=media-libs/vigra-1.8.0
- sci-libs/gsl
- virtual/jpeg:0=
- debug? ( dev-libs/dmalloc )
- gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.31.0:=
- virtual/pkgconfig
- doc? (
- media-gfx/imagemagick
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
- sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE=""
- $(cmake-utils_use_enable debug DMALLOC)
- $(cmake-utils_use doc DOC)
- $(cmake-utils_use_enable image-cache IMAGECACHE)
- $(cmake-utils_use_enable openmp)
- $(cmake-utils_use_enable gpu)
- )
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog NEWS README )
- cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.1-r2.ebuild b/media-gfx/enblend/enblend-4.1.1-r2.ebuild
deleted file mode 100644
index aea8156..0000000
--- a/media-gfx/enblend/enblend-4.1.1-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
- media-libs/glew
- =media-libs/lcms-2*
- >=media-libs/libpng-1.2.43:0=
- >=media-libs/openexr-1.0:=
- media-libs/plotutils[X]
- media-libs/tiff
- >=media-libs/vigra-1.8.0
- sci-libs/gsl
- virtual/jpeg:0=
- debug? ( dev-libs/dmalloc )
- gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.31.0:=
- virtual/pkgconfig
- doc? (
- media-gfx/imagemagick
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.1.3-vigra_check.patch
-
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
- sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE=""
- $(cmake-utils_use_enable debug DMALLOC)
- $(cmake-utils_use doc DOC)
- $(cmake-utils_use_enable image-cache IMAGECACHE)
- $(cmake-utils_use_enable openmp)
- $(cmake-utils_use_enable gpu)
- )
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog NEWS README )
- cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.1-r3.ebuild b/media-gfx/enblend/enblend-4.1.1-r3.ebuild
deleted file mode 100644
index 2e46825..0000000
--- a/media-gfx/enblend/enblend-4.1.1-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
- media-libs/glew
- =media-libs/lcms-2*
- >=media-libs/libpng-1.2.43:0=
- >=media-libs/openexr-1.0:=
- media-libs/plotutils[X]
- media-libs/tiff
- >=media-libs/vigra-1.8.0
- sci-libs/gsl
- virtual/jpeg:0=
- debug? ( dev-libs/dmalloc )
- gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.31.0:=
- virtual/pkgconfig
- doc? (
- media-gfx/imagemagick
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.1.3-vigra_check.patch
-
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
- sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-
- epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
- epatch "${FILESDIR}"/${PN}-4.1.3-texinfo-5-more.patch
-
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE=""
- $(cmake-utils_use_enable debug DMALLOC)
- $(cmake-utils_use doc DOC)
- $(cmake-utils_use_enable image-cache IMAGECACHE)
- $(cmake-utils_use_enable openmp)
- $(cmake-utils_use_enable gpu)
- )
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog NEWS README )
- cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.1.ebuild b/media-gfx/enblend/enblend-4.1.1.ebuild
deleted file mode 100644
index 20e6ba7..0000000
--- a/media-gfx/enblend/enblend-4.1.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc gpu +image-cache +openexr openmp"
-
-RDEPEND="
- media-libs/glew
- =media-libs/lcms-2*
- >=media-libs/libpng-1.2.43
- media-libs/plotutils[X]
- media-libs/tiff
- >=media-libs/vigra-1.8.0
- sci-libs/gsl
- virtual/jpeg
- gpu? ( media-libs/freeglut )
- openexr? ( >=media-libs/openexr-1.0 )"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.31.0
- virtual/pkgconfig
- doc? (
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use image-cache && use openmp; then
- ewarn "the openmp and image-cache USE-flags are mutually exclusive"
- ewarn "image-cache will be disabled in favour of openmp"
- fi
-}
-
-src_configure() {
- local myconf="--with-boost-filesystem"
- if use image-cache && use openmp; then
- myconf="${myconf} --disable-image-cache --enable-openmp"
- else
- myconf="${myconf} $(use_enable image-cache) $(use_enable openmp)"
- fi
-
- use doc && myconf="${myconf} --with-gnuplot=$(type -p gnuplot)" \
- || myconf="${myconf} --with-gnuplot=false"
-
- econf \
- --with-x \
- $(use_enable debug) \
- $(use_enable gpu gpu-support) \
- $(use_with openexr) \
- ${myconf}
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- emake -j1 || die
- if use doc; then
- cd doc
- make enblend.pdf enfuse.pdf || die
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README || die
- use doc && dodoc doc/en{blend,fuse}.pdf
-}
diff --git a/media-gfx/enblend/enblend-4.1.2.ebuild b/media-gfx/enblend/enblend-4.1.2.ebuild
deleted file mode 100644
index 5078db9..0000000
--- a/media-gfx/enblend/enblend-4.1.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
- media-libs/glew
- =media-libs/lcms-2*
- >=media-libs/libpng-1.2.43:0=
- >=media-libs/openexr-1.0:=
- media-libs/plotutils[X]
- media-libs/tiff
- >=media-libs/vigra-1.8.0
- sci-libs/gsl
- virtual/jpeg:0=
- debug? ( dev-libs/dmalloc )
- gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.31.0:=
- sys-apps/help2man
- virtual/pkgconfig
- doc? (
- media-gfx/imagemagick
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
- sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE=""
- $(cmake-utils_use_enable debug DMALLOC)
- $(cmake-utils_use doc DOC)
- $(cmake-utils_use_enable image-cache IMAGECACHE)
- $(cmake-utils_use_enable openmp)
- $(cmake-utils_use_enable gpu)
- )
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog NEWS README )
- cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.3.ebuild b/media-gfx/enblend/enblend-4.1.3.ebuild
deleted file mode 100644
index 2f5e564..0000000
--- a/media-gfx/enblend/enblend-4.1.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
- >=dev-libs/boost-1.31.0:=
- media-libs/glew
- >=media-libs/lcms-2.5:2
- >=media-libs/libpng-1.2.43:0=
- >=media-libs/openexr-1.0:=
- media-libs/plotutils[X]
- media-libs/tiff:=
- >=media-libs/vigra-1.8.0[openexr]
- sci-libs/gsl
- virtual/jpeg:0=
- debug? ( dev-libs/dmalloc )
- gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
- media-gfx/imagemagick
- sys-apps/help2man
- virtual/pkgconfig
- doc? (
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" )
-
-src_prepare() {
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
- sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE=""
- -DMAKEINFO_EXE="/bin/true"
- $(cmake-utils_use_enable debug DMALLOC)
- $(cmake-utils_use doc DOC)
- $(cmake-utils_use_enable image-cache IMAGECACHE)
- $(cmake-utils_use_enable openmp)
- $(cmake-utils_use_enable gpu)
- )
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog NEWS README )
- cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch
deleted file mode 100644
index 8399f23..0000000
--- a/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch
+++ /dev/null
@@ -1,617 +0,0 @@
-From 0a60c121addb1b850f52281d898bdf1e04d920ad Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 16 Aug 2015 20:01:15 +0200
-Subject: [PATCH] Port enblend-4.1.3-texinfo-5-upstream.patch to 4.1.1
-
----
- doc/Makefile.am | 2 +-
- doc/auxmac.tex | 7 ---
- doc/auxmac.texi | 156 ---------------------------------------------------
- doc/bug-reports.texi | 2 +-
- doc/enblend.texi | 34 +++++------
- doc/enfuse.texi | 81 +++++++++++---------------
- 6 files changed, 51 insertions(+), 231 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 22c7fbc..40bb394 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = @AM_MAKEINFOHTMLFLAGS@ \
- -I $(top_builddir) -I $(srcdir) \
- --css-include=@srcdir@/default.css \
- $(MAKEINFOHTMLFLAGS)
--export TEXINPUTS=$(top_builddir):$(srcdir)
-+export TEXINPUTS = .:$(top_builddir):$(srcdir):
-
- TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
-
-diff --git a/doc/auxmac.tex b/doc/auxmac.tex
-index 812d58d..524830f 100644
---- a/doc/auxmac.tex
-+++ b/doc/auxmac.tex
-@@ -1,13 +1,6 @@
--\input thumbpdf.sty
--
--
- % Auxilliary Macros.
- %
- % Include this file before texinfo.tex!
-
- \def\mathit#1{\hbox{\it #1}}
- \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi}
--
--% These definitions are required for older versions of texinfo.tex.
--\def\geq{\ifmmode \ge\else $\ge$\fi}
--\def\leq{\ifmmode \le\else $\le$\fi}
-diff --git a/doc/auxmac.texi b/doc/auxmac.texi
-index 98c679f..59520c3 100644
---- a/doc/auxmac.texi
-+++ b/doc/auxmac.texi
-@@ -2,16 +2,6 @@
- @c Macro Definitions
- @c
-
--@c redefined commands
--
--@c Get the spacing of dimensions right.
--@ifnottex
--@macro dmn{unit}
--@tie{}\unit\
--@end macro
--@end ifnottex
--
--
- @c extended commands
-
- @c Add a title to a DocBook element.
-@@ -80,73 +70,6 @@ not displayed, because of lacking <acronym>SVG</acronym> and
-
- @c Operators
-
--@c Generate a nice representation of base^exponent.
--@macro power{base, exponent}
--@ifinfo
--\base\^\exponent\
--@end ifinfo
--@html
--\base\<sup>\exponent\</sup>
--@end html
--@tex
--$\base\^{\exponent\}$%
--@end tex
--@docbook
--\base\<superscript>\exponent\</superscript>
--@end docbook
--@end macro
--
--
--@macro classictimes
--@ifinfo
--x@c gobble following newline -- The Tricks of a Texinfo Wizard.
--@end ifinfo
--@html
--×
--@end html
--@tex
--\\ifmmode\\times\\else$\\times$\\fi% gobble following newline -- The Tricks of a TeX Wizard.
--@end tex
--@docbook
--×
--@end docbook
--@end macro
--
--
--@c Required for older versions of makeinfo. The definition of @geq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro geq
--@ifinfo
-->=@c
--@end ifinfo
--@html
--≥
--@end html
--@docbook
--≥
--@end docbook
--@end macro
--@end ifnottex
--
--
--@c Required for older versions of makeinfo. The definition of @leq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro leq
--@ifinfo
--<=@c
--@end ifinfo
--@html
--≤
--@end html
--@docbook
--≤
--@end docbook
--@end macro
--@end ifnottex
--
--
- @macro plusminus
- @ifinfo
- +/-@c
-@@ -163,62 +86,6 @@ x@c gobble following newline -- The Tricks of a Texinfo Wizard.
- @end macro
-
-
--@c Special Characters
--
--@macro inlineomega
--@ifinfo
--@math{omega}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mi>ω</mi>
--</mathinline>
--@end html
--@tex
--$\\omega$%
--@end tex
--@docbook
--ω
--@end docbook
--@end macro
--
--
--@macro inlinesigma
--@ifinfo
--@math{sigma}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mi>σ</mi>
--</mathinline>
--@end html
--@tex
--$\\sigma$%
--@end tex
--@docbook
--σ
--@end docbook
--@end macro
--
--
--@macro inlinexi
--@ifinfo
--@math{xi}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mi>ξ</mi>
--</mathinline>
--@end html
--@tex
--$\\xi$%
--@end tex
--@docbook
--ξ
--@end docbook
--@end macro
--
--
- @c Text Fragments
-
- @macro mainpurpose
-@@ -236,26 +103,3 @@ $\\xi$%
- @noindent
- @strong{Summary of influential options}
- @end macro
--
--
--@macro semilog{significant, exponent}
--@ifinfo
--\significant\*10^\exponent\@c
--@end ifinfo
--@html
--<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mn>\significant\</mn>
-- <mo>×</mo>
-- <msup>
-- <mn>10</mn>
-- <mn>\exponent\</mn>
-- </msup>
--</math>
--@end html
--@tex
--\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi%
--@end tex
--@docbook
--\significant\×10<superscript>\exponent\</superscript>
--@end docbook
--@end macro
-diff --git a/doc/bug-reports.texi b/doc/bug-reports.texi
-index 56f8196..82c7476 100644
---- a/doc/bug-reports.texi
-+++ b/doc/bug-reports.texi
-@@ -78,7 +78,7 @@ this by running it with the options @option{--version} and
- @item
- A complete set of input images that will reproduce the bug. Strive
- for a minimal set of @emph{small}@footnote{Images of a size less than
--1500@classictimes{}1000 pixels qualify as small.} images.
-+1500x1000 pixels qualify as small.} images.
-
- @item
- The type of machine you are using, and the operating system name and
-diff --git a/doc/enblend.texi b/doc/enblend.texi
-index 17b7c3d..a9a00e8 100644
---- a/doc/enblend.texi
-+++ b/doc/enblend.texi
-@@ -508,9 +508,9 @@ As a guideline, remember that each new level works on a linear scale
- twice as large as the previous one. So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale. This is the
-+level contains image data at 2^n-pixel scale. This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1194,11 +1194,11 @@ For floating-point format, use
-
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
-
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1210,11 +1210,11 @@ Maximum finite value: @semilog{3.4, 38}
-
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
-
-@@ -1236,11 +1236,11 @@ floating-point numbers.
-
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
-
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1250,7 +1250,7 @@ Maximum finite value: @semilog{4.3, 9}
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
-
- @pindex nona @r{(Hugin)}
-@@ -1572,7 +1572,7 @@ If omitted @var{FACTOR} defaults to
- @value{src::default-coarseness-factor}, this means,
- option@tie{}@option{--coarse-mask} shrinks the overlapping
- @emph{areas} by a factor of
--@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}.
-+@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}.
- With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a
- run of Enblend shrinks approximately by 80% and the maximum amount of
- memory in use at a time is decreased to 60% (Enblend compiled with
-@@ -2494,7 +2494,7 @@ option@tie{}@option{--visualize} to directly judge the effect.
- When using this option in conjunction with
- option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the
- smoothing occurs @emph{after} the overlap regions have been shrunken.
--Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR}
-+Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR}
- times larger area in the original images.
-
- Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}.
-@@ -2606,7 +2606,7 @@ of the image and the final seam-line
- @rimage{seam-line-visualization}
-
- @caption{Seam-line visualization of a simple overlap. The
--853@classictimes{}238@dmn{pixel} image is shown at a magification of
-+853x238@dmn{pixel} image is shown at a magification of
- 100%.}
-
- @shortcaption{Seam-line visualization}
-@@ -2618,7 +2618,7 @@ of the image and the final seam-line
- @rimage{seam-line-visualization, 15cm}
-
- @caption{Seam-line visualization of a simple overlap. The
--853@classictimes{}238@dmn{pixel} image has been rescaled to a width of
-+853x238@dmn{pixel} image has been rescaled to a width of
- approximately 15@dmn{cm}.}
-
- @shortcaption{Seam-line visualization}
-@@ -2629,7 +2629,7 @@ approximately 15@dmn{cm}.}
- @float Figure,Figure:seam-line-visualization
- @rimage{seam-line-visualization, 15cm}
-
--@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}.}
-+@caption{Seam-line visualization of a simple overlap. The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
-
- @shortcaption{Seam-line visualization}
- @end float
-diff --git a/doc/enfuse.texi b/doc/enfuse.texi
-index 0dd8c23..59c1dfe 100644
---- a/doc/enfuse.texi
-+++ b/doc/enfuse.texi
-@@ -621,9 +621,9 @@ As a guideline, remember that each new level works on a linear scale
- twice as large as the previous one. So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale. This is the
-+level contains image data at 2^n-pixel scale. This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1255,11 +1255,11 @@ For floating-point format, use
-
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
-
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1271,11 +1271,11 @@ Maximum finite value: @semilog{3.4, 38}
-
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
-
-@@ -1297,11 +1297,11 @@ floating-point numbers.
-
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
-
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1311,7 +1311,7 @@ Maximum finite value: @semilog{4.3, 9}
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
-
- @pindex nona @r{(Hugin)}
-@@ -1501,8 +1501,8 @@ A positive @var{LCE-SCALE} turns on local contrast enhancement
- @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement
- step, @var{LCE-FACTOR} is the weight factor (``strength'').
-
--@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original}
--@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original},
-+@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original}
-+@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original},
- @var{LCE-SCALE}).
-
- @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and
-@@ -1531,7 +1531,7 @@ left unchanged. This effectively suppresses weak edges.
- @opindex --contrast-window-size
-
- Set the window @var{SIZE} for local contrast analysis. The window
--will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If
-+will be a square of @var{SIZE}x@/@var{SIZE} pixels. If
- given an even @var{SIZE}, Enfuse will automatically use the next odd
- number.
-
-@@ -1585,7 +1585,7 @@ output image.
- @opindex --entropy-window-size
-
- Window @var{SIZE} for local entropy analysis. The window will be a
--square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.
-+square of @var{SIZE}x@/@var{SIZE} pixels.
-
- In the entropy calculation @var{SIZE} values of 3 to 7 yield an
- acceptable compromise of the locality of the information and the
-@@ -2433,20 +2433,6 @@ where @math{x} runs from 1 to the common width of the images, @math{y}
- from 1 to the common height, and @math{i} from 1 to the number of
- input images@tie{}@math{n}.
-
--@macro equationW{}
--@ifnotdocbook
--@ifnottex
--(W)
--@end ifnottex
--@end ifnotdocbook
--@tex
--(W)%
--@end tex
--@docbook
--<xref linkend="equ:pixel-weighting-function"/>
--@end docbook
--@end macro
--
- Enfuse allows for weighting the contribution of each @math{P(i, x, y)}
- to the final @math{Q(x, y)}:
- @ifinfo
-@@ -2454,7 +2440,7 @@ to the final @math{Q(x, y)}:
- @math{w(P(1, x, y)) * P(1, x, y) +
- ... +
- w(P(n, x, y)) * P(n, x, y)
----> Q(x, y),}@w{ }@equationW{}
-+--> Q(x, y),}
- @end display
- @end ifinfo
- @html
-@@ -2520,9 +2506,6 @@ w(P(n, x, y)) * P(n, x, y)
- <mi>y</mi>
- </mfenced>
- </mrow>
-- <mtext>,</mtext>
-- <mspace width="4em"/>
-- <mtext>@equationW{}</mtext>
- </mrow>
- </math>
- @end html
-@@ -2530,7 +2513,7 @@ w(P(n, x, y)) * P(n, x, y)
- $$
- w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y)
- \rightarrow
-- Q(x, y),\hskip4em\hbox{@equationW{}}
-+ Q(x, y)
- $$
- @end tex
- @docbook
-@@ -2948,7 +2931,7 @@ contributes as much as its weight demands. Of course the weights can
- be extreme, favoring only a few pixels or even only one pixel in the
- input stack. Extremes are not typical, however.
-
--Equal weights are another extreme that turns @equationW{} into an
-+Equal weights are another extreme that turns the equation into an
- arithmetic average. This is why we sometimes speak of the ``averaging
- property'' of this weighting algorithm, like smoothing out noise.
-
-@@ -2969,7 +2952,7 @@ Trouper'') weighting mode, where the pixel with the highest weight
- wins, this is, gets weight@tie{}one, and all other pixels get the
- weight of zero
- (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The
--Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{}
-+Winner Takes It All.''}). With @option{--hard-mask} the equation
- becomes
- @ifinfo
- @display
-@@ -3114,8 +3097,8 @@ where
-
- @noindent
- Note that this ``averaging'' scheme lacks the nice noise-reduction
--property of the weighted average@tie{}@equationW{}, because only a
--single input pixel contributes to the output.
-+property of the weighted average, because only a single input pixel
-+contributes to the output.
-
-
- @node Single Criterion Fusing
-@@ -3562,7 +3545,7 @@ $$
-
- @noindent
- It associates a probability@tie{}@math{p} with each of the @math{n}
--different possible outcomes@tie{}@inlineomega{} of the random
-+different possible outcomes@tie{}@math{omega} of the random
- variable@tie{}@math{X}.
- @cindex expectation value
- Based on @math{w}, we define the @dfn{expectation value} or ``First
-@@ -4189,7 +4172,7 @@ $$
- @end docbook
-
- @noindent
--The parameter@tie{}@inlinesigma{}, the argument of
-+The parameter@tie{}@math{sigma}, the argument of
- option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges
- are detected by @math{g(x, y)}. We apply the Laplacian operator in
- Cartesian coordinates
-@@ -4401,7 +4384,7 @@ $$
- </informalequation>
- @end docbook
-
--where we have used the dimensionless distance@tie{}@inlinexi{} from
-+where we have used the dimensionless distance@tie{}@math{xi} from
- the origin
- @ifinfo
- @display
-@@ -4556,7 +4539,7 @@ $R = \sqrt{x^2 + y^2}$.
- @float Figure,Figure:laplacian-of-gaussian
- @vimage{laplacian-of-gaussian}
-
--@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
-+@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.}
-
- @shortcaption{Laplacian-of-Gaussian}
- @end float
-@@ -4656,10 +4639,10 @@ Experience has shown that neither the parameters @var{EDGESCALE} and
- @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only,
- @acronym{LoG}-only, or a blend of both) scales to different image
- sizes. In practice, this means that if you start with a set of
--reduced size images, say 2808@classictimes{}1872 pixels, carefully
-+reduced size images, say 2808x1872 pixels, carefully
- optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find
- @acronym{LoG}-only the best mode, and then switch to the original
--resolution of 5616@classictimes{}3744 pixels, multiplying (or
-+resolution of 5616x3744 pixels, multiplying (or
- dividing) the parameters by four and sticking to @acronym{LoG}-only
- might @emph{not} result in the best fused image. For best quality,
- perform the parameter optimization and the search for the most
-@@ -5080,9 +5063,9 @@ centers around the image effects.
- Images should align well to be suitable for fusion. However, there is
- no hard mathematical rule what ``well'' means. The alignment
- requirements for 16@dmn{MPixel} images to yield a sharp
--4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per
-+4"x6" print at 300@dmn{dpi} (``dpi'' means dots per
- inch) or even for web presentation are relatively low, whereas the
--alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print
-+alignment of 8@dmn{MPixel} images for a 12"x18" print
- ought to be tight.
-
- @pindex hugin
-@@ -5548,7 +5531,7 @@ next section.
-
- Let us use an example to illustrate the problem of relating the
- sharpness with the local contrast variations. Say we use a
--5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge}
-+5x5 contrast window. Moreover, let @code{sharp_edge}
- and @code{smooth_edge} be two specific configurations:
-
- @example
-@@ -5727,7 +5710,7 @@ Use @acronym{LoG} to detect edges on a scale of 0.3@dmn{pixels}.
- Apply the default grayscale projector: @code{average} and throw away
- all edges with a curvature of less than 0.5% and replace the
- @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use
--a window of 7@classictimes{}7@dmn{pixel} window to compute the
-+a window of 7x7@dmn{pixel} window to compute the
- @acronym{SDev}.
- @end table
-
---
-2.5.0
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2018-06-06 8:13 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-06-06 8:13 UTC (permalink / raw
To: gentoo-commits
commit: eb1b6a890b2878e23d0f88e4aa9a0e85cee0b19a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 3 12:59:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 08:06:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1b6a89
media-gfx/enblend: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-gfx/enblend/Manifest | 1 -
media-gfx/enblend/enblend-4.1.3-r1.ebuild | 78 ---
media-gfx/enblend/enblend-4.1.3-r2.ebuild | 86 ---
media-gfx/enblend/files/enblend-4.1.3-cmake.patch | 22 -
.../files/enblend-4.1.3-texinfo-5-more.patch | 82 ---
.../files/enblend-4.1.3-texinfo-5-upstream.patch | 633 ---------------------
.../enblend/files/enblend-4.1.3-vigra_check.patch | 11 -
media-gfx/enblend/metadata.xml | 4 -
8 files changed, 917 deletions(-)
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 1404379d87c..566364e01dc 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,2 +1 @@
DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-DIST enblend-enfuse-4.1.3.tar.gz 862079 BLAKE2B 1ea6d909bbc32d6141090862f658cc29ee0156e898e133fa88a10d1ea1df1e3eb0b6481010a0b3c0795bce0345ff3a77d1916310bc7b39fb292478c622d4493a SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
deleted file mode 100644
index 6f9f1fa5833..00000000000
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
- >=dev-libs/boost-1.31.0:=
- media-libs/glew
- >=media-libs/lcms-2.5:2
- >=media-libs/libpng-1.2.43:0=
- >=media-libs/openexr-1.0:=
- media-libs/plotutils[X]
- media-libs/tiff:=
- >=media-libs/vigra-1.8.0[openexr]
- sci-libs/gsl:=
- virtual/jpeg:0=
- debug? ( dev-libs/dmalloc )
- gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
- media-gfx/imagemagick
- sys-apps/help2man
- virtual/pkgconfig
- doc? (
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" )
-
-src_prepare() {
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
- sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
- cmake-utils_src_prepare
-
- epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
- epatch "${FILESDIR}"/${P}-texinfo-5-more.patch
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE=""
- $(cmake-utils_use_enable debug DMALLOC)
- $(cmake-utils_use doc DOC)
- $(cmake-utils_use_enable image-cache IMAGECACHE)
- $(cmake-utils_use_enable openmp)
- $(cmake-utils_use_enable gpu)
- )
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog NEWS README )
- cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
deleted file mode 100644
index 296bc122df5..00000000000
--- a/media-gfx/enblend/enblend-4.1.3-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P="${PN}-enfuse-${PV}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gpu openmp"
-
-RDEPEND="
- dev-libs/boost:=
- media-libs/lcms:2
- media-libs/openexr:=
- media-libs/tiff:=
- media-libs/vigra[openexr]
- sci-libs/gsl:=
- debug? ( dev-libs/dmalloc )
- gpu? (
- media-libs/freeglut
- media-libs/glew:*
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${RDEPEND}
- media-libs/libpng:0
- sys-apps/help2man
- virtual/jpeg:0
- virtual/pkgconfig
- doc? (
- media-gfx/transfig
- sci-visualization/gnuplot[gd]
- virtual/imagemagick-tools
- virtual/latex-base
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
- "${FILESDIR}"/${P}-vigra_check.patch
- "${FILESDIR}"/${P}-texinfo-5-upstream.patch
- "${FILESDIR}"/${P}-texinfo-5-more.patch
- "${FILESDIR}"/${P}-cmake.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # CRLF in files, don't bother with patch
- sed -i -e "/FIND_LIBRARY(LCMS2_LIBRARIES/s/lib32/lib/" \
- CMakeModules/FindLCMS2.cmake || die
- sed -e "/FIND_LIBRARY(OPENGL_gl_LIBRARY/s/lib32/lib/" \
- -e "/NAMES.*MesaGLU/s/lib32/lib/" \
- -i CMakeModules/FindOpenGL.cmake || die
-
- sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
- sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE=""
- -DENABLE_DMALLOC=$(usex debug)
- -DDOC=$(usex doc)
- -DENABLE_GPU=$(usex gpu)
- -DENABLE_IMAGECACHE=$(usex !openmp)
- -DENABLE_OPENMP=$(usex openmp)
- )
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
-
-src_compile() {
- # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
- cmake-utils_src_compile -j1
-}
diff --git a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
deleted file mode 100644
index e9fef85278d..00000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt 2017-02-12 13:43:46.862787952 +0100
-+++ b/CMakeLists.txt 2017-02-12 13:50:03.461229021 +0100
-@@ -185,7 +185,6 @@
- FIND_PACKAGE(TIFF REQUIRED)
- FIND_PACKAGE(Perl REQUIRED)
- # this one is needed in doc. (Especially the program "convert")
--FIND_PACKAGE(ImageMagick REQUIRED)
- FIND_PACKAGE(GSL REQUIRED)
- include_directories(${GSL_INCLUDE_DIR})
- LIST(APPEND common_libs ${LCMS2_LIBRARIES} ${TIFF_LIBRARIES} ${GSL_LIBRARIES})
-@@ -394,8 +393,9 @@
- add_subdirectory(src)
-
- # you really should have perl installed, when creating doc's
--if (PERL_FOUND AND IMAGEMAGICK_FOUND AND DOC)
-- # this should be set from comman line
-+if (PERL_FOUND AND DOC)
-+ FIND_PACKAGE(ImageMagick REQUIRED)
-+ # this should be set from command line
- # Possible values like described in README: @smallbook @afivepaper @afourpaper @afourwide @afourlatex
- # @letter is default
- set(EXTRATEXI2DVIFLAGS "@afourpaper" CACHE STRING "Papersize: @letter @smallbook @afivepaper @afourpaper @afourwide @afourlatex")
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
deleted file mode 100644
index dd63ae3697a..00000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7ec0e758430f9e31fb9fc0f85d72339a307263d6 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 14 Aug 2015 03:09:57 +0200
-Subject: [PATCH] Texinfo: Fix parameter handling with macro "mainpurpose"
-
----
- doc/auxmac.texi | 6 +++---
- doc/enfuse.texi | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/doc/auxmac.texi b/doc/auxmac.texi
-index 59520c3..ad35d6a 100644
---- a/doc/auxmac.texi
-+++ b/doc/auxmac.texi
-@@ -88,12 +88,12 @@ not displayed, because of lacking <acronym>SVG</acronym> and
-
- @c Text Fragments
-
--@macro mainpurpose
-+@macro mainpurpose{purpose}
- @ifinfo
--@strong{Main Purpose}:
-+@strong{Main Purpose}: \purpose\
- @end ifinfo
- @ifnotinfo
--@strong{Main Purpose: }
-+@strong{Main Purpose: }\purpose\
- @end ifnotinfo
- @end macro
-
-diff --git a/doc/enfuse.texi b/doc/enfuse.texi
-index 92fe597..9e601ea 100644
---- a/doc/enfuse.texi
-+++ b/doc/enfuse.texi
-@@ -5164,7 +5164,7 @@ Fire in rapid succession.
- @cindex series, simple
- @cindex noise reduction
-
--@mainpurpose Reduce noise
-+@mainpurpose{Reduce noise}
-
- @noindent
- With the default settings, Enfuse computes a weighted average of the
-@@ -5193,7 +5193,7 @@ be worth an extra run.
- @cindex series, exposure
- @cindex dynamic range increase
-
--@mainpurpose Increase manageable dynamic range
-+@mainpurpose{Increase manageable dynamic range}
-
- @noindent
- An exposure series is a set of images taken with identical parameters
-@@ -5322,7 +5322,7 @@ the multiply occuring exposures and reducing noise.
- @cindex series, flash exposure
- @cindex dynamic range increase
-
--@mainpurpose ???
-+@mainpurpose{???}
-
- ...
-
-@@ -5333,7 +5333,7 @@ the multiply occuring exposures and reducing noise.
- @cindex series, polarization
- @cindex saturation enhancement
-
--@mainpurpose Reflection suppression, saturation enhancement
-+@mainpurpose{Reflection suppression, saturation enhancement}
-
- In the current implementation of Enfuse, it is not possible in general
- to fuse a polarization series. Naively abusing
-@@ -5345,7 +5345,7 @@ to fuse a polarization series. Naively abusing
- @cindex focus stacks
- @cindex depth-of-focus increase
-
--@mainpurpose Synthetic Depth-of-Field Increase
-+@mainpurpose{Synthetic Depth-of-Field Increase}
-
- A @dfn{focus stack} is a series of images where the distance of the
- focal plane from the sensor varies. Sloppily speaking, the images
---
-2.5.0
-
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
deleted file mode 100644
index ef04aa73633..00000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch
+++ /dev/null
@@ -1,633 +0,0 @@
-# HG changeset patch
-# User Chris <cspiel@users.sourceforge.net>
-# Date 1438958604 -7200
-# Node ID 8387f0170f7b352baea887f77960e8066185a6cd
-# Parent c1bcd2df4e3724f3bb0414d3a5e2e9302be78921
-Get the Texinfo documentation to translate again with makeinfo-5.2.
-
-This patch takes thus care of issue #1181678
- https://bugs.launchpad.net/enblend/+bug/1181678
-
-We do not strive for a nicely formatted documentation anymore in the
-Stable Branch, because the Development Branch already has a flawless
-new documentation *not* based on Texinfo.
-
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/Makefile.am
---- a/doc/Makefile.am Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/Makefile.am Fri Aug 07 16:43:24 2015 +0200
-@@ -46,7 +46,7 @@
- -I $(top_builddir) -I $(srcdir) \
- --css-include=@srcdir@/default.css \
- $(MAKEINFOHTMLFLAGS)
--export TEXINPUTS=$(top_builddir):$(srcdir)
-+export TEXINPUTS = .:$(top_builddir):$(srcdir):
-
- TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
-
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.tex
---- a/doc/auxmac.tex Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/auxmac.tex Fri Aug 07 16:43:24 2015 +0200
-@@ -1,13 +1,6 @@
--\input thumbpdf.sty
--
--
- % Auxilliary Macros.
- %
- % Include this file before texinfo.tex!
-
- \def\mathit#1{\hbox{\it #1}}
- \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi}
--
--% These definitions are required for older versions of texinfo.tex.
--\def\geq{\ifmmode \ge\else $\ge$\fi}
--\def\leq{\ifmmode \le\else $\le$\fi}
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.texi
---- a/doc/auxmac.texi Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/auxmac.texi Fri Aug 07 16:43:24 2015 +0200
-@@ -2,16 +2,6 @@
- @c Macro Definitions
- @c
-
--@c redefined commands
--
--@c Get the spacing of dimensions right.
--@ifnottex
--@macro dmn{unit}
--@tie{}\unit\
--@end macro
--@end ifnottex
--
--
- @c extended commands
-
- @c Add a title to a DocBook element.
-@@ -80,73 +70,6 @@
-
- @c Operators
-
--@c Generate a nice representation of base^exponent.
--@macro power{base, exponent}
--@ifinfo
--\base\^\exponent\
--@end ifinfo
--@html
--\base\<sup>\exponent\</sup>
--@end html
--@tex
--$\base\^{\exponent\}$%
--@end tex
--@docbook
--\base\<superscript>\exponent\</superscript>
--@end docbook
--@end macro
--
--
--@macro classictimes
--@ifinfo
--x@c gobble following newline -- The Tricks of a Texinfo Wizard.
--@end ifinfo
--@html
--×
--@end html
--@tex
--\\ifmmode\\times\\else$\\times$\\fi% gobble following newline -- The Tricks of a TeX Wizard.
--@end tex
--@docbook
--×
--@end docbook
--@end macro
--
--
--@c Required for older versions of makeinfo. The definition of @geq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro geq
--@ifinfo
-->=@c
--@end ifinfo
--@html
--≥
--@end html
--@docbook
--≥
--@end docbook
--@end macro
--@end ifnottex
--
--
--@c Required for older versions of makeinfo. The definition of @leq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro leq
--@ifinfo
--<=@c
--@end ifinfo
--@html
--≤
--@end html
--@docbook
--≤
--@end docbook
--@end macro
--@end ifnottex
--
--
- @macro plusminus
- @ifinfo
- +/-@c
-@@ -163,62 +86,6 @@
- @end macro
-
-
--@c Special Characters
--
--@macro inlineomega
--@ifinfo
--@math{omega}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mi>ω</mi>
--</mathinline>
--@end html
--@tex
--$\\omega$%
--@end tex
--@docbook
--ω
--@end docbook
--@end macro
--
--
--@macro inlinesigma
--@ifinfo
--@math{sigma}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mi>σ</mi>
--</mathinline>
--@end html
--@tex
--$\\sigma$%
--@end tex
--@docbook
--σ
--@end docbook
--@end macro
--
--
--@macro inlinexi
--@ifinfo
--@math{xi}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mi>ξ</mi>
--</mathinline>
--@end html
--@tex
--$\\xi$%
--@end tex
--@docbook
--ξ
--@end docbook
--@end macro
--
--
- @c Text Fragments
-
- @macro mainpurpose
-@@ -236,26 +103,3 @@
- @noindent
- @strong{Summary of influential options}
- @end macro
--
--
--@macro semilog{significant, exponent}
--@ifinfo
--\significant\*10^\exponent\@c
--@end ifinfo
--@html
--<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
-- <mn>\significant\</mn>
-- <mo>×</mo>
-- <msup>
-- <mn>10</mn>
-- <mn>\exponent\</mn>
-- </msup>
--</math>
--@end html
--@tex
--\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi%
--@end tex
--@docbook
--\significant\×10<superscript>\exponent\</superscript>
--@end docbook
--@end macro
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/bug-reports.texi
---- a/doc/bug-reports.texi Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/bug-reports.texi Fri Aug 07 16:43:24 2015 +0200
-@@ -77,7 +77,7 @@
- @item
- A complete set of input images that will reproduce the bug. Strive
- for a minimal set of @emph{small}@footnote{Images of a size less than
--1500@classictimes{}1000 pixels qualify as small.} images.
-+1500x1000 pixels qualify as small.} images.
-
- @item
- The type of machine you are using, and the operating system name and
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.info
-Binary file doc/enblend.info has changed
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.texi
---- a/doc/enblend.texi Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/enblend.texi Fri Aug 07 16:43:24 2015 +0200
-@@ -508,9 +508,9 @@
- twice as large as the previous one. So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale. This is the
-+level contains image data at 2^n-pixel scale. This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1194,11 +1194,11 @@
-
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
-
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1210,11 +1210,11 @@
-
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
-
-@@ -1236,11 +1236,11 @@
-
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
-
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1250,7 +1250,7 @@
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
-
- @pindex nona @r{(Hugin)}
-@@ -1572,7 +1572,7 @@
- @value{src::default-coarseness-factor}, this means,
- option@tie{}@option{--coarse-mask} shrinks the overlapping
- @emph{areas} by a factor of
--@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}.
-+@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}.
- With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a
- run of Enblend shrinks approximately by 80% and the maximum amount of
- memory in use at a time is decreased to 60% (Enblend compiled with
-@@ -2494,7 +2494,7 @@
- When using this option in conjunction with
- option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the
- smoothing occurs @emph{after} the overlap regions have been shrunken.
--Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR}
-+Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR}
- times larger area in the original images.
-
- Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}.
-@@ -2606,7 +2606,7 @@
- @rimage{seam-line-visualization}
-
- @caption{Seam-line visualization of a simple overlap. The
--853@classictimes{}238@dmn{pixel} image is shown at a magification of
-+853x238@dmn{pixel} image is shown at a magification of
- 100%.}
-
- @shortcaption{Seam-line visualization}
-@@ -2618,7 +2618,7 @@
- @rimage{seam-line-visualization, 15cm}
-
- @caption{Seam-line visualization of a simple overlap. The
--853@classictimes{}238@dmn{pixel} image has been rescaled to a width of
-+853x238@dmn{pixel} image has been rescaled to a width of
- approximately 15@dmn{cm}.}
-
- @shortcaption{Seam-line visualization}
-@@ -2629,7 +2629,7 @@
- @float Figure,Figure:seam-line-visualization
- @rimage{seam-line-visualization, 15cm}
-
--@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}.}
-+@caption{Seam-line visualization of a simple overlap. The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
-
- @shortcaption{Seam-line visualization}
- @end float
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.info
-Binary file doc/enfuse.info has changed
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.texi
---- a/doc/enfuse.texi Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/enfuse.texi Fri Aug 07 16:43:24 2015 +0200
-@@ -621,9 +621,9 @@
- twice as large as the previous one. So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale. This is the
-+level contains image data at 2^n-pixel scale. This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1255,11 +1255,11 @@
-
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
-
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1271,11 +1271,11 @@
-
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
-
-@@ -1297,11 +1297,11 @@
-
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
-
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1311,7 +1311,7 @@
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
-
- @pindex nona @r{(Hugin)}
-@@ -1501,8 +1501,8 @@
- @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement
- step, @var{LCE-FACTOR} is the weight factor (``strength'').
-
--@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original}
--@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original},
-+@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original}
-+@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original},
- @var{LCE-SCALE}).
-
- @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and
-@@ -1531,7 +1531,7 @@
- @opindex --contrast-window-size
-
- Set the window @var{SIZE} for local contrast analysis. The window
--will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If
-+will be a square of @var{SIZE}x@/@var{SIZE} pixels. If
- given an even @var{SIZE}, Enfuse will automatically use the next odd
- number.
-
-@@ -1585,7 +1585,7 @@
- @opindex --entropy-window-size
-
- Window @var{SIZE} for local entropy analysis. The window will be a
--square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.
-+square of @var{SIZE}x@/@var{SIZE} pixels.
-
- In the entropy calculation @var{SIZE} values of 3 to 7 yield an
- acceptable compromise of the locality of the information and the
-@@ -2433,20 +2433,6 @@
- from 1 to the common height, and @math{i} from 1 to the number of
- input images@tie{}@math{n}.
-
--@macro equationW{}
--@ifnotdocbook
--@ifnottex
--(W)
--@end ifnottex
--@end ifnotdocbook
--@tex
--(W)%
--@end tex
--@docbook
--<xref linkend="equ:pixel-weighting-function"/>
--@end docbook
--@end macro
--
- Enfuse allows for weighting the contribution of each @math{P(i, x, y)}
- to the final @math{Q(x, y)}:
- @ifinfo
-@@ -2454,7 +2440,7 @@
- @math{w(P(1, x, y)) * P(1, x, y) +
- ... +
- w(P(n, x, y)) * P(n, x, y)
----> Q(x, y),}@w{ }@equationW{}
-+--> Q(x, y),}
- @end display
- @end ifinfo
- @html
-@@ -2520,9 +2506,6 @@
- <mi>y</mi>
- </mfenced>
- </mrow>
-- <mtext>,</mtext>
-- <mspace width="4em"/>
-- <mtext>@equationW{}</mtext>
- </mrow>
- </math>
- @end html
-@@ -2530,7 +2513,7 @@
- $$
- w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y)
- \rightarrow
-- Q(x, y),\hskip4em\hbox{@equationW{}}
-+ Q(x, y)
- $$
- @end tex
- @docbook
-@@ -2948,7 +2931,7 @@
- be extreme, favoring only a few pixels or even only one pixel in the
- input stack. Extremes are not typical, however.
-
--Equal weights are another extreme that turns @equationW{} into an
-+Equal weights are another extreme that turns the equation into an
- arithmetic average. This is why we sometimes speak of the ``averaging
- property'' of this weighting algorithm, like smoothing out noise.
-
-@@ -2969,7 +2952,7 @@
- wins, this is, gets weight@tie{}one, and all other pixels get the
- weight of zero
- (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The
--Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{}
-+Winner Takes It All.''}). With @option{--hard-mask} the equation
- becomes
- @ifinfo
- @display
-@@ -3114,8 +3097,8 @@
-
- @noindent
- Note that this ``averaging'' scheme lacks the nice noise-reduction
--property of the weighted average@tie{}@equationW{}, because only a
--single input pixel contributes to the output.
-+property of the weighted average, because only a single input pixel
-+contributes to the output.
-
-
- @node Single Criterion Fusing
-@@ -3562,7 +3545,7 @@
-
- @noindent
- It associates a probability@tie{}@math{p} with each of the @math{n}
--different possible outcomes@tie{}@inlineomega{} of the random
-+different possible outcomes@tie{}@math{omega} of the random
- variable@tie{}@math{X}.
- @cindex expectation value
- Based on @math{w}, we define the @dfn{expectation value} or ``First
-@@ -4189,7 +4172,7 @@
- @end docbook
-
- @noindent
--The parameter@tie{}@inlinesigma{}, the argument of
-+The parameter@tie{}@math{sigma}, the argument of
- option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges
- are detected by @math{g(x, y)}. We apply the Laplacian operator in
- Cartesian coordinates
-@@ -4401,7 +4384,7 @@
- </informalequation>
- @end docbook
-
--where we have used the dimensionless distance@tie{}@inlinexi{} from
-+where we have used the dimensionless distance@tie{}@math{xi} from
- the origin
- @ifinfo
- @display
-@@ -4556,7 +4539,7 @@
- @float Figure,Figure:laplacian-of-gaussian
- @vimage{laplacian-of-gaussian}
-
--@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
-+@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.}
-
- @shortcaption{Laplacian-of-Gaussian}
- @end float
-@@ -4656,10 +4639,10 @@
- @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only,
- @acronym{LoG}-only, or a blend of both) scales to different image
- sizes. In practice, this means that if you start with a set of
--reduced size images, say 2808@classictimes{}1872 pixels, carefully
-+reduced size images, say 2808x1872 pixels, carefully
- optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find
- @acronym{LoG}-only the best mode, and then switch to the original
--resolution of 5616@classictimes{}3744 pixels, multiplying (or
-+resolution of 5616x3744 pixels, multiplying (or
- dividing) the parameters by four and sticking to @acronym{LoG}-only
- might @emph{not} result in the best fused image. For best quality,
- perform the parameter optimization and the search for the most
-@@ -5080,9 +5063,9 @@
- Images should align well to be suitable for fusion. However, there is
- no hard mathematical rule what ``well'' means. The alignment
- requirements for 16@dmn{MPixel} images to yield a sharp
--4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per
-+4"x6" print at 300@dmn{dpi} (``dpi'' means dots per
- inch) or even for web presentation are relatively low, whereas the
--alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print
-+alignment of 8@dmn{MPixel} images for a 12"x18" print
- ought to be tight.
-
- @pindex hugin
-@@ -5548,7 +5531,7 @@
-
- Let us use an example to illustrate the problem of relating the
- sharpness with the local contrast variations. Say we use a
--5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge}
-+5x5 contrast window. Moreover, let @code{sharp_edge}
- and @code{smooth_edge} be two specific configurations:
-
- @example
-@@ -5727,7 +5710,7 @@
- Apply the default grayscale projector: @code{average} and throw away
- all edges with a curvature of less than 0.5% and replace the
- @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use
--a window of 7@classictimes{}7@dmn{pixel} window to compute the
-+a window of 7x7@dmn{pixel} window to compute the
- @acronym{SDev}.
- @end table
-
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenblend.texi
---- a/doc/versenblend.texi Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/versenblend.texi Fri Aug 07 16:43:24 2015 +0200
-@@ -1,4 +1,4 @@
--@set UPDATED 10 March 2014
--@set UPDATED-MONTH March 2014
-+@set UPDATED 15 June 2015
-+@set UPDATED-MONTH June 2015
- @set EDITION 4.1.3
- @set VERSION 4.1.3
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenfuse.texi
---- a/doc/versenfuse.texi Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/versenfuse.texi Fri Aug 07 16:43:24 2015 +0200
-@@ -1,4 +1,4 @@
--@set UPDATED 10 March 2014
--@set UPDATED-MONTH March 2014
-+@set UPDATED 15 June 2015
-+@set UPDATED-MONTH June 2015
- @set EDITION 4.1.3
- @set VERSION 4.1.3
-
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
deleted file mode 100644
index d067df3c57a..00000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ConfigureChecks.cmake 2013-10-07 10:50:00.000000000 +0400
-+++ b/ConfigureChecks.cmake 2015-03-31 13:42:40.179527224 +0300
-@@ -53,7 +53,7 @@
- if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK)
- unset(VIGRA_SETIMAGEINDEX CACHE)
- set(CMAKE_REQUIRED_INCLUDES ${VIGRA_INCLUDE_DIR})
-- set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES})
-+ set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES} -lpthread)
- check_cxx_source_compiles(
- "
- #include <vigra/imageinfo.hxx>
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 621b21a35cf..9495d45d212 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -5,10 +5,6 @@
<email>graphics@gentoo.org</email>
<name>Gentoo Graphics Project</name>
</maintainer>
- <use>
- <flag name="gpu">GPU support for Enblend</flag>
- <flag name="image-cache">allow for processing of large images</flag>
- </use>
<upstream>
<remote-id type="sourceforge">enblend</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2020-07-10 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-07-10 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 98d7c17a5ef2d3ee26265dba57b6ec1b5178394e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 21:22:14 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 21:23:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d7c17a
media-gfx/enblend: Fix build with GCC-10
Thanks-to: Walter Hüttenmeyer <walter.huettenmeyer <AT> gmail.com>
Closes: https://bugs.gentoo.org/723306
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild | 3 ++-
.../enblend/files/enblend-4.2.0_p20161007-gcc-10.patch | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index 9049ae5c5e7..b72cb407f8d 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch
"${FILESDIR}"/${P}-cmake.patch
+ "${FILESDIR}"/${P}-gcc-10.patch
)
src_prepare() {
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch
new file mode 100644
index 00000000000..7203d6b667b
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch
@@ -0,0 +1,16 @@
+Fix build with GCC-10.
+
+Thanks-to: Walter Hüttenmeyer
+Bug: https://bugs.gentoo.org/724988
+
+--- a/src/minimizer.cc 2016-09-24 11:29:40.000000000 +0200
++++ b/src/minimizer.cc 2020-05-24 13:09:58.199170984 +0200
+@@ -19,7 +19,7 @@
+ */
+
+ #include <gsl/gsl_errno.h>
+-
++#include <limits>
+ #include "minimizer.h"
+
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2024-04-24 4:13 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2024-04-24 4:13 UTC (permalink / raw
To: gentoo-commits
commit: a51cd5759012d0a05b9c7bd3c1fa61d7c595383e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 04:12:00 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 04:12:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51cd575
media-gfx/enblend: add 4.2.0_p20240424
Closes: https://bugs.gentoo.org/878149
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/enblend/Manifest | 1 +
media-gfx/enblend/enblend-4.2.0_p20240424.ebuild | 92 ++++++++++++++++++++++
...blend-4.2.0_p20240424-doc-install-dir-fix.patch | 45 +++++++++++
3 files changed, 138 insertions(+)
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 566364e01dce..9ce037e033f6 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1 +1,2 @@
DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
+DIST enblend-4.2.0_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894
diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
new file mode 100644
index 000000000000..b94694b138e2
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
+
+S=${WORKDIR}/enblend
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc"
+
+REQUIRED_USE="tcmalloc? ( !debug )"
+
+BDEPEND="
+ sys-apps/help2man
+ virtual/pkgconfig
+ doc? (
+ app-text/ghostscript-gpl
+ app-text/texlive
+ dev-lang/perl
+ dev-perl/Readonly
+ dev-tex/hevea
+ gnome-base/librsvg
+ media-gfx/graphviz
+ >=media-gfx/fig2dev-3.2.9-r1
+ sci-visualization/gnuplot[cairo,gd]
+ virtual/imagemagick-tools[tiff]
+ )
+"
+RDEPEND="
+ media-libs/lcms:2
+ media-libs/openexr:=
+ media-libs/tiff:=
+ media-libs/vigra[openexr]
+ sci-libs/gsl:=
+ debug? ( dev-libs/dmalloc[threads] )
+ tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ media-libs/libpng:0
+ media-libs/libjpeg-turbo:=
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-doc-install-dir-fix.patch
+ "${FILESDIR}"/${PN}-4.2.0_p20161007-cmake.patch
+ "${FILESDIR}"/${PN}-4.2.0_p20161007-gcc-10.patch
+ "${FILESDIR}"/${PN}-4.2.0_p20161007-doc-scaleable-fonts.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+ -DENABLE_DMALLOC=$(usex debug)
+ -DDOC=$(usex doc)
+ -DENABLE_OPENMP=$(usex openmp)
+ -DENABLE_TCMALLOC=$(usex tcmalloc)
+ )
+ if use doc; then
+ mycmakeargs+=(
+ -DINSTALL_HTML_DOC=ON
+ -DINSTALL_PDF_DOC=ON
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ # To allow icon resizing with renderers (no way to disable)
+ addpredict /dev/dri
+
+ # To compile fonts in the temp directory
+ export VARTEXFONTS="${T}/fonts"
+
+ # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
+ cmake_src_compile -j1
+}
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20240424-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2.0_p20240424-doc-install-dir-fix.patch
new file mode 100644
index 000000000000..7d3a24f72ce5
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20240424-doc-install-dir-fix.patch
@@ -0,0 +1,45 @@
+diff -ruN enblend.orig/CMakeLists.txt enblend/CMakeLists.txt
+--- enblend.orig/CMakeLists.txt 2024-04-24 14:42:26.000000000 +1100
++++ enblend/CMakeLists.txt 2024-04-24 14:52:10.533011199 +1100
+@@ -15,9 +15,6 @@
+ endif()
+
+ project(enblend)
+-IF(NOT MSVC)
+- SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
+-ENDIF(NOT MSVC)
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
+ # is checked
+ # For now, reuse the hugin modules directory
+@@ -140,7 +137,6 @@
+ ENDIF()
+
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall")
+ IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
+ ## Add needed Compiler and Linker flags for OSX
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress")
+diff -ruN enblend.orig/doc/CMakeLists.txt enblend/doc/CMakeLists.txt
+--- enblend.orig/doc/CMakeLists.txt 2024-04-24 14:42:26.000000000 +1100
++++ enblend/doc/CMakeLists.txt 2024-04-24 14:52:10.533011199 +1100
+@@ -406,7 +406,7 @@
+ "${CMAKE_BINARY_DIR}/doc/enfuse.html"
+ ${ENBLEND_PNGFILES}
+ ${ENFUSE_PNGFILES}
+- DESTINATION ${DocumentsDirectory}
++ DESTINATION ${DocumentsDirectory}/html
+ )
+ endif()
+
+diff -ruN enblend.orig/src/CMakeLists.txt enblend/src/CMakeLists.txt
+--- enblend.orig/src/CMakeLists.txt 2024-04-24 14:42:26.000000000 +1100
++++ enblend/src/CMakeLists.txt 2024-04-24 14:55:27.323912752 +1100
+@@ -141,7 +141,7 @@
+ set_target_properties(enblend PROPERTIES LINK_FLAGS "/DELAYLOAD:opencl.dll")
+ set_target_properties(enfuse PROPERTIES LINK_FLAGS "/DELAYLOAD:opencl.dll")
+ endif()
+-install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
++install(TARGETS enblend enfuse DESTINATION bin)
+
+ IF(ENABLE_OPENCL AND NOT ${PREFER_SEPARATE_OPENCL_SOURCE})
+ add_dependencies(enblend cl_sources)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-24 4:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-16 18:15 [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/, media-gfx/enblend/files/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2024-04-24 4:13 Andreas K. Hüttel
2020-07-10 21:24 Andreas Sturmlechner
2018-06-06 8:13 Andreas Sturmlechner
2015-09-25 15:01 Markus Meier
2015-08-14 1:26 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox