* [gentoo-commits] dev/maekke:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2012-11-18 9:57 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2012-11-18 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 1aa55726b2c6c6404ecde53c4d22ab7eb21d0835
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 10:00:02 2012 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 10:00:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=1aa55726
bump
Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 072AD062
---
media-gfx/enblend/ChangeLog | 191 +++++++++++++++++
media-gfx/enblend/Manifest | 18 ++
media-gfx/enblend/enblend-4.0.ebuild | 85 ++++++++
media-gfx/enblend/enblend-4.1_rc1.ebuild | 80 +++++++
media-gfx/enblend/files/enblend-4.0-libpng14.patch | 13 ++
media-gfx/enblend/files/enblend-4.0-libpng15.patch | 220 ++++++++++++++++++++
media-gfx/enblend/metadata.xml | 9 +
7 files changed, 616 insertions(+), 0 deletions(-)
diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
new file mode 100644
index 0000000..c71f9b9
--- /dev/null
+++ b/media-gfx/enblend/ChangeLog
@@ -0,0 +1,191 @@
+# ChangeLog for media-gfx/enblend
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.48 2012/05/05 07:00:26 jdhore Exp $
+
+ 05 May 2012; Jeff Horelick <jdhore@gentoo.org> enblend-4.0.ebuild:
+ dev-util/pkgconfig -> virtual/pkgconfig
+
+ 28 Jan 2012; Christoph Junghans <ottxor@gentoo.org> enblend-4.0.ebuild:
+ fix bug #347786
+
+ 12 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild:
+ Seems the -libpng15.patch isn't entirely compatible with libpng14, apply
+ workaround from bug #378677
+
+ 07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild,
+ +files/enblend-4.0-libpng15.patch:
+ Fix building with libpng15 wrt #355893 by Mike Frysinger
+
+ 08 Nov 2010; Markus Meier <maekke@gentoo.org> enblend-4.0.ebuild:
+ change jpeg dep to virtual/jpeg
+
+ 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> enblend-4.0.ebuild:
+ virtual/glut -> media-libs/glut
+
+ 21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild:
+ Restrict media-libs/lcms depend to old version.
+
+ 28 May 2010; Markus Meier <maekke@gentoo.org> -enblend-3.2.ebuild:
+ old
+
+ 28 May 2010; Markus Meier <maekke@gentoo.org> enblend-4.0.ebuild:
+ x86 stable, bug #320409
+
+ 24 May 2010; <nixnut@gentoo.org> enblend-4.0.ebuild:
+ ppc stable #320409
+
+ 21 May 2010; Markos Chandras <hwoarang@gentoo.org> enblend-4.0.ebuild:
+ Stable on amd64 wrt bug #320409
+
+ 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild,
+ +files/enblend-4.0-libpng14.patch:
+ Fix building with libpng14.
+
+*enblend-4.0 (18 Dec 2009)
+
+ 18 Dec 2009; Markus Meier <maekke@gentoo.org> -enblend-4.0_rc2.ebuild,
+ -enblend-4.0_rc3.ebuild, +enblend-4.0.ebuild:
+ version bump to final 4.0 release
+
+*enblend-4.0_rc3 (05 Dec 2009)
+
+ 05 Dec 2009; Markus Meier <maekke@gentoo.org> +enblend-4.0_rc3.ebuild:
+ version bump
+
+*enblend-4.0_rc2 (29 Nov 2009)
+
+ 29 Nov 2009; Markus Meier <maekke@gentoo.org> +enblend-4.0_rc2.ebuild,
+ metadata.xml:
+ version bump to 4.0_rc2 release
+
+ 14 Nov 2009; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild:
+ boost dep is DEPEND only, bug #293069
+
+ 16 Aug 2009; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild:
+ migrate to EAPI=2
+
+ 08 Dec 2008; Markus Meier <maekke@gentoo.org>
+ -files/enblend-3.0-amd64_compilation.patch,
+ -files/enblend-3.0-endless_loop_anneal.patch,
+ -files/enblend-3.0-gcc43.patch, -enblend-3.0.ebuild:
+ old
+
+ 06 Dec 2008; nixnut <nixnut@gentoo.org> enblend-3.2.ebuild:
+ Stable on ppc wrt bug 249380
+
+ 28 Nov 2008; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild:
+ force -j1 as this package needs about 1 GB RAM for every parallel compile
+ instance, bug #249033
+
+ 22 Nov 2008; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild:
+ amd64/x86 stable, bug #246827
+
+ 26 Oct 2008; Mike Frysinger <vapier@gentoo.org> enblend-3.2.ebuild:
+ Do not force building with -O3.
+
+ 06 Oct 2008; Markus Meier <maekke@gentoo.org>
+ -enblend-3.0_p20080807.ebuild:
+ old
+
+ 10 Sep 2008; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild:
+ remove unneeded src_unpack
+
+*enblend-3.2 (10 Sep 2008)
+
+ 10 Sep 2008; Markus Meier <maekke@gentoo.org> +enblend-3.2.ebuild:
+ bump to version 3.2, reported in bug #237261
+
+*enblend-3.0_p20080807 (16 Aug 2008)
+
+ 16 Aug 2008; Markus Meier <maekke@gentoo.org>
+ +enblend-3.0_p20080807.ebuild:
+ snapshot-bump, required for hugin-0.7.0_rc2
+
+ 02 May 2008; Markus Meier <maekke@gentoo.org>
+ +files/enblend-3.0-gcc43.patch, -enblend-2.3.ebuild, -enblend-2.5.ebuild,
+ enblend-3.0.ebuild:
+ fix building with gcc-4.3 by Peter Alfredsen in bug #219779; remove old
+
+ 22 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> enblend-3.0.ebuild:
+ ppc stable, bug #202095
+
+ 18 Dec 2007; Markus Meier <maekke@gentoo.org> enblend-3.0.ebuild:
+ plotutils needs to be built with X, bug #202476
+
+ 17 Dec 2007; Christian Faulhammer <opfer@gentoo.org> enblend-3.0.ebuild:
+ stable x86, bug 202095
+
+ 16 Dec 2007; Samuli Suominen <drac@gentoo.org> enblend-3.0.ebuild:
+ amd64 stable wrt #202095
+
+ 12 Dec 2007; Markus Meier <maekke@gentoo.org> enblend-3.0.ebuild:
+ add a warning, that you need enough ram to compile this package
+
+ 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> enblend-2.5.ebuild:
+ stable amd64, bug 173068
+
+ 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> enblend-2.5.ebuild:
+ Marked ppc stable for bug #173068.
+
+ 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+ Transition to Manifest2.
+
+*enblend-3.0 (05 Feb 2007)
+
+ 05 Feb 2007; Marcelo Goes <vanquirius@gentoo.org>
+ +files/enblend-3.0-amd64_compilation.patch,
+ +files/enblend-3.0-endless_loop_anneal.patch, +enblend-3.0.ebuild:
+ 3.0 version bump for bug 164677. Thanks to Ralph Holz <ralph-bugzillagentoo
+ at ralphholz dot de>, Tim Harder <thorium90 at gmail dot com>, Hal Engel
+ <hvengel at astound dot net> and Christian Kanzian <christian.kanzian at gmx
+ dot at>.
+
+ 15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+ Remove halcy0n from metadata.xml as he's retired.
+
+ 18 Apr 2006; Mark Loeser <halcy0n@gentoo.org> enblend-2.5.ebuild:
+ Stable on x86
+
+ 20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
+ metadata.xml cleanup
+
+*enblend-2.5 (18 Dec 2005)
+
+ 18 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -enblend-2.1.ebuild,
+ -enblend-2.2.ebuild, +enblend-2.5.ebuild:
+ Bump to 2.5 and clean out some old versions
+
+ 06 Nov 2005; Luis Medinas <metalgod@gentoo.org> enblend-2.3.ebuild:
+ Marked Stable on amd64.
+
+ 13 Sep 2005; Mark Loeser <halcy0n@gentoo.org> enblend-2.3.ebuild:
+ Stable on x86
+
+ 06 Sep 2005; Olivier Crête <tester@gentoo.org> enblend-2.2.ebuild:
+ Stable on amd64
+
+*enblend-2.3 (11 Aug 2005)
+
+ 11 Aug 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml,
+ enblend-2.2.ebuild, +enblend-2.3.ebuild:
+ Version bump to enblend-2.3. bug #93305
+ enblend-2.2 stable on x86
+
+ 21 Apr 2005; Herbie Hopkins <herbs@gentoo.org> enblend-2.2.ebuild:
+ ~amd64 keyword added
+
+*enblend-2.2 (21 Apr 2005)
+
+ 21 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +enblend-2.2.ebuild:
+ New version
+
+ 07 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> enblend-2.1.ebuild:
+ Marked ~amd64, closes bug 87438.
+
+*enblend-2.1 (24 Feb 2005)
+
+ 24 Feb 2005; Luca Barbato <lu_zero@gentoo.org> +metadata.xml,
+ +enblend-2.1.ebuild:
+ First commit, thanks to David Grant <david.grant@telus.net> for the updated
+ ebuild
+
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
new file mode 100644
index 0000000..9313e05
--- /dev/null
+++ b/media-gfx/enblend/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX enblend-4.0-libpng14.patch 625 SHA256 814dcb17d2e4d9d246ddeb7d6f477a0dcfa388af73d7fe004d8eb42f044c47c4 SHA512 b1acfb999cb8d37cb3e1020f081114b75b21842ff19629c99d407825436b54105377aa7c2b2e26e7194a86eab2834f77f22a2e7ad9ba530db439f411649678f7 WHIRLPOOL d498123036e0d23a1024773ad4b6c44fdcbf89c54f0093333b992d54959df91842b738ac1e3e6262f3e89245157422c2288e56e1cfb1f17964c24f10613bfc4a
+AUX enblend-4.0-libpng15.patch 9442 SHA256 05350a8dd5810a2940d65975af4b121375bc49dcb09a9fc36111aaf8ada02a3b SHA512 3b283fdd0af3f09d1b486251b8fcae8175914c7e2fe693b0ef054a647ad2d8d1b7409b03146d33065d883b66b06c10ba18b1ace8de7379023d7e9082224e80a7 WHIRLPOOL f6d9b065ade9a98bb6042d3b111b5bb42dfccfac334bc406461ee273c5735a52366ffe69cc79c2912b4af7aa42e99c37932c1166120a2ee3f5ec99ed00bb6b03
+DIST enblend-enfuse-4.0.tar.gz 1047295 SHA256 fe42f41dc35bf4abb2a33623976593788717fff66a6ff048b7f8a3cb70b113b2 SHA512 a5ac7e3cd34eee136d6580d47455b9abf652272049e5b6aaf4210c3ab664ecdb2b81ad21038eae7f1f03df1e395b10436747ca25f3707dc19a1078429b63adc3 WHIRLPOOL 3fe0776d07ac9b4fa073d50d872855a3b4e80166ee4a054ff30ce8a69927e8f5aec3b7f10f5275e2862276c968ca744b8d003084c7721c764d3ddb781a9be727
+DIST enblend-enfuse-4.1rc1-e436ceb4899a.tar.gz 824890 SHA256 84c6bb599690df5b36956a728bd9819b243031d7d1f033350f123590127f0dfa SHA512 cbf9338485824dc3d20d59876c0766b5502f7d74dd94183c7c81319f313ea312e7866ae765ff693698741caad6039a03136e5c24afdc408be8c3f4b183d7c1cb WHIRLPOOL f40c630b7a92b45cfb2a7797e42bac6eb8da37b3cc77d528a5f3bac8a9ae6de160c6d1deb3838e3216eb3d22161d0076a8c9c17f81400dfb278a4fa086274c9a
+EBUILD enblend-4.0.ebuild 2037 SHA256 c33ff6bcfc9143a79d958d8ec2f776fce80a9272d678d62a8cd36b1045943dbc SHA512 2d2a26cdd68f1a71e846eac34145e8fa50a8e98acb6a8d5258bf559275a14da26856e75d21409a93cc926cb4c711b662316287533072b61c03aec23fc90b830c WHIRLPOOL a2938404f5457f6c5c482f66b4629b82fe1af74593ee682a8df6690643dd889a52949c048ac79b47272bfeedea406f59fed1426d1cbd3bd47b28fd0a5dd79811
+EBUILD enblend-4.1_rc1.ebuild 1889 SHA256 7fdb2a6defcf8ea0c7b33046eb8225979edd5e5fa84a66813db1a23bdaa74a33 SHA512 8ef8b77c2c98d6c15786ec04fdd0c1c359baa70562f7889afda6bdf8fcb23176644541679707bdba431fa25b0ee05f2c1a23c897ef59b75a09d93087eff53569 WHIRLPOOL 5b4dc68c2bb5743286e5459cc7efdb1065154732868c744b70dec1dc00ec464b5416116d26eb09096974c43d35f601d582b6171c11bd67c592e558d3fd369124
+MISC ChangeLog 6419 SHA256 2c9e44db427ec6ea2f0e923ba3fa7e37733433c77d99b22a100fd68126315363 SHA512 47dedfbfd1abea67a6a72eac8a2fcaaa4ee75fea39348a171e4361a446ac35d506030e11db44a1811d512082e3a013cb0001647588a675bacb709265eccab114 WHIRLPOOL 0d99f890c6a29d2d5cae4099a3600845ead1dd43217f02bd3a4682b21f603fc75461cf903e627bd84eb9d4a9b896d7fde63f37fe179e66be2565e6bec835da01
+MISC metadata.xml 298 SHA256 5d3fcb04b17733010c038cd4b18d4fff78a7ca252ebf3610ecdf353f7dce76f3 SHA512 a92eebec232855ca89459a7c112c54c65f9ffb6e40e712da5eb9369b8389e1278768441a4c83a901ce90640adb321d068ed96bc95d63b6048bf4b7c90b5c999a WHIRLPOOL 015f7e2a6cdc965f1b385358bbdf3d2c784f044a0134018bce3aec87fd64677b2e6b04a3d6279d51dddd2a07b09d7b6fe43fe60fd74b7546104bbeff1231406a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCosaIACgkQkKaRLQcq0GJZ0QCgi/L20uor9FZeMeREBf2AJ5n4
+BrEAn1Ngh9EkolgArf0cgiesUVpw6uKf
+=4zqB
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-4.0.ebuild b/media-gfx/enblend/enblend-4.0.ebuild
new file mode 100644
index 0000000..5a39c3a
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.12 2012/05/05 07:00:26 jdhore Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="mirror://sourceforge/enblend/${PN}-enfuse-${PV/_rc/RC}.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-1*
+ >=media-libs/libpng-1.2.43
+ media-libs/plotutils[X]
+ media-libs/tiff
+ 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}/${PN}-enfuse-4.0-753b534c819d"
+
+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_prepare() {
+ epatch "${FILESDIR}"/${P}-libpng14.patch
+
+ # 378677, temp workaround
+ has_version ">=media-libs/libpng-1.5" && epatch \
+ "${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_configure() {
+ local myconf=""
+ if use image-cache && use openmp; then
+ myconf="--disable-image-cache --enable-openmp"
+ else
+ 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_rc1.ebuild b/media-gfx/enblend/enblend-4.1_rc1.ebuild
new file mode 100644
index 0000000..0563488
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1_rc1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.12 2012/05/05 07:00:26 jdhore Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_P="${PN}-enfuse-${PV/_rc/rc}-e436ceb4899a"
+
+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 +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
+ 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=""
+ if use image-cache && use openmp; then
+ myconf="--disable-image-cache --enable-openmp"
+ else
+ 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/files/enblend-4.0-libpng14.patch b/media-gfx/enblend/files/enblend-4.0-libpng14.patch
new file mode 100644
index 0000000..2fe3846
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.0-libpng14.patch
@@ -0,0 +1,13 @@
+--- src/vigra_impex/png.cxx
++++ src/vigra_impex/png.cxx
+@@ -274,8 +274,8 @@
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+ if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+
diff --git a/media-gfx/enblend/files/enblend-4.0-libpng15.patch b/media-gfx/enblend/files/enblend-4.0-libpng15.patch
new file mode 100644
index 0000000..d4465cc
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.0-libpng15.patch
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
++++ src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+- longjmp( png_ptr->jmpbuf, 1 );
++ longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+ vigra_postcondition( png != 0, "could not create the read struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
+ }
+@@ -221,14 +221,14 @@
+ vigra_postcondition( info != 0, "could not create the info struct." );
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+ png_init_io( png, file.get() );
+
+ // specify that the signature was already read
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
+ }
+@@ -244,13 +244,13 @@
+ void PngDecoderImpl::init()
+ {
+ // read all chunks up to the image data
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
+ png_read_info( png, info );
+
+ // pull over the header fields
+ int interlace_method, compression_method, filter_method;
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
+ png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+ &interlace_method, &compression_method, &filter_method );
+@@ -264,7 +264,7 @@
+
+ // transform palette to rgb
+ if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
+ png_set_palette_to_rgb(png);
+ color_type = PNG_COLOR_TYPE_RGB;
+@@ -273,7 +273,7 @@
+
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
+ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+@@ -283,7 +283,7 @@
+ #if 0
+ // strip alpha channel
+ if ( color_type & PNG_COLOR_MASK_ALPHA ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
+ png_set_strip_alpha(png);
+ color_type ^= PNG_COLOR_MASK_ALPHA;
+@@ -323,12 +323,12 @@
+
+ // read icc profile
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+- char * dummyName;
++ png_charpp dummyName;
+ int dummyCompType;
+- char * profilePtr;
++ png_bytepp profilePtr;
+ png_uint_32 profileLen;
+- if (info->valid & PNG_INFO_iCCP) {
+- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
++ if (png_get_valid(png, info, PNG_INFO_iCCP)) {
++ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
+ iccProfilePtr = (unsigned char *) profilePtr;
+ iccProfileLength = profileLen;
+ }
+@@ -340,7 +340,7 @@
+ // image gamma
+ double image_gamma = 0.45455;
+ if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
+ png_get_gAMA( png, info, &image_gamma );
+ }
+@@ -349,26 +349,26 @@
+ double screen_gamma = 2.2;
+
+ // set gamma correction
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
+ png_set_gamma( png, screen_gamma, image_gamma );
+ #endif
+
+ // interlace handling, get number of read passes needed
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
+ n_interlace_passes = png_set_interlace_handling(png);
+
+ // update png library state to reflect any changes that were made
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
+ png_read_update_info( png, info );
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
+ n_channels = png_get_channels(png, info);
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
+ rowsize = png_get_rowbytes(png, info);
+
+@@ -379,7 +379,7 @@
+ void PngDecoderImpl::nextScanline()
+ {
+ for (int i=0; i < n_interlace_passes; i++) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
+ png_read_row(png, row_data.begin(), NULL);
+ }
+@@ -545,7 +545,7 @@
+ vigra_postcondition( png != 0, "could not create the write struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
+ }
+@@ -556,7 +556,7 @@
+ }
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+@@ -571,7 +571,7 @@
+ void PngEncoderImpl::finalize()
+ {
+ // write the IHDR
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
+ png_set_IHDR( png, info, width, height, bit_depth, color_type,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+@@ -579,7 +579,7 @@
+
+ // set resolution
+ if (x_resolution > 0 && y_resolution > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
+ png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
+ (png_uint_32) (y_resolution / 0.0254 + 0.5),
+@@ -588,7 +588,7 @@
+
+ // set offset
+ if (position.x > 0 && position.y > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
+ png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
+ }
+@@ -597,12 +597,12 @@
+ // set icc profile
+ if (iccProfile.size() > 0) {
+ png_set_iCCP(png, info, "icc", 0,
+- (char *)iccProfile.begin(), iccProfile.size());
++ iccProfile.begin(), iccProfile.size());
+ }
+ #endif
+
+ // write the info struct
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+ png_write_info( png, info );
+
+@@ -634,10 +634,10 @@
+ }
+
+ // write the whole image
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
+ png_write_image( png, row_pointers.begin() );
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
+ png_write_end(png, info);
+ }
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
new file mode 100644
index 0000000..c1cc643
--- /dev/null
+++ b/media-gfx/enblend/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>graphics</herd>
+ <use>
+ <flag name="gpu">GPU support for Enblend</flag>
+ <flag name="image-cache">allow for processing of large images</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2013-08-28 19:57 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2013-08-28 19:57 UTC (permalink / raw
To: gentoo-commits
commit: ea879b8f696e93ac6cc4dfa92e0d5c702d4fe00d
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 20:03:39 2013 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 20:03:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=ea879b8f
sync media-gfx/enblend and add cmake-based ebuild for 4.1.1
Package-Manager: portage-2.2.1
Manifest-Sign-Key: 072AD062
---
media-gfx/enblend/ChangeLog | 18 +-
media-gfx/enblend/Manifest | 21 +-
media-gfx/enblend/enblend-4.0.ebuild | 85 --------
media-gfx/enblend/enblend-4.1.1-r1.ebuild | 65 ++++++
media-gfx/enblend/enblend-4.1.1.ebuild | 6 +-
media-gfx/enblend/enblend-4.1.ebuild | 81 --------
media-gfx/enblend/files/enblend-4.0-libpng14.patch | 13 --
media-gfx/enblend/files/enblend-4.0-libpng15.patch | 220 ---------------------
8 files changed, 96 insertions(+), 413 deletions(-)
diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index ab93e14..0b0d665 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,19 @@
# ChangeLog for media-gfx/enblend
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.50 2012/12/11 22:33:45 maekke Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.53 2013/05/08 08:50:30 radhermit Exp $
+
+ 08 May 2013; Tim Harder <radhermit@gentoo.org> -enblend-4.0.ebuild,
+ -files/enblend-4.0-libpng14.patch, -files/enblend-4.0-libpng15.patch,
+ -enblend-4.1.ebuild:
+ Remove old.
+
+ 11 Apr 2013; Vicente Olivert Riera <vincent@gentoo.org> enblend-4.1.1.ebuild:
+ amd64, ppc and x86 stable, wrt bug #465428
+
+*enblend-4.1.1 (03 Mar 2013)
+
+ 03 Mar 2013; Markus Meier <maekke@gentoo.org> +enblend-4.1.1.ebuild:
+ version bump
11 Dec 2012; Markus Meier <maekke@gentoo.org> enblend-4.1.ebuild:
add missing sci-libs/gsl dependency by Martin Jansa in bug #446816
@@ -196,4 +209,3 @@
+enblend-2.1.ebuild:
First commit, thanks to David Grant <david.grant@telus.net> for the updated
ebuild
-
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 6be1982..8396aa8 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,10 +1,15 @@
-AUX enblend-4.0-libpng14.patch 625 SHA256 814dcb17d2e4d9d246ddeb7d6f477a0dcfa388af73d7fe004d8eb42f044c47c4 SHA512 b1acfb999cb8d37cb3e1020f081114b75b21842ff19629c99d407825436b54105377aa7c2b2e26e7194a86eab2834f77f22a2e7ad9ba530db439f411649678f7 WHIRLPOOL d498123036e0d23a1024773ad4b6c44fdcbf89c54f0093333b992d54959df91842b738ac1e3e6262f3e89245157422c2288e56e1cfb1f17964c24f10613bfc4a
-AUX enblend-4.0-libpng15.patch 9442 SHA256 05350a8dd5810a2940d65975af4b121375bc49dcb09a9fc36111aaf8ada02a3b SHA512 3b283fdd0af3f09d1b486251b8fcae8175914c7e2fe693b0ef054a647ad2d8d1b7409b03146d33065d883b66b06c10ba18b1ace8de7379023d7e9082224e80a7 WHIRLPOOL f6d9b065ade9a98bb6042d3b111b5bb42dfccfac334bc406461ee273c5735a52366ffe69cc79c2912b4af7aa42e99c37932c1166120a2ee3f5ec99ed00bb6b03
-DIST enblend-enfuse-4.0.tar.gz 1047295 SHA256 fe42f41dc35bf4abb2a33623976593788717fff66a6ff048b7f8a3cb70b113b2 SHA512 a5ac7e3cd34eee136d6580d47455b9abf652272049e5b6aaf4210c3ab664ecdb2b81ad21038eae7f1f03df1e395b10436747ca25f3707dc19a1078429b63adc3 WHIRLPOOL 3fe0776d07ac9b4fa073d50d872855a3b4e80166ee4a054ff30ce8a69927e8f5aec3b7f10f5275e2862276c968ca744b8d003084c7721c764d3ddb781a9be727
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST enblend-enfuse-4.1.1.tar.gz 850214 SHA256 9d0947633ebaa0dc1211331b31009408de6fe2108751ad4190760e3a9f181bc9 SHA512 dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f WHIRLPOOL c9938499116f26f3bfe6eae874414722a15380cbda959c82315bb124cb7b58456550174b0d43355d924cb6e107ef3ee4d1b83f8adc82d7144d974b66207ff965
-DIST enblend-enfuse-4.1.tar.gz 857011 SHA256 cdf59cc4963846b9fb0c934dd8f8c5630414e1c45abb1ee3efc21021a0e427a2 SHA512 062f54330828d1830ab6053c13d027c06736030157039664b9153cb0b648d9fc4133a5c589cf4cc673933a1535a2f6ec4e4b5414706ab14bb92673f45c2d9fd8 WHIRLPOOL 2b4f387a40609d2d3812dd53195cc1824db60761b1183ff6ea55d6f74c3f70f4d59ad6c1d786f4c142bad69da9d1234ae3c0eebcf709e4b8bc2f6b1f6bb97040
-EBUILD enblend-4.0.ebuild 2034 SHA256 e1c94e44521b0c448318769edeb814bf709a84b3e23d7dd6f9d8ec9561afc1f3 SHA512 4c38c6d6f120bdba10573bb04f4665ad0fc4f48b4636fbfafdb405f4356af1fddc403c8b40900dc2ad17a34bc7b12ae96ea758a97472954c45204c1f642d2d8e WHIRLPOOL a90c892f0ae429283057bd0e68a7ed4e91b6dd0d8e4c7e00e74550400c5fd3b82d69a6cb0351b6e36293cadbfcc4757c3ff22da851209a05fe4d3a7564cfaabe
-EBUILD enblend-4.1.1.ebuild 1937 SHA256 76f17398cbf741eb89006b829992b21ab7e67d633e119ba57a3bee9950d63eff SHA512 6cab74edf1d0b81ef2fc2631c2537033fe5e1ce1459c94121952f6d943f13c1ce13af809c6ab36870e838288acafb5daf2722c5a9267baf14f1e862b1a14a462 WHIRLPOOL 9a1bbb9b6a545d55a9f1401a262803888375190f91869bc5bf5b13c7801d89481ef948f558a2487ebe5b988ef54cb51b6a6b3b5bd88de411f991b63fb2213d6b
-EBUILD enblend-4.1.ebuild 1937 SHA256 76f17398cbf741eb89006b829992b21ab7e67d633e119ba57a3bee9950d63eff SHA512 6cab74edf1d0b81ef2fc2631c2537033fe5e1ce1459c94121952f6d943f13c1ce13af809c6ab36870e838288acafb5daf2722c5a9267baf14f1e862b1a14a462 WHIRLPOOL 9a1bbb9b6a545d55a9f1401a262803888375190f91869bc5bf5b13c7801d89481ef948f558a2487ebe5b988ef54cb51b6a6b3b5bd88de411f991b63fb2213d6b
-MISC ChangeLog 6670 SHA256 6610399ce13febb2f430d043022add9776c62cdaa48973d073b39d71fffdf3a7 SHA512 a9ba8621c4fcc75d3816fa101cdbb58fd6ad8b1448be3337df19a9f9bc7c9d978e8b71a9b93d16449b06f1742db236f93cd07a511dcec1841afb3fcba56df432 WHIRLPOOL 4b8f05bc1530436fe1708496b570fa8695ea0c6300c37f953c6915e052da98e0277c428273d83db3074b444511c5e98e878faa3b5630d7108dcdbe144b4e6cdb
+EBUILD enblend-4.1.1-r1.ebuild 1548 SHA256 73d15a3777f7ba06c0f96c65fa2b81f0088959d476b3b5a15866062fcd320bcf SHA512 aebfcc50af7f5148d6f4308b9c3495d70051264af23e10ae9c6fcde635f411990b14b715f8ecdc82afd17f9a170f7ca0365369e9942c9e428e1219bdc4de5647 WHIRLPOOL 267d04e8cbb2e2368c94120dd300c7ee920804a09721f9d5a9932405b2233692bebcd9b4df895cbe0569284dbbc0313a3a29ddedeafb5abbb5d19fff3b798000
+EBUILD enblend-4.1.1.ebuild 1937 SHA256 a7c519f40c3c4b9149bf7fed592280cc29bad5da2cf8a594e9d8885ced21937a SHA512 d5be6d54b83c917e352c1a8e354cf730fa61679d14b46208f274fbae7a127bb5115902ac4e2997864544e904678f39c541c6dadb5c8bc0560913f262e3f104a8 WHIRLPOOL 5475db49caae94c7a92df20a10b4d0332f5049e2ba0e4386e0e4fecea93fdc46ebfc817b41c296449fc2724bd301496bebb58062041bec0aa39978fe3a8be6dc
+MISC ChangeLog 7095 SHA256 978091f06cf9de8667d9ece2a8358dee33dda13f6c2b5e3aa2e08f6e09e69fb2 SHA512 9f6787bdecb0b055c2ea256c746d5ab5eb43874748d0bd9d7a383b06fa096e984ff0e5688461baea4e69c2194c07e09d3ea62ec6a5b44392c36e4ee6d0af2fa2 WHIRLPOOL 77b6fb1858b87e8a7667e1bd828418e0d74dd0c267bcc0048368b97632595451c716eaffadbd55d93763b9b620634de6902961adf27250dbd8133bc9bbb9b7df
MISC metadata.xml 298 SHA256 5d3fcb04b17733010c038cd4b18d4fff78a7ca252ebf3610ecdf353f7dce76f3 SHA512 a92eebec232855ca89459a7c112c54c65f9ffb6e40e712da5eb9369b8389e1278768441a4c83a901ce90640adb321d068ed96bc95d63b6048bf4b7c90b5c999a WHIRLPOOL 015f7e2a6cdc965f1b385358bbdf3d2c784f044a0134018bce3aec87fd64677b2e6b04a3d6279d51dddd2a07b09d7b6fe43fe60fd74b7546104bbeff1231406a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlIeV5sACgkQkKaRLQcq0GInAACfQs8yHv7Jn6L82Oaxttlitgnm
+GvEAn3rpswtLs9vod6qB3mQaiO7VMM7/
+=hUTT
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-4.0.ebuild b/media-gfx/enblend/enblend-4.0.ebuild
deleted file mode 100644
index 82ad606..0000000
--- a/media-gfx/enblend/enblend-4.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.12 2012/05/05 07:00:26 jdhore Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${PN}-enfuse-${PV/_rc/RC}.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-1*
- >=media-libs/libpng-1.2.43
- media-libs/plotutils[X]
- media-libs/tiff
- 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}/${PN}-enfuse-4.0-753b534c819d"
-
-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_prepare() {
- epatch "${FILESDIR}"/${P}-libpng14.patch
-
- # 378677, temp workaround
- has_version ">=media-libs/libpng-1.5" && epatch \
- "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
- local myconf=""
- if use image-cache && use openmp; then
- myconf="--disable-image-cache --enable-openmp"
- else
- 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.1-r1.ebuild b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
new file mode 100644
index 0000000..f94d89d
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1.ebuild,v 1.2 2013/04/11 20:12:38 vincent Exp $
+
+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 "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(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 OPENCL)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
+ enable_cmake-utils_src_compile -j1
+}
diff --git a/media-gfx/enblend/enblend-4.1.1.ebuild b/media-gfx/enblend/enblend-4.1.1.ebuild
index c2210f8..1394af1 100644
--- a/media-gfx/enblend/enblend-4.1.1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.ebuild,v 1.2 2012/12/11 22:33:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1.ebuild,v 1.2 2013/04/11 20:12:38 vincent Exp $
EAPI=2
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
LICENSE="GPL-2 VIGRA"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="debug doc gpu +image-cache +openexr openmp"
RDEPEND="
diff --git a/media-gfx/enblend/enblend-4.1.ebuild b/media-gfx/enblend/enblend-4.1.ebuild
deleted file mode 100644
index c2210f8..0000000
--- a/media-gfx/enblend/enblend-4.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.ebuild,v 1.2 2012/12/11 22:33:45 maekke Exp $
-
-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/files/enblend-4.0-libpng14.patch b/media-gfx/enblend/files/enblend-4.0-libpng14.patch
deleted file mode 100644
index 2fe3846..0000000
--- a/media-gfx/enblend/files/enblend-4.0-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -274,8 +274,8 @@
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ png_set_expand_gray_1_2_4_to_8(png);
- bit_depth = 8;
- }
-
diff --git a/media-gfx/enblend/files/enblend-4.0-libpng15.patch b/media-gfx/enblend/files/enblend-4.0-libpng15.patch
deleted file mode 100644
index d4465cc..0000000
--- a/media-gfx/enblend/files/enblend-4.0-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
- png_error_message = std::string(error_msg);
-- longjmp( png_ptr->jmpbuf, 1 );
-+ longjmp( png_jmpbuf( png_ptr ), 1 );
- }
-
- // called on non-fatal errors
-@@ -213,7 +213,7 @@
- vigra_postcondition( png != 0, "could not create the read struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf( png ))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
- }
-@@ -221,14 +221,14 @@
- vigra_postcondition( info != 0, "could not create the info struct." );
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf( png ))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
- png_init_io( png, file.get() );
-
- // specify that the signature was already read
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf( png ))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
- }
-@@ -244,13 +244,13 @@
- void PngDecoderImpl::init()
- {
- // read all chunks up to the image data
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
- png_read_info( png, info );
-
- // pull over the header fields
- int interlace_method, compression_method, filter_method;
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
- png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
- &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +264,7 @@
-
- // transform palette to rgb
- if ( color_type == PNG_COLOR_TYPE_PALETTE) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
- png_set_palette_to_rgb(png);
- color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,7 +273,7 @@
-
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
- png_set_expand_gray_1_2_4_to_8(png);
- bit_depth = 8;
-@@ -283,7 +283,7 @@
- #if 0
- // strip alpha channel
- if ( color_type & PNG_COLOR_MASK_ALPHA ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
- png_set_strip_alpha(png);
- color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -323,12 +323,12 @@
-
- // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
-- char * dummyName;
-+ png_charpp dummyName;
- int dummyCompType;
-- char * profilePtr;
-+ png_bytepp profilePtr;
- png_uint_32 profileLen;
-- if (info->valid & PNG_INFO_iCCP) {
-- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-+ if (png_get_valid(png, info, PNG_INFO_iCCP)) {
-+ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
- iccProfilePtr = (unsigned char *) profilePtr;
- iccProfileLength = profileLen;
- }
-@@ -340,7 +340,7 @@
- // image gamma
- double image_gamma = 0.45455;
- if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
- png_get_gAMA( png, info, &image_gamma );
- }
-@@ -349,26 +349,26 @@
- double screen_gamma = 2.2;
-
- // set gamma correction
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
- png_set_gamma( png, screen_gamma, image_gamma );
- #endif
-
- // interlace handling, get number of read passes needed
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
- n_interlace_passes = png_set_interlace_handling(png);
-
- // update png library state to reflect any changes that were made
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
- png_read_update_info( png, info );
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
- n_channels = png_get_channels(png, info);
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
- rowsize = png_get_rowbytes(png, info);
-
-@@ -379,7 +379,7 @@
- void PngDecoderImpl::nextScanline()
- {
- for (int i=0; i < n_interlace_passes; i++) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
- png_read_row(png, row_data.begin(), NULL);
- }
-@@ -545,7 +545,7 @@
- vigra_postcondition( png != 0, "could not create the write struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf( png ))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
- }
-@@ -556,7 +556,7 @@
- }
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf( png ))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
-@@ -571,7 +571,7 @@
- void PngEncoderImpl::finalize()
- {
- // write the IHDR
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
- png_set_IHDR( png, info, width, height, bit_depth, color_type,
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +579,7 @@
-
- // set resolution
- if (x_resolution > 0 && y_resolution > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
- png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
- (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +588,7 @@
-
- // set offset
- if (position.x > 0 && position.y > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
- png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
- }
-@@ -597,12 +597,12 @@
- // set icc profile
- if (iccProfile.size() > 0) {
- png_set_iCCP(png, info, "icc", 0,
-- (char *)iccProfile.begin(), iccProfile.size());
-+ iccProfile.begin(), iccProfile.size());
- }
- #endif
-
- // write the info struct
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
- png_write_info( png, info );
-
-@@ -634,10 +634,10 @@
- }
-
- // write the whole image
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
- png_write_image( png, row_pointers.begin() );
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf( png )))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
- png_write_end(png, info);
- }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2015-08-18 19:48 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2015-08-18 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 3328aca3ee421412e0edfd45f2a063fe4a27c486
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 19:48:36 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 19:48:36 2015 +0000
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=3328aca3
media-gfx/enblend: sync with gentoo
Package-Manager: portage-2.2.20.1
RepoMan-Options: --force
Manifest-Sign-Key: 0x363AF1F7765A9D02
media-gfx/enblend/Manifest | 34 +-
media-gfx/enblend/enblend-4.1.1-r1.ebuild | 2 +-
...end-4.1.1-r1.ebuild => enblend-4.1.1-r2.ebuild} | 6 +-
...end-4.1.1-r1.ebuild => enblend-4.1.1-r3.ebuild} | 10 +-
media-gfx/enblend/enblend-4.1.1.ebuild | 2 +-
media-gfx/enblend/enblend-4.1.2.ebuild | 2 +-
...nblend-4.1.3.ebuild => enblend-4.1.3-r1.ebuild} | 8 +-
media-gfx/enblend/enblend-4.1.3.ebuild | 2 +-
.../files/enblend-4.1.1-texinfo-5-upstream.patch | 617 ++++++++++++++++++++
.../files/enblend-4.1.3-texinfo-5-more.patch | 82 +++
.../files/enblend-4.1.3-texinfo-5-upstream.patch | 633 +++++++++++++++++++++
11 files changed, 1379 insertions(+), 19 deletions(-)
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index ef17203..00f04ec 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,19 +1,37 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX enblend-4.1.1-texinfo-5-upstream.patch 19028 SHA256 feb1f7ad9d7f1a381fba6dbd12961af9986e26d69a6f39810e4b30a5ceb27dea SHA512 4bcfdfaf799b047876658b5a84a6f2e1013f5a8014c4913eaeb7e10f2d548c37d7c4b5f6944078366f942a2617fbc08c68a89c0909ffc2c2ec8148fcf4151af0 WHIRLPOOL e3bd5dbe37e1a4873ebf341a81f32df368b26864c04f5526b801a3d3f27b03718aea585c9ade648e990e38a5b1013bf6c56df5cfc5cbb88efd84ce08b27cc782
+AUX enblend-4.1.3-texinfo-5-more.patch 2392 SHA256 880737cb7e6d2e07ec42f362474862b5d5ee34c61f1c6ddc59499c6d2f9ac822 SHA512 3f3d398d8c5a39289aefb36050658cd27c477b1b23d94b1e2fdb5c9e40b54c9ee0d62f8cd1aa281618c9b48e803b082aaf6196824038c04bf090ca49cfdd21f2 WHIRLPOOL 1a66bef9d0f1f945e80c1baecf2c484a58d2f956d91f601a915ffaa3ee8abf73e279b4103d0dbdd1b4e19ef089512cb0c664372591c0c8941f22183d7b461182
+AUX enblend-4.1.3-texinfo-5-upstream.patch 18609 SHA256 2b986850e46e157835ce7b9b97d80ca670c7c3d418bf8503fb043ce21e8714ad SHA512 f42d102a534887bd56637d08d64c37436b8590310a87a8dc5fb63550bd10ae2602ec3ddb51ea6b46d16ad3477e4b8b8f20fa48821e8745a5cf9e5693ae4af40e WHIRLPOOL 10315923be3dad7d9cc39be4581c9384a94217f6a74ab6bf45066add554c58cade69d7b51e790911a829ffe61d4a5a72d5b2c8dbaf8c64980d4e826039b59b80
AUX enblend-4.1.3-vigra_check.patch 464 SHA256 e3f4d417908c188284302882f8a35cbc0e8b69ad872699c476caff7ee723929a SHA512 e6a84c74220fcd985704d4b071ecc6f37dde8582ca9089a3dd0a782d739550e0479e52632324d25462fc59145e2309e21bdb406ad89b03902fa933b3322caab1 WHIRLPOOL db10e43c61758d32e0a401eedbb7258a160071f85823e35bd4f8207216a7c431645060493d1fce47d9b7e4e4aafb7e39c33857a4214d38a77bbf495333c69403
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
-EBUILD enblend-4.1.1-r1.ebuild 1744 SHA256 af1604ca1fee4b09b69f1ab14964633b7db21315da1b7b4fa7c5ab6e14d8d69d SHA512 0c4e71d6aadf8313e4143d40bc6e6ad7052be4ff6644806b61565c9d9cd7989517273effada7a268162354515dd685b47c7446b6b0994399d98f579e4a5da9d7 WHIRLPOOL 21001db32db2e23d7d8d59727e1b9c04b8f314ce7a107e143fd670760e8bbc2d919a4bb93308cb5c0070a6bd7195603b6272390df4d94607a5e0459f20098387
-EBUILD enblend-4.1.1.ebuild 1937 SHA256 a7c519f40c3c4b9149bf7fed592280cc29bad5da2cf8a594e9d8885ced21937a SHA512 d5be6d54b83c917e352c1a8e354cf730fa61679d14b46208f274fbae7a127bb5115902ac4e2997864544e904678f39c541c6dadb5c8bc0560913f262e3f104a8 WHIRLPOOL 5475db49caae94c7a92df20a10b4d0332f5049e2ba0e4386e0e4fecea93fdc46ebfc817b41c296449fc2724bd301496bebb58062041bec0aa39978fe3a8be6dc
-EBUILD enblend-4.1.2.ebuild 1760 SHA256 0764a2b9e48c5ccd86a221c5f65209aeb22e3de7ae8d784145a3af667a8619a1 SHA512 227aa25739b1a0a9e155993ea35eabada92a0b33af6529def8dbf551dfc3eb184575da76a989d56f1915284276fa72a6fdc3e0434ae1fad205c02ba4576edd9e WHIRLPOOL a72554ec6b1ccb4d536e547cc6eaa2d9807b7da7f8622343816924197ad661e09431c4370805269f3a96858e69fec23a4065fbeb4271f317c382a1f9713cf27b
-EBUILD enblend-4.1.3.ebuild 1866 SHA256 f92e398bf1bc50794aca0855ea192d99e523a712efc1081b811d08c365d0e1ea SHA512 b8b85554263171688e26a4f7e98e94e7d2c30b6402aa0d50627e6edbd8b4b02c0ecbfed9b6fca7ecde930b92470e69b32df810f9e204516fa57e21e907f1a01d WHIRLPOOL 8633d79473f3ce88402cdad16ac948eec50c85131b30413b33f9ad53f11ace66099492a285a12f89c139029114cb077e645d24504345ff7623d206d19cad08a9
+EBUILD enblend-4.1.1-r1.ebuild 1635 SHA256 010b1b1dbd019bbe480ef41205f857561a2284c43213232dc66da6da43cc66b2 SHA512 03a906c96a3a142c82f06f6a21e6ca03ac52048a9fc020873c9177ffe59f748f1916505c253545c5f24dc4151791e23477c3aa3a7a191bfde0c9fb18c3e83b05 WHIRLPOOL 579b9061d5a9c512889343eaae17af2a3aedbbd32459b43b858424ee0ab6b12e77321e11a0b02a43fd8a2ec3742f02a895098a9e4f5805a14d8d305ec00ce171
+EBUILD enblend-4.1.1-r2.ebuild 1695 SHA256 195fd1a585cd80d2d1307476b8da0a639e6c86afd1175d8816e98903b3239f07 SHA512 355119db32fafdb50f1023ac394d58099ee7adb400637ed5d887998f97180f6fac69dc0ccff99e9351e4f32e410af515fe32725b80f4b86e7faa0018cd4a9610 WHIRLPOOL e0e2e3c6b12789966c5f973b7330298e707cfc4ef48d1450d3b91b388d25fcf9dd61b8fb1583839e1c829a5872077bbfc0fd124d1b4ca20b28601c522d7bdb8a
+EBUILD enblend-4.1.1-r3.ebuild 1804 SHA256 838060b0ababc20356feaa174970852074f90466ff204ed7e9d1ec67db89ff8b SHA512 7e0ebae90f4aec2cbb6421c103d461d051936808c6c18a64673245c77da7efad1d5edc92524be2f94ee55fe19ddae748f6da3ad4c474df1d3a2342466f645fb5 WHIRLPOOL 09e0f96a7bfc727c31ccf1903a8068b1b1a7cc1cdb7d88e86bc8322489c44737f2986da38f5f8280be10b3cef05c026d48f636ef82c0f9e0a237cbb04b7116cb
+EBUILD enblend-4.1.1.ebuild 1830 SHA256 f7eb8edd1622f1fac09b0ccf453117cfbf8a11051c3f313a2e759d766fa2d384 SHA512 117b9625585c21abdb6e69c14b067dfabdf101ea070431c166fb171822ba6c942be8df396f4db1348ce531dc4fd6439515126b21c226bd045416070f65e08711 WHIRLPOOL dcbc48d1c38c08a60af0e1b45f9529159cb5e1714a3b66818beecb07da366628727b376321af0633f00ba9887fadae198c3bd122d5bb6cc0f1abccd6ebf6311d
+EBUILD enblend-4.1.2.ebuild 1654 SHA256 e7e97e285092a4ca5e999aeca61726b013eeaf559e05726089671476eb9aa948 SHA512 b663bf08e73ab4361c5c0a65ea678c17a485e86449c9d9319e065146643f615e58ea939b58469f665c9d42e654256e05f00e202948bb899b0eb689b65a51fa1c WHIRLPOOL 53bd88f4caa594d916578263586885792dd789b0f3552e9668164d8e67596679f8536cf5324e1fa1b520032f8fc466b398ae8122f2b46094f5daa111018a8ccc
+EBUILD enblend-4.1.3-r1.ebuild 1839 SHA256 1fbc86991f77de3f2ed69db612b5dac37ae9a57b110d945a6ffd06a5bba04ac0 SHA512 5264f067b92952118b2563c15610b396bb6fc379faa54ada291fe711969b6e1cf2e3068248e0785fcfcbdd796358afd583e9e55b8646c283f56af6df2f246ef3 WHIRLPOOL a0b2f556f14e7bbf881388e00896929b144bfdd1eb67b792448b4fe53858e3cad6f9b529ed4c6f33621c01b5c74a35ce6c1b46b05ee05a35ff1271192896015c
+EBUILD enblend-4.1.3.ebuild 1760 SHA256 cad2b357740b2137f0a832ce10af4fcf9b21f91ece71ed02521aac21eba10916 SHA512 c3661893bfb091ebda8b79bb9e89f5f57f2e56dbad000c220c0eda268d458d95bcf8046fb8245b2741f2a2f5995b5734b34c4847606c8a4eeef3a7b024da2e7e WHIRLPOOL d820fc3ded8272c3ec47c96131a87b4c3139a177ac7bad87cb410b85d827077d551e66ab1d7789e54c1018d551dd3044044da141ae26b3eff25944e264218078
MISC metadata.xml 386 SHA256 bdd95aecd66cd375334d95757dbf21f8ba162e92f9403c268f13e17192efbf7e SHA512 6b72e7a926b277102d98e03562d236332db10ac3512a5feb794606b6d7fcd345af6681faf3e2484d3a9b0365ea07d4bcb5e4fcf7056f5768607d6e69f4ead8af WHIRLPOOL c24f3e44c32a0af3602f6d17330c33a70ef5366b5a08254246008ec3742420ef30c36798afdf86cc0016785152675c4e1b16832b1364a39e163068a338b5076a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
-iEYEAREIAAYFAlW/284ACgkQkKaRLQcq0GLYWACdENRL+hUnf+Csdgdz0MRV1QSI
-1QQAn3tnvjnVPzHP1ELWXqN11Dqa3ZgD
-=rggZ
+iQJ8BAEBCABmBQJV04wUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
+QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q83NAP/jraRBJRHKodu9TUHHtnVL3+
+SWCLZ9RFo6hrbU9IY1GZCBzfTJnnF9V8Ph4aiuheaho1NvBNPy4Au8UGmOrddP1B
+PlaKyiIHx3elH22ibYZDj4nnZjjkDkx2pLkzMTeAUD/1Cd7rKDJiWcz1w6/ydW2H
+StDtguVMGKl5Fdt4BZjgMFEwEDQ8UU0eYPHXsOnKRZ4whpj6Wn7LmZa1iUVAIi+O
+T47epiZjP5L94wLFqyF0/A5LEMvrHuFU9UXZwAiU/uxX5WOr7RNDoQFnf48IAF7m
+d7276zpEHyV+1+qSwx1eh5WKYP85UPyHx6kUVdue7+NtYXjFzAv83e2E/PYxPXCW
+OVKIaj/Ri+nw504cnbSeLA2BKj0iGTYzwCD0fekON9NancppCRjKaOLKmNIFmMmP
+TNXDxJv8Chcw44Fl9AZ7dcEHFRs2L7/NKjvYrF10zNFgzlf3hPz/po7W37+X2Iiu
+mITnL6aT5O72VFUSn78AuciT5lrN9vXXnm79Mjwlw0sEH2g5q6980sLqFCSejYmn
+Nf5nnATu3w0yTHE+tZvaRmjBJKErzppefmVyPtr0WfjwOYpFbQ3k+Vr2/ZVVfCp1
+aZzded33PiEuynibRsxZFn73J6BAZZwVO0zMzeB5JmRI1M+IGaIKBx85GE20RRJu
+sWbxcmjzsNmrdCEQOyDT
+=VWDt
-----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-4.1.1-r1.ebuild b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
index 6d52eed..20e2832 100644
--- a/media-gfx/enblend/enblend-4.1.1-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1-r1.ebuild,v 1.3 2013/09/09 22:26:33 maekke Exp $
+# $Id$
EAPI=5
diff --git a/media-gfx/enblend/enblend-4.1.1-r1.ebuild b/media-gfx/enblend/enblend-4.1.1-r2.ebuild
similarity index 92%
copy from media-gfx/enblend/enblend-4.1.1-r1.ebuild
copy to media-gfx/enblend/enblend-4.1.1-r2.ebuild
index 6d52eed..aea8156 100644
--- a/media-gfx/enblend/enblend-4.1.1-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1-r1.ebuild,v 1.3 2013/09/09 22:26:33 maekke Exp $
+# $Id$
EAPI=5
-inherit cmake-utils
+inherit eutils cmake-utils
MY_P="${PN}-enfuse-${PV/_rc/rc}"
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
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
diff --git a/media-gfx/enblend/enblend-4.1.1-r1.ebuild b/media-gfx/enblend/enblend-4.1.1-r3.ebuild
similarity index 89%
copy from media-gfx/enblend/enblend-4.1.1-r1.ebuild
copy to media-gfx/enblend/enblend-4.1.1-r3.ebuild
index 6d52eed..2e46825 100644
--- a/media-gfx/enblend/enblend-4.1.1-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1-r3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1-r1.ebuild,v 1.3 2013/09/09 22:26:33 maekke Exp $
+# $Id$
EAPI=5
-inherit cmake-utils
+inherit eutils cmake-utils
MY_P="${PN}-enfuse-${PV/_rc/rc}"
@@ -44,9 +44,15 @@ DEPEND="${RDEPEND}
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() {
diff --git a/media-gfx/enblend/enblend-4.1.1.ebuild b/media-gfx/enblend/enblend-4.1.1.ebuild
index 1394af1..20e6ba7 100644
--- a/media-gfx/enblend/enblend-4.1.1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1.ebuild,v 1.2 2013/04/11 20:12:38 vincent Exp $
+# $Id$
EAPI=2
diff --git a/media-gfx/enblend/enblend-4.1.2.ebuild b/media-gfx/enblend/enblend-4.1.2.ebuild
index d02b628..5078db9 100644
--- a/media-gfx/enblend/enblend-4.1.2.ebuild
+++ b/media-gfx/enblend/enblend-4.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.2.ebuild,v 1.2 2014/06/15 12:34:05 maekke Exp $
+# $Id$
EAPI=5
diff --git a/media-gfx/enblend/enblend-4.1.3.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
similarity index 91%
copy from media-gfx/enblend/enblend-4.1.3.ebuild
copy to media-gfx/enblend/enblend-4.1.3-r1.ebuild
index a6bedc1..1984998 100644
--- a/media-gfx/enblend/enblend-4.1.3.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.3.ebuild,v 1.7 2015/07/25 11:21:33 maekke Exp $
+# $Id$
EAPI=5
-inherit cmake-utils
+inherit eutils cmake-utils
MY_P="${PN}-enfuse-${PV/_rc/rc}"
@@ -50,12 +50,14 @@ 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=""
- -DMAKEINFO_EXE="/bin/true"
$(cmake-utils_use_enable debug DMALLOC)
$(cmake-utils_use doc DOC)
$(cmake-utils_use_enable image-cache IMAGECACHE)
diff --git a/media-gfx/enblend/enblend-4.1.3.ebuild b/media-gfx/enblend/enblend-4.1.3.ebuild
index a6bedc1..132ec8d 100644
--- a/media-gfx/enblend/enblend-4.1.3.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.3.ebuild,v 1.7 2015/07/25 11:21:33 maekke Exp $
+# $Id$
EAPI=5
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
+
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] 4+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: media-gfx/enblend/, media-gfx/enblend/files/
@ 2015-10-17 10:49 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2015-10-17 10:49 UTC (permalink / raw
To: gentoo-commits
commit: 0b71af1ef3d2fe73ae313bb87674fdd2cf6598e2
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 10:47:30 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 10:47:30 2015 +0000
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=0b71af1e
media-gfx/enblend: sync with main tree
Package-Manager: portage-2.2.23
Manifest-Sign-Key: 0x363AF1F7765A9D02
media-gfx/enblend/Manifest | 39 +-
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-r1.ebuild | 2 +-
media-gfx/enblend/enblend-4.1.3.ebuild | 77 ---
.../files/enblend-4.1.1-texinfo-5-upstream.patch | 617 ---------------------
9 files changed, 16 insertions(+), 1101 deletions(-)
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 00f04ec..ccb94bb 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,37 +1,28 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX enblend-4.1.1-texinfo-5-upstream.patch 19028 SHA256 feb1f7ad9d7f1a381fba6dbd12961af9986e26d69a6f39810e4b30a5ceb27dea SHA512 4bcfdfaf799b047876658b5a84a6f2e1013f5a8014c4913eaeb7e10f2d548c37d7c4b5f6944078366f942a2617fbc08c68a89c0909ffc2c2ec8148fcf4151af0 WHIRLPOOL e3bd5dbe37e1a4873ebf341a81f32df368b26864c04f5526b801a3d3f27b03718aea585c9ade648e990e38a5b1013bf6c56df5cfc5cbb88efd84ce08b27cc782
AUX enblend-4.1.3-texinfo-5-more.patch 2392 SHA256 880737cb7e6d2e07ec42f362474862b5d5ee34c61f1c6ddc59499c6d2f9ac822 SHA512 3f3d398d8c5a39289aefb36050658cd27c477b1b23d94b1e2fdb5c9e40b54c9ee0d62f8cd1aa281618c9b48e803b082aaf6196824038c04bf090ca49cfdd21f2 WHIRLPOOL 1a66bef9d0f1f945e80c1baecf2c484a58d2f956d91f601a915ffaa3ee8abf73e279b4103d0dbdd1b4e19ef089512cb0c664372591c0c8941f22183d7b461182
AUX enblend-4.1.3-texinfo-5-upstream.patch 18609 SHA256 2b986850e46e157835ce7b9b97d80ca670c7c3d418bf8503fb043ce21e8714ad SHA512 f42d102a534887bd56637d08d64c37436b8590310a87a8dc5fb63550bd10ae2602ec3ddb51ea6b46d16ad3477e4b8b8f20fa48821e8745a5cf9e5693ae4af40e WHIRLPOOL 10315923be3dad7d9cc39be4581c9384a94217f6a74ab6bf45066add554c58cade69d7b51e790911a829ffe61d4a5a72d5b2c8dbaf8c64980d4e826039b59b80
AUX enblend-4.1.3-vigra_check.patch 464 SHA256 e3f4d417908c188284302882f8a35cbc0e8b69ad872699c476caff7ee723929a SHA512 e6a84c74220fcd985704d4b071ecc6f37dde8582ca9089a3dd0a782d739550e0479e52632324d25462fc59145e2309e21bdb406ad89b03902fa933b3322caab1 WHIRLPOOL db10e43c61758d32e0a401eedbb7258a160071f85823e35bd4f8207216a7c431645060493d1fce47d9b7e4e4aafb7e39c33857a4214d38a77bbf495333c69403
-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
-EBUILD enblend-4.1.1-r1.ebuild 1635 SHA256 010b1b1dbd019bbe480ef41205f857561a2284c43213232dc66da6da43cc66b2 SHA512 03a906c96a3a142c82f06f6a21e6ca03ac52048a9fc020873c9177ffe59f748f1916505c253545c5f24dc4151791e23477c3aa3a7a191bfde0c9fb18c3e83b05 WHIRLPOOL 579b9061d5a9c512889343eaae17af2a3aedbbd32459b43b858424ee0ab6b12e77321e11a0b02a43fd8a2ec3742f02a895098a9e4f5805a14d8d305ec00ce171
-EBUILD enblend-4.1.1-r2.ebuild 1695 SHA256 195fd1a585cd80d2d1307476b8da0a639e6c86afd1175d8816e98903b3239f07 SHA512 355119db32fafdb50f1023ac394d58099ee7adb400637ed5d887998f97180f6fac69dc0ccff99e9351e4f32e410af515fe32725b80f4b86e7faa0018cd4a9610 WHIRLPOOL e0e2e3c6b12789966c5f973b7330298e707cfc4ef48d1450d3b91b388d25fcf9dd61b8fb1583839e1c829a5872077bbfc0fd124d1b4ca20b28601c522d7bdb8a
-EBUILD enblend-4.1.1-r3.ebuild 1804 SHA256 838060b0ababc20356feaa174970852074f90466ff204ed7e9d1ec67db89ff8b SHA512 7e0ebae90f4aec2cbb6421c103d461d051936808c6c18a64673245c77da7efad1d5edc92524be2f94ee55fe19ddae748f6da3ad4c474df1d3a2342466f645fb5 WHIRLPOOL 09e0f96a7bfc727c31ccf1903a8068b1b1a7cc1cdb7d88e86bc8322489c44737f2986da38f5f8280be10b3cef05c026d48f636ef82c0f9e0a237cbb04b7116cb
-EBUILD enblend-4.1.1.ebuild 1830 SHA256 f7eb8edd1622f1fac09b0ccf453117cfbf8a11051c3f313a2e759d766fa2d384 SHA512 117b9625585c21abdb6e69c14b067dfabdf101ea070431c166fb171822ba6c942be8df396f4db1348ce531dc4fd6439515126b21c226bd045416070f65e08711 WHIRLPOOL dcbc48d1c38c08a60af0e1b45f9529159cb5e1714a3b66818beecb07da366628727b376321af0633f00ba9887fadae198c3bd122d5bb6cc0f1abccd6ebf6311d
-EBUILD enblend-4.1.2.ebuild 1654 SHA256 e7e97e285092a4ca5e999aeca61726b013eeaf559e05726089671476eb9aa948 SHA512 b663bf08e73ab4361c5c0a65ea678c17a485e86449c9d9319e065146643f615e58ea939b58469f665c9d42e654256e05f00e202948bb899b0eb689b65a51fa1c WHIRLPOOL 53bd88f4caa594d916578263586885792dd789b0f3552e9668164d8e67596679f8536cf5324e1fa1b520032f8fc466b398ae8122f2b46094f5daa111018a8ccc
-EBUILD enblend-4.1.3-r1.ebuild 1839 SHA256 1fbc86991f77de3f2ed69db612b5dac37ae9a57b110d945a6ffd06a5bba04ac0 SHA512 5264f067b92952118b2563c15610b396bb6fc379faa54ada291fe711969b6e1cf2e3068248e0785fcfcbdd796358afd583e9e55b8646c283f56af6df2f246ef3 WHIRLPOOL a0b2f556f14e7bbf881388e00896929b144bfdd1eb67b792448b4fe53858e3cad6f9b529ed4c6f33621c01b5c74a35ce6c1b46b05ee05a35ff1271192896015c
-EBUILD enblend-4.1.3.ebuild 1760 SHA256 cad2b357740b2137f0a832ce10af4fcf9b21f91ece71ed02521aac21eba10916 SHA512 c3661893bfb091ebda8b79bb9e89f5f57f2e56dbad000c220c0eda268d458d95bcf8046fb8245b2741f2a2f5995b5734b34c4847606c8a4eeef3a7b024da2e7e WHIRLPOOL d820fc3ded8272c3ec47c96131a87b4c3139a177ac7bad87cb410b85d827077d551e66ab1d7789e54c1018d551dd3044044da141ae26b3eff25944e264218078
+EBUILD enblend-4.1.3-r1.ebuild 1837 SHA256 499806ff7181dc75532b12604a4dd508d01b270ee2cd14ac37191590279d3e8a SHA512 72ae89bdb7996ce8d7de6226f93cdf06f65951d32d975805a2c6aed5e0ba4875ed23eca5e4262f52516accdeacf01df656f48df180df3e5da06545cd293ec251 WHIRLPOOL 2f8a214a7ca9c649608bcfa7b27eafbbcf94f4522018afd83886679e0c51d6d5d6eb4d8954983fe64de384ad325475a63a214c11ca1a1943552642931abd4865
MISC metadata.xml 386 SHA256 bdd95aecd66cd375334d95757dbf21f8ba162e92f9403c268f13e17192efbf7e SHA512 6b72e7a926b277102d98e03562d236332db10ac3512a5feb794606b6d7fcd345af6681faf3e2484d3a9b0365ea07d4bcb5e4fcf7056f5768607d6e69f4ead8af WHIRLPOOL c24f3e44c32a0af3602f6d17330c33a70ef5366b5a08254246008ec3742420ef30c36798afdf86cc0016785152675c4e1b16832b1364a39e163068a338b5076a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJV04wUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWIicxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
-QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q83NAP/jraRBJRHKodu9TUHHtnVL3+
-SWCLZ9RFo6hrbU9IY1GZCBzfTJnnF9V8Ph4aiuheaho1NvBNPy4Au8UGmOrddP1B
-PlaKyiIHx3elH22ibYZDj4nnZjjkDkx2pLkzMTeAUD/1Cd7rKDJiWcz1w6/ydW2H
-StDtguVMGKl5Fdt4BZjgMFEwEDQ8UU0eYPHXsOnKRZ4whpj6Wn7LmZa1iUVAIi+O
-T47epiZjP5L94wLFqyF0/A5LEMvrHuFU9UXZwAiU/uxX5WOr7RNDoQFnf48IAF7m
-d7276zpEHyV+1+qSwx1eh5WKYP85UPyHx6kUVdue7+NtYXjFzAv83e2E/PYxPXCW
-OVKIaj/Ri+nw504cnbSeLA2BKj0iGTYzwCD0fekON9NancppCRjKaOLKmNIFmMmP
-TNXDxJv8Chcw44Fl9AZ7dcEHFRs2L7/NKjvYrF10zNFgzlf3hPz/po7W37+X2Iiu
-mITnL6aT5O72VFUSn78AuciT5lrN9vXXnm79Mjwlw0sEH2g5q6980sLqFCSejYmn
-Nf5nnATu3w0yTHE+tZvaRmjBJKErzppefmVyPtr0WfjwOYpFbQ3k+Vr2/ZVVfCp1
-aZzded33PiEuynibRsxZFn73J6BAZZwVO0zMzeB5JmRI1M+IGaIKBx85GE20RRJu
-sWbxcmjzsNmrdCEQOyDT
-=VWDt
+QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q825kP/i7LBGDc4u0WU6kyG7ZahwnG
+J41GY+5tZR/U2mmvdiIaNfnT6ur0ejTUcuXhAURiXapD6tSySnHYhJ9Ho8C+0F/t
+LX4KcstZYxbKFr6xO4Ip5xJroF5S/M/lpMwdOE0ZxC/mXKG/Kk8tutKXoeEnWtrM
+NHXdnOVCcVL87Dey5hE/ycIz9M2eUG2cRztyFr2u3h7qTEZccCi+IFObRV+m6tJS
+51rfeny8i1Ufd33MvANjUgY0dZ4L7kNEF8CHka57b0Ks9PcuzGxEp8dlRSBq0WeI
+GoBEJXdLU6ZyVmsCyZ2Hq5S/6PDjrDI5CqyUItUImNHRTXCA+iuwlQVyt5/s4ZKN
+gKs11uOhtaj33yQjRWQ7MH8GdWBEygQklHnrBuRjLGE8W3Z28ptGz+2RRm7BuXjx
+scTJv6iqr1Jl+7oLkoa1wZ43ZPC5xD4DmBIH36/Cn+sjYEZtIRZFTVg4AzOaV3tB
+K9zqCcL0vRBhm8aTm0wdV2vVxa+U7KhTr9C6Ej4K28omHGYrtUQwuQC8YnEYLHYA
+V02TRhqAiGDN04UkBu0ksckqX4DWJ7/UCsOGV7y07m6c8bBDnGiNDFiPO115Vk1T
+9jyxmWI4MQBvGvbx7CRg5uLwjDe9Oi2SxctWY7pDuEeHEd87/aYjX9iy3DTGQV2r
+glYKmK6RJk/FWAkmnvS3
+=DBus
-----END PGP SIGNATURE-----
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-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
index 1984998..29afffa 100644
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
LICENSE="GPL-2 VIGRA"
SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="debug doc gpu image-cache openmp"
REQUIRED_USE="openmp? ( !image-cache )"
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 132ec8d..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] 4+ messages in thread
end of thread, other threads:[~2015-10-17 10:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-18 9:57 [gentoo-commits] dev/maekke:master commit in: media-gfx/enblend/, media-gfx/enblend/files/ Markus Meier
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 19:57 Markus Meier
2015-08-18 19:48 Markus Meier
2015-10-17 10:49 Markus Meier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox