diff options
author | 2022-02-11 20:27:31 +0100 | |
---|---|---|
committer | 2022-02-11 20:27:31 +0100 | |
commit | a92d59a7d0feb84debda3bf7a6db3ea786d08710 (patch) | |
tree | 515c73e16b2f1bb491c6f2a896319ce1144359bf /media-gfx | |
parent | media-gfx/darktable: version bump (diff) | |
download | maekke-a92d59a7d0feb84debda3bf7a6db3ea786d08710.tar.gz maekke-a92d59a7d0feb84debda3bf7a6db3ea786d08710.tar.bz2 maekke-a92d59a7d0feb84debda3bf7a6db3ea786d08710.zip |
media-gfx/enblend: sync with main tree
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Markus Meier <maekke@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/enblend/Manifest | 31 | ||||
-rw-r--r-- | media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild | 58 | ||||
-rw-r--r-- | media-gfx/enblend/files/enblend-4.1.3-cmake.patch | 22 | ||||
-rw-r--r-- | media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch | 82 | ||||
-rw-r--r-- | media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch | 633 | ||||
-rw-r--r-- | media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch | 11 | ||||
-rw-r--r-- | media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch | 16 | ||||
-rw-r--r-- | media-gfx/enblend/metadata.xml | 12 |
8 files changed, 60 insertions, 805 deletions
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index 50011fe..d61249d 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1,31 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX enblend-4.1.3-cmake.patch 1004 BLAKE2B 7912d827e702d85e6c356b0a246e3f9d465371d0f875523384772397a7a2cfa4320b4b743c76263e4069a9abd70e2429bd654d47e537a795df9a3b5dc6a000b3 SHA512 2143d9b448d29c37cc03dd40ee99f841ccb8d79f53597ef5fc6ef9a2090eaeaa7b789f86f85c468159f19f199cf3a1c330971b51ce6590b2ca6bf4b90765fef1 -AUX enblend-4.1.3-texinfo-5-more.patch 2392 BLAKE2B 57f6f57cb19487afb6a093d5bc671628fd24533ad2dd7319d63d1c2a452ad170da18b023545d5601957469f06ff972a94ac3049a7efe55a469939bf1190ed952 SHA512 3f3d398d8c5a39289aefb36050658cd27c477b1b23d94b1e2fdb5c9e40b54c9ee0d62f8cd1aa281618c9b48e803b082aaf6196824038c04bf090ca49cfdd21f2 -AUX enblend-4.1.3-texinfo-5-upstream.patch 18609 BLAKE2B 86aa3c27e2e79a8064949a4599a64ed767b998204532f54d362842e6dc6112772abca5b497073997f18290dd568bdccffd7fddf065f7ecaaf9c04da7869ee5aa SHA512 f42d102a534887bd56637d08d64c37436b8590310a87a8dc5fb63550bd10ae2602ec3ddb51ea6b46d16ad3477e4b8b8f20fa48821e8745a5cf9e5693ae4af40e -AUX enblend-4.1.3-vigra_check.patch 463 BLAKE2B c1e4ef25952285edeab6f78f74c715fbd1726490ab31b788e6a0dd708df7faec275bc1bd6b9dcd4082f635ed742f1b2485a74262eea1b8b44f51cd1d39a1a61d SHA512 5b459c7da0608369fc591ad67fd295f3e2b11f78d5cba4e7d57116dbb0038f00b6c5f0fc190e4c40b0b625f77885ddfe51e8432654c78c03dc9040d34ae96372 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0 +AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3 -EBUILD enblend-4.2.0_p20161007-r1.ebuild 1756 BLAKE2B 65b93a2b9eaafc5771cec53a48e2d62dea398f2ed844ab3277e23e72e1935567401c1132efb02f2c55c5a346d7af370e380ab53f4d97a1f705006b7042d3ae9a SHA512 be06524f5efa2da515f7e3e6fb398dd9ce7e8c631277a87396a19a6b752bafe8b2782e2ff93696f5221feb58b05d6f517dd4f1d4d326dcb12e8921bea9669a37 -MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQKTBAEBCAB9FiEErJcI5lTqgnns7I/6UVnB5yGcCiwFAlzHWDNfFIAAAAAALgAo -aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEFD -OTcwOEU2NTRFQTgyNzlFQ0VDOEZGQTUxNTlDMUU3MjE5QzBBMkMACgkQUVnB5yGc -Ciw+rhAAwdm7XK71Lj+swBSYzeGLSmrZ8ofS86jCHdPz4jqQiM6iS+hzUKRpy3h/ -Xksv6CvdxfNC1k16Q3OJI+IqdDy/MWJ041OWs5oJHC8LeIkSw0gf7MefBcNQBpNn -62xdGdzYp+DQIwOFn56gOkxVObEGPmPeTPvbzRwy6MDpVT2ETKp37jRfl0nTrcww -fPgPciauFIyfKafPtrNn4sDNTQ6NFBa8UvoGiHsBt02g0kxAKbMC0ylnjKIVdOJA -iVFebkXyVP0+xBDQc+ndK9ibG0vRK3w9DwxwqwoMHhVQNpV26hmdivv0sUWCj1sZ -T3Dx9CDnbBJ/0IR2TImWDS0f0OA2OOeMpeswVdLkkPBe+RWl3YO6PxOWnvcnzENZ -yHV514+SAXupFpK/QFLKXVHR/2nNq8jo7i9oBsRscVaxZwtTvlHKMJlLLuUm+LtS -a6vLoV+jqF2KRcGOCo7CzZTohPKkViAC8CKrtxsh76H2qFLF83A9YEroOmRA8jsb -sD7i62J8MU5mNos+u5QRWsD644HvQcDpl4QSWeDVaR/jcdVHYQlHIha/ms+WhfdZ -hUrfx0n/KYsBd1g17ixZl/iHwhDEkPJUeWJa+4qob6Qkhcd5juBeZ6LwRe13kDsQ -araAIFj2IAbjXUcecLRnu9n5ojdGZzXij56m9xHLsVhEuiv024w= -=7aH1 ------END PGP SIGNATURE----- +EBUILD enblend-4.2.0_p20161007-r1.ebuild 1790 BLAKE2B 1aa4166b42fa855065f735f700393cd911bec040b7ab7f9ccdbcbc7cb6e1f7ae0430fca7de49f281f692cf7e127941a264e309f44cefee55347cb4ff4d35dc3c SHA512 780ed15262a29d9843757648c1045253a2edcc2719ff49b219cd6a71ec6a37683f23bc12d761a0ac554496fa914243ccab4bd1a601b54e7c9ba9943aef40aa76 +MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181 diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild index 137c0d6..d0aaf68 100644 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild +++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="Image Blending with Multiresolution Splines" HOMEPAGE="http://enblend.sourceforge.net/" @@ -11,24 +11,13 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" LICENSE="GPL-2+ FDL-1.2+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2" +KEYWORDS="amd64 arm64 x86" +IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc" REQUIRED_USE="tcmalloc? ( !debug )" -RDEPEND=" - media-libs/lcms:2 - media-libs/openexr:= - media-libs/tiff:0 - media-libs/vigra[openexr] - sci-libs/gsl:= - debug? ( dev-libs/dmalloc ) - tcmalloc? ( dev-util/google-perftools )" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.62.0 - media-libs/libpng:0 +BDEPEND=" sys-apps/help2man - virtual/jpeg:0 virtual/pkgconfig doc? ( dev-lang/perl @@ -40,30 +29,49 @@ DEPEND="${RDEPEND} sci-visualization/gnuplot[gd] virtual/imagemagick-tools virtual/latex-base - )" + ) +" +RDEPEND=" + media-libs/lcms:2 + media-libs/openexr:= + media-libs/tiff:0 + media-libs/vigra[openexr] + sci-libs/gsl:= + debug? ( dev-libs/dmalloc ) + tcmalloc? ( dev-util/google-perftools ) +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.62.0 + media-libs/libpng:0 + virtual/jpeg:0 +" PATCHES=( "${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${P}-gcc-10.patch ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die } src_configure() { local mycmakeargs=( + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) -DENABLE_DMALLOC=$(usex debug) - -DENABLE_TCMALLOC=$(usex tcmalloc) -DDOC=$(usex doc) - -DINSTALL_HTML_DOC=$(usex doc) - -DINSTALL_PDF_DOC=$(usex doc) -DENABLE_OPENMP=$(usex openmp) - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) + -DENABLE_TCMALLOC=$(usex tcmalloc) ) - cmake-utils_src_configure + if use doc; then + -DINSTALL_HTML_DOC=ON + -DINSTALL_PDF_DOC=ON + fi + + cmake_src_configure } src_compile() { @@ -74,5 +82,5 @@ src_compile() { export VARTEXFONTS="${T}/fonts" # forcing -j1 as every parallel compilation process needs about 1 GB RAM. - cmake-utils_src_compile -j1 + cmake_src_compile -j1 } diff --git a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch deleted file mode 100644 index e9fef85..0000000 --- a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/CMakeLists.txt 2017-02-12 13:43:46.862787952 +0100 -+++ b/CMakeLists.txt 2017-02-12 13:50:03.461229021 +0100 -@@ -185,7 +185,6 @@ - FIND_PACKAGE(TIFF REQUIRED) - FIND_PACKAGE(Perl REQUIRED) - # this one is needed in doc. (Especially the program "convert") --FIND_PACKAGE(ImageMagick REQUIRED) - FIND_PACKAGE(GSL REQUIRED) - include_directories(${GSL_INCLUDE_DIR}) - LIST(APPEND common_libs ${LCMS2_LIBRARIES} ${TIFF_LIBRARIES} ${GSL_LIBRARIES}) -@@ -394,8 +393,9 @@ - add_subdirectory(src) - - # you really should have perl installed, when creating doc's --if (PERL_FOUND AND IMAGEMAGICK_FOUND AND DOC) -- # this should be set from comman line -+if (PERL_FOUND AND DOC) -+ FIND_PACKAGE(ImageMagick REQUIRED) -+ # this should be set from command line - # Possible values like described in README: @smallbook @afivepaper @afourpaper @afourwide @afourlatex - # @letter is default - set(EXTRATEXI2DVIFLAGS "@afourpaper" CACHE STRING "Papersize: @letter @smallbook @afivepaper @afourpaper @afourwide @afourlatex") diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch deleted file mode 100644 index dd63ae3..0000000 --- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 7ec0e758430f9e31fb9fc0f85d72339a307263d6 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Fri, 14 Aug 2015 03:09:57 +0200 -Subject: [PATCH] Texinfo: Fix parameter handling with macro "mainpurpose" - ---- - doc/auxmac.texi | 6 +++--- - doc/enfuse.texi | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/doc/auxmac.texi b/doc/auxmac.texi -index 59520c3..ad35d6a 100644 ---- a/doc/auxmac.texi -+++ b/doc/auxmac.texi -@@ -88,12 +88,12 @@ not displayed, because of lacking <acronym>SVG</acronym> and - - @c Text Fragments - --@macro mainpurpose -+@macro mainpurpose{purpose} - @ifinfo --@strong{Main Purpose}: -+@strong{Main Purpose}: \purpose\ - @end ifinfo - @ifnotinfo --@strong{Main Purpose: } -+@strong{Main Purpose: }\purpose\ - @end ifnotinfo - @end macro - -diff --git a/doc/enfuse.texi b/doc/enfuse.texi -index 92fe597..9e601ea 100644 ---- a/doc/enfuse.texi -+++ b/doc/enfuse.texi -@@ -5164,7 +5164,7 @@ Fire in rapid succession. - @cindex series, simple - @cindex noise reduction - --@mainpurpose Reduce noise -+@mainpurpose{Reduce noise} - - @noindent - With the default settings, Enfuse computes a weighted average of the -@@ -5193,7 +5193,7 @@ be worth an extra run. - @cindex series, exposure - @cindex dynamic range increase - --@mainpurpose Increase manageable dynamic range -+@mainpurpose{Increase manageable dynamic range} - - @noindent - An exposure series is a set of images taken with identical parameters -@@ -5322,7 +5322,7 @@ the multiply occuring exposures and reducing noise. - @cindex series, flash exposure - @cindex dynamic range increase - --@mainpurpose ??? -+@mainpurpose{???} - - ... - -@@ -5333,7 +5333,7 @@ the multiply occuring exposures and reducing noise. - @cindex series, polarization - @cindex saturation enhancement - --@mainpurpose Reflection suppression, saturation enhancement -+@mainpurpose{Reflection suppression, saturation enhancement} - - In the current implementation of Enfuse, it is not possible in general - to fuse a polarization series. Naively abusing -@@ -5345,7 +5345,7 @@ to fuse a polarization series. Naively abusing - @cindex focus stacks - @cindex depth-of-focus increase - --@mainpurpose Synthetic Depth-of-Field Increase -+@mainpurpose{Synthetic Depth-of-Field Increase} - - A @dfn{focus stack} is a series of images where the distance of the - focal plane from the sensor varies. Sloppily speaking, the images --- -2.5.0 - diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch deleted file mode 100644 index ef04aa7..0000000 --- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch +++ /dev/null @@ -1,633 +0,0 @@ -# HG changeset patch -# User Chris <cspiel@users.sourceforge.net> -# Date 1438958604 -7200 -# Node ID 8387f0170f7b352baea887f77960e8066185a6cd -# Parent c1bcd2df4e3724f3bb0414d3a5e2e9302be78921 -Get the Texinfo documentation to translate again with makeinfo-5.2. - -This patch takes thus care of issue #1181678 - https://bugs.launchpad.net/enblend/+bug/1181678 - -We do not strive for a nicely formatted documentation anymore in the -Stable Branch, because the Development Branch already has a flawless -new documentation *not* based on Texinfo. - -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/Makefile.am ---- a/doc/Makefile.am Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/Makefile.am Fri Aug 07 16:43:24 2015 +0200 -@@ -46,7 +46,7 @@ - -I $(top_builddir) -I $(srcdir) \ - --css-include=@srcdir@/default.css \ - $(MAKEINFOHTMLFLAGS) --export TEXINPUTS=$(top_builddir):$(srcdir) -+export TEXINPUTS = .:$(top_builddir):$(srcdir): - - TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS) - -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.tex ---- a/doc/auxmac.tex Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/auxmac.tex Fri Aug 07 16:43:24 2015 +0200 -@@ -1,13 +1,6 @@ --\input thumbpdf.sty -- -- - % Auxilliary Macros. - % - % Include this file before texinfo.tex! - - \def\mathit#1{\hbox{\it #1}} - \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi} -- --% These definitions are required for older versions of texinfo.tex. --\def\geq{\ifmmode \ge\else $\ge$\fi} --\def\leq{\ifmmode \le\else $\le$\fi} -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.texi ---- a/doc/auxmac.texi Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/auxmac.texi Fri Aug 07 16:43:24 2015 +0200 -@@ -2,16 +2,6 @@ - @c Macro Definitions - @c - --@c redefined commands -- --@c Get the spacing of dimensions right. --@ifnottex --@macro dmn{unit} --@tie{}\unit\ --@end macro --@end ifnottex -- -- - @c extended commands - - @c Add a title to a DocBook element. -@@ -80,73 +70,6 @@ - - @c Operators - --@c Generate a nice representation of base^exponent. --@macro power{base, exponent} --@ifinfo --\base\^\exponent\ --@end ifinfo --@html --\base\<sup>\exponent\</sup> --@end html --@tex --$\base\^{\exponent\}$% --@end tex --@docbook --\base\<superscript>\exponent\</superscript> --@end docbook --@end macro -- -- --@macro classictimes --@ifinfo --x@c gobble following newline -- The Tricks of a Texinfo Wizard. --@end ifinfo --@html --× --@end html --@tex --\\ifmmode\\times\\else$\\times$\\fi% gobble following newline -- The Tricks of a TeX Wizard. --@end tex --@docbook --× --@end docbook --@end macro -- -- --@c Required for older versions of makeinfo. The definition of @geq --@c for TeX lives in auxmac.tex. --@ifnottex --@macro geq --@ifinfo -->=@c --@end ifinfo --@html --≥ --@end html --@docbook --≥ --@end docbook --@end macro --@end ifnottex -- -- --@c Required for older versions of makeinfo. The definition of @leq --@c for TeX lives in auxmac.tex. --@ifnottex --@macro leq --@ifinfo --<=@c --@end ifinfo --@html --≤ --@end html --@docbook --≤ --@end docbook --@end macro --@end ifnottex -- -- - @macro plusminus - @ifinfo - +/-@c -@@ -163,62 +86,6 @@ - @end macro - - --@c Special Characters -- --@macro inlineomega --@ifinfo --@math{omega}@c --@end ifinfo --@html --<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> -- <mi>ω</mi> --</mathinline> --@end html --@tex --$\\omega$% --@end tex --@docbook --ω --@end docbook --@end macro -- -- --@macro inlinesigma --@ifinfo --@math{sigma}@c --@end ifinfo --@html --<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> -- <mi>σ</mi> --</mathinline> --@end html --@tex --$\\sigma$% --@end tex --@docbook --σ --@end docbook --@end macro -- -- --@macro inlinexi --@ifinfo --@math{xi}@c --@end ifinfo --@html --<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> -- <mi>ξ</mi> --</mathinline> --@end html --@tex --$\\xi$% --@end tex --@docbook --ξ --@end docbook --@end macro -- -- - @c Text Fragments - - @macro mainpurpose -@@ -236,26 +103,3 @@ - @noindent - @strong{Summary of influential options} - @end macro -- -- --@macro semilog{significant, exponent} --@ifinfo --\significant\*10^\exponent\@c --@end ifinfo --@html --<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline"> -- <mn>\significant\</mn> -- <mo>×</mo> -- <msup> -- <mn>10</mn> -- <mn>\exponent\</mn> -- </msup> --</math> --@end html --@tex --\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi% --@end tex --@docbook --\significant\×10<superscript>\exponent\</superscript> --@end docbook --@end macro -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/bug-reports.texi ---- a/doc/bug-reports.texi Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/bug-reports.texi Fri Aug 07 16:43:24 2015 +0200 -@@ -77,7 +77,7 @@ - @item - A complete set of input images that will reproduce the bug. Strive - for a minimal set of @emph{small}@footnote{Images of a size less than --1500@classictimes{}1000 pixels qualify as small.} images. -+1500x1000 pixels qualify as small.} images. - - @item - The type of machine you are using, and the operating system name and -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.info -Binary file doc/enblend.info has changed -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.texi ---- a/doc/enblend.texi Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/enblend.texi Fri Aug 07 16:43:24 2015 +0200 -@@ -508,9 +508,9 @@ - twice as large as the previous one. So, the zeroth layer, the - original image, obviously defines the image at single-pixel scale, the - first level works at two-pixel scale, and generally, the @math{n}-th --level contains image data at @power{2, n}-pixel scale. This is the -+level contains image data at 2^n-pixel scale. This is the - reason why an image of --@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be -+@math{width}x@/@math{height}@dmn{pixels} cannot be - deconstructed into a pyramid of more than - @ifinfo - @display -@@ -1194,11 +1194,11 @@ - - @itemize - @item --Minimum normalized value: @semilog{1.2, -38} -+Minimum normalized value: 1.2e-38 - @item --Epsilon: @semilog{1.2, -7} -+Epsilon: 1.2e-7 - @item --Maximum finite value: @semilog{3.4, 38} -+Maximum finite value: 3.4e38 - @end itemize - - @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 -@@ -1210,11 +1210,11 @@ - - @itemize - @item --Minimum normalized value: @semilog{2.2, -308} -+Minimum normalized value: 2.2e-308 - @item --Epsilon: @semilog{2.2, -16} -+Epsilon: 2.2e-16 - @item --Maximum finite value: @semilog{1.8, 308} -+Maximum finite value: 1.8e308 - @end itemize - @end table - -@@ -1236,11 +1236,11 @@ - - @itemize - @item --Minimum normalized value: @semilog{9.3, -10} -+Minimum normalized value: 9.3e-10 - @item --Epsilon: @semilog{2.0, -3} -+Epsilon: 2.0e-3 - @item --Maximum finite value: @semilog{4.3, 9} -+Maximum finite value: 4.3e9 - @end itemize - - @item -f @var{WIDTH}x@var{HEIGHT} -@@ -1250,7 +1250,7 @@ - @cindex canvas size - @cindex size, canvas - Ensure that the minimum ``canvas'' size of the output image is at --least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify -+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify - the @var{XOFFSET} and @var{YOFFSET}, too. - - @pindex nona @r{(Hugin)} -@@ -1572,7 +1572,7 @@ - @value{src::default-coarseness-factor}, this means, - option@tie{}@option{--coarse-mask} shrinks the overlapping - @emph{areas} by a factor of --@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}. -+@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}. - With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a - run of Enblend shrinks approximately by 80% and the maximum amount of - memory in use at a time is decreased to 60% (Enblend compiled with -@@ -2494,7 +2494,7 @@ - When using this option in conjunction with - option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the - smoothing occurs @emph{after} the overlap regions have been shrunken. --Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR} -+Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR} - times larger area in the original images. - - Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}. -@@ -2606,7 +2606,7 @@ - @rimage{seam-line-visualization} - - @caption{Seam-line visualization of a simple overlap. The --853@classictimes{}238@dmn{pixel} image is shown at a magification of -+853x238@dmn{pixel} image is shown at a magification of - 100%.} - - @shortcaption{Seam-line visualization} -@@ -2618,7 +2618,7 @@ - @rimage{seam-line-visualization, 15cm} - - @caption{Seam-line visualization of a simple overlap. The --853@classictimes{}238@dmn{pixel} image has been rescaled to a width of -+853x238@dmn{pixel} image has been rescaled to a width of - approximately 15@dmn{cm}.} - - @shortcaption{Seam-line visualization} -@@ -2629,7 +2629,7 @@ - @float Figure,Figure:seam-line-visualization - @rimage{seam-line-visualization, 15cm} - --@caption{Seam-line visualization of a simple overlap. The 853@classictimes{}238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} -+@caption{Seam-line visualization of a simple overlap. The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} - - @shortcaption{Seam-line visualization} - @end float -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.info -Binary file doc/enfuse.info has changed -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.texi ---- a/doc/enfuse.texi Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/enfuse.texi Fri Aug 07 16:43:24 2015 +0200 -@@ -621,9 +621,9 @@ - twice as large as the previous one. So, the zeroth layer, the - original image, obviously defines the image at single-pixel scale, the - first level works at two-pixel scale, and generally, the @math{n}-th --level contains image data at @power{2, n}-pixel scale. This is the -+level contains image data at 2^n-pixel scale. This is the - reason why an image of --@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be -+@math{width}x@/@math{height}@dmn{pixels} cannot be - deconstructed into a pyramid of more than - @ifinfo - @display -@@ -1255,11 +1255,11 @@ - - @itemize - @item --Minimum normalized value: @semilog{1.2, -38} -+Minimum normalized value: 1.2e-38 - @item --Epsilon: @semilog{1.2, -7} -+Epsilon: 1.2e-7 - @item --Maximum finite value: @semilog{3.4, 38} -+Maximum finite value: 3.4e38 - @end itemize - - @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 -@@ -1271,11 +1271,11 @@ - - @itemize - @item --Minimum normalized value: @semilog{2.2, -308} -+Minimum normalized value: 2.2e-308 - @item --Epsilon: @semilog{2.2, -16} -+Epsilon: 2.2e-16 - @item --Maximum finite value: @semilog{1.8, 308} -+Maximum finite value: 1.8e308 - @end itemize - @end table - -@@ -1297,11 +1297,11 @@ - - @itemize - @item --Minimum normalized value: @semilog{9.3, -10} -+Minimum normalized value: 9.3e-10 - @item --Epsilon: @semilog{2.0, -3} -+Epsilon: 2.0e-3 - @item --Maximum finite value: @semilog{4.3, 9} -+Maximum finite value: 4.3e9 - @end itemize - - @item -f @var{WIDTH}x@var{HEIGHT} -@@ -1311,7 +1311,7 @@ - @cindex canvas size - @cindex size, canvas - Ensure that the minimum ``canvas'' size of the output image is at --least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify -+least @var{WIDTH}x@/@var{HEIGHT}. Optionally specify - the @var{XOFFSET} and @var{YOFFSET}, too. - - @pindex nona @r{(Hugin)} -@@ -1501,8 +1501,8 @@ - @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement - step, @var{LCE-FACTOR} is the weight factor (``strength''). - --@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original} --@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original}, -+@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original} -+@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original}, - @var{LCE-SCALE}). - - @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and -@@ -1531,7 +1531,7 @@ - @opindex --contrast-window-size - - Set the window @var{SIZE} for local contrast analysis. The window --will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If -+will be a square of @var{SIZE}x@/@var{SIZE} pixels. If - given an even @var{SIZE}, Enfuse will automatically use the next odd - number. - -@@ -1585,7 +1585,7 @@ - @opindex --entropy-window-size - - Window @var{SIZE} for local entropy analysis. The window will be a --square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. -+square of @var{SIZE}x@/@var{SIZE} pixels. - - In the entropy calculation @var{SIZE} values of 3 to 7 yield an - acceptable compromise of the locality of the information and the -@@ -2433,20 +2433,6 @@ - from 1 to the common height, and @math{i} from 1 to the number of - input images@tie{}@math{n}. - --@macro equationW{} --@ifnotdocbook --@ifnottex --(W) --@end ifnottex --@end ifnotdocbook --@tex --(W)% --@end tex --@docbook --<xref linkend="equ:pixel-weighting-function"/> --@end docbook --@end macro -- - Enfuse allows for weighting the contribution of each @math{P(i, x, y)} - to the final @math{Q(x, y)}: - @ifinfo -@@ -2454,7 +2440,7 @@ - @math{w(P(1, x, y)) * P(1, x, y) + - ... + - w(P(n, x, y)) * P(n, x, y) ----> Q(x, y),}@w{ }@equationW{} -+--> Q(x, y),} - @end display - @end ifinfo - @html -@@ -2520,9 +2506,6 @@ - <mi>y</mi> - </mfenced> - </mrow> -- <mtext>,</mtext> -- <mspace width="4em"/> -- <mtext>@equationW{}</mtext> - </mrow> - </math> - @end html -@@ -2530,7 +2513,7 @@ - $$ - w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y) - \rightarrow -- Q(x, y),\hskip4em\hbox{@equationW{}} -+ Q(x, y) - $$ - @end tex - @docbook -@@ -2948,7 +2931,7 @@ - be extreme, favoring only a few pixels or even only one pixel in the - input stack. Extremes are not typical, however. - --Equal weights are another extreme that turns @equationW{} into an -+Equal weights are another extreme that turns the equation into an - arithmetic average. This is why we sometimes speak of the ``averaging - property'' of this weighting algorithm, like smoothing out noise. - -@@ -2969,7 +2952,7 @@ - wins, this is, gets weight@tie{}one, and all other pixels get the - weight of zero - (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The --Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{} -+Winner Takes It All.''}). With @option{--hard-mask} the equation - becomes - @ifinfo - @display -@@ -3114,8 +3097,8 @@ - - @noindent - Note that this ``averaging'' scheme lacks the nice noise-reduction --property of the weighted average@tie{}@equationW{}, because only a --single input pixel contributes to the output. -+property of the weighted average, because only a single input pixel -+contributes to the output. - - - @node Single Criterion Fusing -@@ -3562,7 +3545,7 @@ - - @noindent - It associates a probability@tie{}@math{p} with each of the @math{n} --different possible outcomes@tie{}@inlineomega{} of the random -+different possible outcomes@tie{}@math{omega} of the random - variable@tie{}@math{X}. - @cindex expectation value - Based on @math{w}, we define the @dfn{expectation value} or ``First -@@ -4189,7 +4172,7 @@ - @end docbook - - @noindent --The parameter@tie{}@inlinesigma{}, the argument of -+The parameter@tie{}@math{sigma}, the argument of - option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges - are detected by @math{g(x, y)}. We apply the Laplacian operator in - Cartesian coordinates -@@ -4401,7 +4384,7 @@ - </informalequation> - @end docbook - --where we have used the dimensionless distance@tie{}@inlinexi{} from -+where we have used the dimensionless distance@tie{}@math{xi} from - the origin - @ifinfo - @display -@@ -4556,7 +4539,7 @@ - @float Figure,Figure:laplacian-of-gaussian - @vimage{laplacian-of-gaussian} - --@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.} -+@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.} - - @shortcaption{Laplacian-of-Gaussian} - @end float -@@ -4656,10 +4639,10 @@ - @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only, - @acronym{LoG}-only, or a blend of both) scales to different image - sizes. In practice, this means that if you start with a set of --reduced size images, say 2808@classictimes{}1872 pixels, carefully -+reduced size images, say 2808x1872 pixels, carefully - optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find - @acronym{LoG}-only the best mode, and then switch to the original --resolution of 5616@classictimes{}3744 pixels, multiplying (or -+resolution of 5616x3744 pixels, multiplying (or - dividing) the parameters by four and sticking to @acronym{LoG}-only - might @emph{not} result in the best fused image. For best quality, - perform the parameter optimization and the search for the most -@@ -5080,9 +5063,9 @@ - Images should align well to be suitable for fusion. However, there is - no hard mathematical rule what ``well'' means. The alignment - requirements for 16@dmn{MPixel} images to yield a sharp --4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per -+4"x6" print at 300@dmn{dpi} (``dpi'' means dots per - inch) or even for web presentation are relatively low, whereas the --alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print -+alignment of 8@dmn{MPixel} images for a 12"x18" print - ought to be tight. - - @pindex hugin -@@ -5548,7 +5531,7 @@ - - Let us use an example to illustrate the problem of relating the - sharpness with the local contrast variations. Say we use a --5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge} -+5x5 contrast window. Moreover, let @code{sharp_edge} - and @code{smooth_edge} be two specific configurations: - - @example -@@ -5727,7 +5710,7 @@ - Apply the default grayscale projector: @code{average} and throw away - all edges with a curvature of less than 0.5% and replace the - @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use --a window of 7@classictimes{}7@dmn{pixel} window to compute the -+a window of 7x7@dmn{pixel} window to compute the - @acronym{SDev}. - @end table - -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenblend.texi ---- a/doc/versenblend.texi Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/versenblend.texi Fri Aug 07 16:43:24 2015 +0200 -@@ -1,4 +1,4 @@ --@set UPDATED 10 March 2014 --@set UPDATED-MONTH March 2014 -+@set UPDATED 15 June 2015 -+@set UPDATED-MONTH June 2015 - @set EDITION 4.1.3 - @set VERSION 4.1.3 -diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenfuse.texi ---- a/doc/versenfuse.texi Fri Aug 07 16:43:18 2015 +0200 -+++ b/doc/versenfuse.texi Fri Aug 07 16:43:24 2015 +0200 -@@ -1,4 +1,4 @@ --@set UPDATED 10 March 2014 --@set UPDATED-MONTH March 2014 -+@set UPDATED 15 June 2015 -+@set UPDATED-MONTH June 2015 - @set EDITION 4.1.3 - @set VERSION 4.1.3 - diff --git a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch deleted file mode 100644 index d067df3..0000000 --- a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ConfigureChecks.cmake 2013-10-07 10:50:00.000000000 +0400 -+++ b/ConfigureChecks.cmake 2015-03-31 13:42:40.179527224 +0300 -@@ -53,7 +53,7 @@ - if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK) - unset(VIGRA_SETIMAGEINDEX CACHE) - set(CMAKE_REQUIRED_INCLUDES ${VIGRA_INCLUDE_DIR}) -- set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES}) -+ set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES} -lpthread) - check_cxx_source_compiles( - " - #include <vigra/imageinfo.hxx> diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch new file mode 100644 index 0000000..7203d6b --- /dev/null +++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch @@ -0,0 +1,16 @@ +Fix build with GCC-10. + +Thanks-to: Walter Hüttenmeyer +Bug: https://bugs.gentoo.org/724988 + +--- a/src/minimizer.cc 2016-09-24 11:29:40.000000000 +0200 ++++ b/src/minimizer.cc 2020-05-24 13:09:58.199170984 +0200 +@@ -19,7 +19,7 @@ + */ + + #include <gsl/gsl_errno.h> +- ++#include <limits> + #include "minimizer.h" + + diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml index 9495d45..2b601d2 100644 --- a/media-gfx/enblend/metadata.xml +++ b/media-gfx/enblend/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>graphics@gentoo.org</email> - <name>Gentoo Graphics Project</name> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> + <name>Andreas K. Huettel</name> + </maintainer> + <maintainer type="person"> + <email>maekke@gentoo.org</email> + <name>Markus Meier</name> </maintainer> <upstream> <remote-id type="sourceforge">enblend</remote-id> |