diff options
Diffstat (limited to 'media-gfx')
27 files changed, 116 insertions, 1483 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex ba889b1dfe86..fbf3d40e327c 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index da0e74ac925e..1f175f5fa846 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,10 +1,5 @@ AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3d0d687928d86487380e0b12b3b7f6458b827285806afa73034497265cae169998ab281f4687d736cc5e3e6df1b5 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483 -AUX exiv2-0.26_p20180319-CVE-2017-18005.patch 17451 BLAKE2B 8003fa352503d287f5f96572196cd67f4de8d90fda221588f77bdd2d053407f1e1dceba6aab317fc5a003aa5b6f0d99336f4a8e4fb21696b5d20b81a3d4af29f SHA512 94ed0a17a7ca9bd1155fc4c67ca67bf59dafedf5570cf4d7e59bda6f4b4c0749d98fd1c2d8929612a2fe5840565ce070acf21ac68d9d6882fe5c0a98ee18b343 -AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b04cac24ac7b3a414e05d04a1e951cdbd3d90997756fa5c1dae5d2b193583e529a7eacc0cbb88d5c8345c3be76798d1897af7a7f250d SHA512 7506ccc0914dc78e369129efb0736638ee7a4ebf98d76feed0ce6a7c9d2885f5f7c984376df288f0694ec05654b89c39be42a989bcedd64d0fcecd6c605fe601 -AUX exiv2-0.26_p20180319-clang-fix.patch 1793 BLAKE2B 7312324ed80314e28dfdf4066247d64db89928cdf09b186b200efc071d5dd6630e3a22d7ed10f312ccbcace291f6e3a17fdce8bd42d4e094e6c07d85ee42d45b SHA512 54c96c831aabfaca93bfb2fee4b13a080be6bbad4b634890d26e42c6a069571277f75bbc517c0e212e99fc12add77d12fbaa0652e2a1506ac94e2e8c043901ed -DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780 -EBUILD exiv2-0.26_p20180319.ebuild 3321 BLAKE2B 5a4bfe2aa47b7793ae10a39f428422c4aeed62805ab9b7f0c26a0af2c682968941ff9910c5d12eaf50093df593198e0b9bf8f22b194777ce3c79117b390cce81 SHA512 c4a200f82432e06727aef721384a994953ce3adadcfd315ad765927e75ec9f4422c31b98f6b7bd3c9660b31edd551a2c675f90d57d04491441ffb1524171422e -EBUILD exiv2-0.26_p20180811-r3.ebuild 2958 BLAKE2B e575cfe4350b3da0c49b483c79b710033284c856e94b4d08224676e42f0f49d91e3c18f2c44cd4694a802f415b58f31821ee9cd48499247ed9019ae7ac7b2734 SHA512 1a6c1f9c26671c9ce187b1bbe174900382ed185bced5d4fd123308c1eddb7707632a3282328e48ccc50e3f9b2350a9ff34ef025e17f6563714ecb135da2ba17f +EBUILD exiv2-0.26_p20180811-r3.ebuild 2954 BLAKE2B 06ad8b544150e1f5d4f1a305d78ab3ff7772b7c797e67e47ce01a233d0afee514d7660921c33b43634da60883b2adba119a80830c2493ad01800bd9b05b34072 SHA512 172e65b6210cb383afee4f344d585fae40dc7af1b7bb5d8dd2e5acbd7fcb4086b4caca998ce3627aefb4be3f8e4cebcaef24ccfb67d61d580b674fee50b24627 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild deleted file mode 100644 index eb2572dfcf35..000000000000 --- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" - EGIT_BRANCH="0.26" - GIT_ECLASS=git-r3 -else - COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f - SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -fi -inherit cmake-multilib python-any-r1 - -DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" -HOMEPAGE="http://www.exiv2.org/" - -LICENSE="GPL-2" -SLOT="0/26" -IUSE="doc examples nls png webready xmp" - -RDEPEND=" - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - webready? ( - net-libs/libssh[${MULTILIB_USEDEP}] - net-misc/curl[${MULTILIB_USEDEP}] - ) - xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - doc? ( - ${PYTHON_DEPS} - app-doc/doxygen - dev-libs/libxslt - media-gfx/graphviz - virtual/pkgconfig - ) - nls? ( sys-devel/gettext ) -" - -DOCS=( README doc/ChangeLog doc/cmd.txt ) - -S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}" - -PATCHES=( - # 0.26 branch - "${FILESDIR}"/${P}-CVE-2018-4868.patch - "${FILESDIR}"/${P}-CVE-2017-18005.patch - "${FILESDIR}"/${P}-clang-fix.patch - # TODO: Take to upstream - "${FILESDIR}"/${PN}-0.26-fix-docs.patch - "${FILESDIR}"/${PN}-0.26-tools-optional.patch -) - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} != *9999 ]] ; then - if [[ -d po ]] ; then - pushd po > /dev/null || die - local lang - for lang in *.po; do - if [[ -e ${lang} ]] \ - && ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then - case ${lang} in - CMakeLists.txt | \ - ${PN}.pot) ;; - *) rm -r ${lang} || die ;; - esac - fi - done - popd > /dev/null || die - else - die "Failed to prepare LINGUAS - po directory moved?" - fi - fi - - # FIXME @upstream: - einfo "Converting doc/cmd.txt to UTF-8" - iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die - mv -f doc/cmd.txt.tmp doc/cmd.txt || die - - if use doc; then - einfo "Updating doxygen config" - doxygen &>/dev/null -u config/Doxyfile || die - fi - - edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DEXIV2_ENABLE_BUILD_SAMPLES=NO - -DEXIV2_ENABLE_BUILD_PO=$(usex nls) - -DEXIV2_ENABLE_NLS=$(usex nls) - -DEXIV2_ENABLE_PNG=$(usex png) - -DEXIV2_ENABLE_CURL=$(usex webready) - -DEXIV2_ENABLE_SSH=$(usex webready) - -DEXIV2_ENABLE_WEBREADY=$(usex webready) - -DEXIV2_ENABLE_XMP=$(usex xmp) - -DEXIV2_ENABLE_LIBXMP=NO - $(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO) - ) - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - - if multilib_is_native_abi; then - use doc && emake -j1 doc - fi -} - -multilib_src_install_all() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - use doc && HTML_DOCS=( "${S}"/doc/html/. ) - - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc samples/*.cpp - fi -} diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild index 589539b78afd..bce9baadb497 100644 --- a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild +++ b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}d.tar.xz" LICENSE="GPL-2" SLOT="0/26" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="doc examples nls png webready xmp" RDEPEND=" diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch deleted file mode 100644 index d74ca59e3c01..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch +++ /dev/null @@ -1,484 +0,0 @@ -From 8e31dd8c14fdc83f387f35dda7b1b70fbdbd70db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Tue, 19 Dec 2017 19:52:41 +0100 -Subject: [PATCH 3/8] Only print items (Params::prValue) when size > 0 - ---- - src/actions.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/actions.cpp b/src/actions.cpp -index 9f850097..3963cb67 100644 ---- a/src/actions.cpp -+++ b/src/actions.cpp -@@ -713,8 +713,9 @@ namespace Action { - << std::setfill(' ') << std::right - << md.size(); - } -- if (Params::instance().printItems_ & Params::prValue) { -- if (!first) std::cout << " "; -+ if (Params::instance().printItems_ & Params::prValue && md.size() > 0) { -+ if (!first) -+ std::cout << " "; - first = false; - if ( Params::instance().binary_ - && ( md.typeId() == Exiv2::undefined --- -2.17.0 - - -From 463485e5c1cc716108880f75b9c573715bf402b1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Tue, 19 Dec 2017 19:54:17 +0100 -Subject: [PATCH 4/8] Move condition in if statement to discard work earlier - ---- - src/actions.cpp | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/actions.cpp b/src/actions.cpp -index 3963cb67..f51cb488 100644 ---- a/src/actions.cpp -+++ b/src/actions.cpp -@@ -717,11 +717,10 @@ namespace Action { - if (!first) - std::cout << " "; - first = false; -- if ( Params::instance().binary_ -- && ( md.typeId() == Exiv2::undefined -+ if (md.size() > 128 && Params::instance().binary_ && ( -+ md.typeId() == Exiv2::undefined - || md.typeId() == Exiv2::unsignedByte -- || md.typeId() == Exiv2::signedByte) -- && md.size() > 128) { -+ || md.typeId() == Exiv2::signedByte)) { - std::cout << _("(Binary value suppressed)") << std::endl; - return true; - } --- -2.17.0 - - -From 7fe7501c01e5d1eec16a736062dd0c34d6408833 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Tue, 19 Dec 2017 19:55:50 +0100 -Subject: [PATCH 5/8] Apply clang-format to Print::printMetadatum - ---- - src/actions.cpp | 110 ++++++++++++++++++++++++------------------------ - 1 file changed, 55 insertions(+), 55 deletions(-) - -diff --git a/src/actions.cpp b/src/actions.cpp -index f51cb488..b31d6ec6 100644 ---- a/src/actions.cpp -+++ b/src/actions.cpp -@@ -636,91 +636,90 @@ namespace Action { - - bool Print::printMetadatum(const Exiv2::Metadatum& md, const Exiv2::Image* pImage) - { -- if (!grepTag(md.key())) return false; -- if (!keyTag (md.key())) return false; -+ if (!grepTag(md.key())) -+ return false; -+ if (!keyTag(md.key())) -+ return false; - -- if ( Params::instance().unknown_ -- && md.tagName().substr(0, 2) == "0x") { -+ if (Params::instance().unknown_ && md.tagName().substr(0, 2) == "0x") { - return false; - } -+ - bool const manyFiles = Params::instance().files_.size() > 1; - if (manyFiles) { -- std::cout << std::setfill(' ') << std::left << std::setw(20) -- << path_ << " "; -+ std::cout << std::setfill(' ') << std::left << std::setw(20) << path_ << " "; - } -+ - bool first = true; - if (Params::instance().printItems_ & Params::prTag) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << "0x" << std::setw(4) << std::setfill('0') -- << std::right << std::hex -- << md.tag(); -+ std::cout << "0x" << std::setw(4) << std::setfill('0') << std::right << std::hex << md.tag(); - } - if (Params::instance().printItems_ & Params::prSet) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << "set" ; -+ std::cout << "set"; - } - if (Params::instance().printItems_ & Params::prGroup) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << std::setw(12) << std::setfill(' ') << std::left -- << md.groupName(); -+ std::cout << std::setw(12) << std::setfill(' ') << std::left << md.groupName(); - } - if (Params::instance().printItems_ & Params::prKey) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << std::setfill(' ') << std::left << std::setw(44) -- << md.key(); -+ std::cout << std::setfill(' ') << std::left << std::setw(44) << md.key(); - } - if (Params::instance().printItems_ & Params::prName) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << std::setw(27) << std::setfill(' ') << std::left -- << md.tagName(); -+ std::cout << std::setw(27) << std::setfill(' ') << std::left << md.tagName(); - } - if (Params::instance().printItems_ & Params::prLabel) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << std::setw(30) << std::setfill(' ') << std::left -- << md.tagLabel(); -+ std::cout << std::setw(30) << std::setfill(' ') << std::left << md.tagLabel(); - } - if (Params::instance().printItems_ & Params::prType) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; - std::cout << std::setw(9) << std::setfill(' ') << std::left; - const char* tn = md.typeName(); - if (tn) { - std::cout << tn; -- } -- else { -+ } else { - std::ostringstream os; - os << "0x" << std::setw(4) << std::setfill('0') << std::hex << md.typeId(); - std::cout << os.str(); - } - } - if (Params::instance().printItems_ & Params::prCount) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << std::dec << std::setw(3) -- << std::setfill(' ') << std::right -- << md.count(); -+ std::cout << std::dec << std::setw(3) << std::setfill(' ') << std::right << md.count(); - } - if (Params::instance().printItems_ & Params::prSize) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- std::cout << std::dec << std::setw(3) -- << std::setfill(' ') << std::right -- << md.size(); -+ std::cout << std::dec << std::setw(3) << std::setfill(' ') << std::right << md.size(); - } - if (Params::instance().printItems_ & Params::prValue && md.size() > 0) { - if (!first) - std::cout << " "; - first = false; -- if (md.size() > 128 && Params::instance().binary_ && ( -- md.typeId() == Exiv2::undefined -- || md.typeId() == Exiv2::unsignedByte -- || md.typeId() == Exiv2::signedByte)) { -+ if (md.size() > 128 && Params::instance().binary_ && -+ (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte || -+ md.typeId() == Exiv2::signedByte)) { - std::cout << _("(Binary value suppressed)") << std::endl; - return true; - } -@@ -738,22 +737,22 @@ namespace Action { - } - if (!done) { - // #1114 - show negative values for SByte -- if (md.typeId() != Exiv2::signedByte){ -+ if (md.typeId() != Exiv2::signedByte) { - std::cout << std::dec << md.value(); - } else { - int value = md.value().toLong(); -- std::cout << std::dec << (value<128?value:value-256); -+ std::cout << std::dec << (value < 128 ? value : value - 256); - } - } - } - if (Params::instance().printItems_ & Params::prTrans) { -- if (!first) std::cout << " "; -+ if (!first) -+ std::cout << " "; - first = false; -- if ( Params::instance().binary_ -- && ( md.typeId() == Exiv2::undefined -- || md.typeId() == Exiv2::unsignedByte -- || md.typeId() == Exiv2::signedByte) -- && md.size() > 128) { -+ if (Params::instance().binary_ && -+ (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte || -+ md.typeId() == Exiv2::signedByte) && -+ md.size() > 128) { - std::cout << _("(Binary value suppressed)") << std::endl; - return true; - } -@@ -765,16 +764,17 @@ namespace Action { - done = true; - } - } -- if (!done) std::cout << std::dec << md.print(&pImage->exifData()); -+ if (!done) -+ std::cout << std::dec << md.print(&pImage->exifData()); - } - if (Params::instance().printItems_ & Params::prHex) { -- if (!first) std::cout << std::endl; -+ if (!first) -+ std::cout << std::endl; - first = false; -- if ( Params::instance().binary_ -- && ( md.typeId() == Exiv2::undefined -- || md.typeId() == Exiv2::unsignedByte -- || md.typeId() == Exiv2::signedByte) -- && md.size() > 128) { -+ if (Params::instance().binary_ && -+ (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte || -+ md.typeId() == Exiv2::signedByte) && -+ md.size() > 128) { - std::cout << _("(Binary value suppressed)") << std::endl; - return true; - } -@@ -784,7 +784,7 @@ namespace Action { - } - std::cout << std::endl; - return true; -- } // Print::printMetadatum -+ } // Print::printMetadatum - - int Print::printComment() - { --- -2.17.0 - - -From 78ddc7a92afaaf58b78d5c49b5c2ad7b60a4e25f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Thu, 21 Dec 2017 16:39:43 +0100 -Subject: [PATCH 6/8] Do not deference value when it does not exist (Thanks - D4N) - ---- - samples/exiv2json.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp -index 505268d9..a81268f0 100644 ---- a/samples/exiv2json.cpp -+++ b/samples/exiv2json.cpp -@@ -148,6 +148,11 @@ bool isArray(std::string& value) - template <class T> - void push(Jzon::Node& node,const std::string& key,T i) - { -+#define ABORT_IF_I_EMTPY \ -+ if (i->value().size() == 0) { \ -+ return; \ -+ } -+ - std::string value = i->value().toString(); - - switch ( i->typeId() ) { -@@ -179,6 +184,7 @@ void push(Jzon::Node& node,const std::string& key,T i) - - case Exiv2::unsignedRational: - case Exiv2::signedRational: { -+ ABORT_IF_I_EMTPY - Jzon::Array arr; - Exiv2::Rational rat = i->value().toRational(); - arr.Add(rat.first ); -@@ -187,6 +193,7 @@ void push(Jzon::Node& node,const std::string& key,T i) - } break; - - case Exiv2::langAlt: { -+ ABORT_IF_I_EMTPY - Jzon::Object l ; - const Exiv2::LangAltValue& langs = dynamic_cast<const Exiv2::LangAltValue&>(i->value()); - for ( Exiv2::LangAltValue::ValueType::const_iterator lang = langs.value_.begin() --- -2.17.0 - - -From 871e6e3ced1cdec7e43bf8cb94e269a7f5c09d92 Mon Sep 17 00:00:00 2001 -From: Robin Mills <robin@clanmills.com> -Date: Thu, 15 Mar 2018 10:43:18 +0000 -Subject: [PATCH 8/8] Fix for getopt(), #199. Use src/getopt_win32 code instead - of libc/getopt() - ---- - config/config.mk.in | 2 +- - src/CMakeLists.txt | 6 ++---- - src/Makefile | 13 +++++-------- - src/getopt_win32.c | 9 +++++++++ - src/getopt_win32.h | 7 +++++++ - src/utils.cpp | 9 +++------ - 6 files changed, 27 insertions(+), 19 deletions(-) - -diff --git a/config/config.mk.in b/config/config.mk.in -index 8d920647..4754c722 100644 ---- a/config/config.mk.in -+++ b/config/config.mk.in -@@ -165,7 +165,7 @@ endif - # ********************************************************************** - # Compilation shortcuts - COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c --COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c -+COMPILE.c = $(CC) $(CFLAGS) -c - # LINK.cc does not need $(LIBS), libtool's dark magic takes care of that - # when linking a binary with a libtool library. - LINK.cc = $(CXX) $(LDFLAGS) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d4dc6375..dceee236 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -218,10 +218,8 @@ IF(NOT HAVE_TIMEGM ) - SET( PATHTEST_SRC ${PATHTEST_SRC} localtime.c ) - ENDIF( NOT HAVE_TIMEGM ) - --IF( MSVC ) -- SET( EXIV2_SRC ${EXIV2_SRC} getopt_win32.c ) -- SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} getopt_win32.c ) --ENDIF( MSVC ) -+SET( EXIV2_SRC ${EXIV2_SRC} getopt_win32.c ) -+SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} getopt_win32.c ) - - ## - # msvn tuning -diff --git a/src/Makefile b/src/Makefile -index 8a8366fe..d046e331 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -131,8 +131,7 @@ CCSRC += asfvideo.cpp \ - utilsvideo.cpp - endif - --# Add library C source files to this list --EXIVCSRC = -+# C source files - ifndef HAVE_TIMEGM - CSRC = localtime.c - endif -@@ -141,9 +140,7 @@ endif - EXIV2MAIN = exiv2.cpp - EXIV2SRC = actions.cpp \ - utils.cpp -- --# C source files for the Exiv2 application --EXIVCSRC = -+EXIVCSRC = getopt_win32.c - - # ****************************************************************************** - # Library -@@ -176,7 +173,7 @@ OBJ = $(CCOBJ) $(COBJ) - LOBJ = $(CCLOBJ) $(CLOBJ) - - EXIV2OBJ = $(EXIV2MAIN:.cpp=.o) $(EXIV2SRC:.cpp=.o) --EXIV2COBJ = $(EXIVCSRC:.c=.o) -+EXIVCOBJ = $(EXIVCSRC:.c=.o) - EXIV2EXE = $(EXIV2MAIN:.cpp=$(EXEEXT)) - - ifdef DEP_TRACKING -@@ -251,9 +248,9 @@ lib: $(OBJ) - $(BINARY): %: %.o lib - @$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir) - --$(EXIV2EXE): lib $(EXIV2OBJ) $(EXIV2COBJ) -+$(EXIV2EXE): lib $(EXIV2OBJ) $(EXIVCOBJ) - mkdir -pv ../bin 2>&1 > /dev/null -- @$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir) -+ @$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIVCOBJ) -rpath $(libdir) - - install-header: - $(INSTALL_DIRS) $(DESTDIR)$(incdir) -diff --git a/src/getopt_win32.c b/src/getopt_win32.c -index fca29924..18dfcfbf 100644 ---- a/src/getopt_win32.c -+++ b/src/getopt_win32.c -@@ -194,6 +194,10 @@ permute_args(panonopt_start, panonopt_end, opt_end, nargv) - } - } - -+#ifdef __GETOPT_DEFINE_ARGV__ -+char * const *__argv; -+#endif -+ - /* - * getopt_internal -- - * Parse argc/argv argument vector. Called by user level routines. -@@ -205,6 +209,11 @@ getopt_internal(nargc, nargv, options) - char * const *nargv; - const char *options; - { -+ -+#ifdef __GETOPT_DEFINE_ARGV__ -+ __argv=nargv; -+#endif -+ - char *oli; /* option letter list index */ - int optchar; - -diff --git a/src/getopt_win32.h b/src/getopt_win32.h -index 6b6f643b..cd5760a3 100644 ---- a/src/getopt_win32.h -+++ b/src/getopt_win32.h -@@ -38,6 +38,13 @@ - extern "C" { - #endif - -+#if !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW__) && !defined(_MSC_VER) -+// the symbol __argv (and __argc and __progname and __env) are defined in Windows environments -+// for *ix environments, __argv is declared here, defined: getopt_win32.c, init'd: getopt_internal() -+#define __GETOPT_DEFINE_ARGV__ -+extern char * const *__argv; -+#endif -+ - extern int opterr; /* if error message should be printed */ - extern int optind; /* index into parent argv vector */ - extern int optopt; /* character checked for validity */ -diff --git a/src/utils.cpp b/src/utils.cpp -index a3d36497..2a092330 100644 ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -32,18 +32,15 @@ EXIV2_RCSID("@(#) $Id$") - #include "config.h" - - #include "utils.hpp" -- --// + standard includes --#if defined(_MSC_VER) || defined(__MINGW__) --# include "getopt_win32.h" --#endif -+#include "getopt_win32.h" - - #if defined(_MSC_VER) - # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) - #endif - -+// + standard includes - #ifdef EXV_HAVE_UNISTD_H --# include <unistd.h> // for getopt(), stat() -+# include <unistd.h> // for stat() - #endif - - #include <sys/types.h> --- -2.17.0 - diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch deleted file mode 100644 index a594a2bfad13..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ce4f575e106697c0e513091e95a7cd12ed6a488b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
-Date: Tue, 9 Jan 2018 21:18:36 +0100
-Subject: [PATCH 1/8] Add check for DataBuf.size_ in Jp2Image::readMetadata()
-
-When parsing a subBox that is a ColorHeader, a length is extracted
-from the input file and fed directly into DataBuf() (which calls
-malloc). A crafted input file can provide arbitrarily (up to
-max(uint32_t)-8) large values and result in excessive memory
-allocation.
-
-This commit adds a check for the new size of DataBuf so that it is not
-larger than the remaining size of the file.
-
-This fixes #202 aka CVE-2018-4868
----
- src/jp2image.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/jp2image.cpp b/src/jp2image.cpp
-index a308bfd9..3cebc2a8 100644
---- a/src/jp2image.cpp
-+++ b/src/jp2image.cpp
-@@ -272,7 +272,12 @@ namespace Exiv2
- #endif
-
- const long pad = 3 ; // 3 padding bytes 2 0 0
-- DataBuf data(Safe::add(subBox.length, static_cast<uint32_t>(8)));
-+ const size_t data_length = Safe::add(subBox.length, static_cast<uint32_t>(8));
-+ // data_length makes no sense if it is larger than the rest of the file
-+ if (data_length > io_->size() - io_->tell()) {
-+ throw Error(58);
-+ }
-+ DataBuf data(data_length);
- io_->read(data.pData_,data.size_);
- const long iccLength = getULong(data.pData_+pad, bigEndian);
- // subtracting pad from data.size_ is safe:
---
-2.17.0
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch deleted file mode 100644 index a80543a5ecd7..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 176ba44cc31064183fdfbce55a7dd7e6b5e2a962 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com> -Date: Fri, 8 Jun 2018 23:46:04 +0200 -Subject: [PATCH] Fix C & C++ flag adding in CMakeLists.txt - ---- - CMakeLists.txt | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2e179bf5..98a172ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,21 +74,23 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") - - if( MINGW OR UNIX ) - if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) -- ADD_DEFINITIONS(-Wall -- -Wcast-align -- -Wpointer-arith -- -Wformat-security -- -Wmissing-format-attribute -- -Woverloaded-virtual -- -W -- ) -+ string(CONCAT WARNING_FLAGS " -Wall" -+ " -Wcast-align" -+ " -Wpointer-arith" -+ " -Wformat-security" -+ " -Wmissing-format-attribute" -+ " -Woverloaded-virtual" -+ " -W" -+ ) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") - ENDIF() - - message(STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}") - IF ( CYGWIN OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0)) -- ADD_DEFINITIONS( -std=gnu++98 ) # to support snprintf -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98" ) # to support snprintf - ELSE() -- ADD_DEFINITIONS( -std=c++98 ) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98" ) - ENDIF() - - ENDIF( MINGW OR UNIX )
\ No newline at end of file diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest index b4c4aa42ce8b..f95cce79e139 100644 --- a/media-gfx/igal/Manifest +++ b/media-gfx/igal/Manifest @@ -1,3 +1,3 @@ DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f -EBUILD igal-2.0-r1.ebuild 881 BLAKE2B 6603b8d72d07d0c0a131e1166b31754a035570f539d4b331e008d4f9f7741a3a1de85cd7b9d3a149041d75d48a380feeaeb032e0b340254793b211100be632d3 SHA512 62f833ff22484403adb19fa355e93a1aa57e4e8dd9d8f8e65fde84202402a86e083cefa056875079ced7d186e8098a4c6ec6b6e1c3522f0591ba16c71e21c128 +EBUILD igal-2.0-r1.ebuild 870 BLAKE2B 2b26949800e7b3b58c49a1ed6d719b57d17c7b3023353e65804d590e1745ea0a5fee9b7b77e3ed1e3267cc733b72478b801b263d8e3745c2619c2189318e2578 SHA512 096d16325a6abd831d4bb529a40f7d096970457e180c513dec5ada11919355bd33059306c4e2cd558aca1c6c5c60e9590180c2ef0a69a70eefceb9af42ab00fb MISC metadata.xml 515 BLAKE2B df57e086f1c3f791956327fcc23a384d29d8c0887abea8b9562e5dde6f041bc68d77f787120d2e20974be17c17d129a0e54078cc774a79934423c573e13b6955 SHA512 379299c58fe3018ce51c1e54302dafcc9c258661368101503c1995d7bd0a435175ffe32ff3e7ac6087fa1fb39f4d6e9623acb4ee3acd73a333c95375cb3de072 diff --git a/media-gfx/igal/igal-2.0-r1.ebuild b/media-gfx/igal/igal-2.0-r1.ebuild index dbb1bb4aa718..39981fbb6709 100644 --- a/media-gfx/igal/igal-2.0-r1.ebuild +++ b/media-gfx/igal/igal-2.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 MY_P=${PN}2-${PV} @@ -14,14 +14,16 @@ SLOT="0" KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -RDEPEND="dev-lang/perl +RDEPEND=" + dev-lang/perl virtual/imagemagick-tools virtual/jpeg" DEPEND="" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { + default sed -e "s:/usr/local/lib/igal2:/usr/share/igal2:g" \ -i igal2 -i igal2.1 || die sed -i -e "s:/usr/local/bin/igal2:/usr/bin/igal2:" \ @@ -31,10 +33,10 @@ src_prepare() { src_compile() { :; } src_install() { - dobin igal2 utilities/igal2.sh || die - dosym igal2 /usr/bin/igal || die + dobin igal2 utilities/igal2.sh + dosym igal2 /usr/bin/igal doman igal2.1 dodoc ChangeLog README insinto /usr/share/igal2 - doins *.html tile.png igal2.css || die + doins *.html tile.png igal2.css } diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 527e3831fbc9..95e1ed39f2e5 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,13 +1,8 @@ -AUX imagemagick-7.0.8.10-quantum-private-compile-fix.patch 778 BLAKE2B c770f89f8b3b0f0505d32ce9c44b1ceac4f6ac817f85e756802c69cc394c3a6001a598bea88e081a461a1f775a7b5ebc4e5a27397186bc940a080ce780580bcf SHA512 cb18f10ebabc1af7065a3df50afcea500c908051fc91946f65b400df138c941c3576671cfa200d7f36ad62baae75198e3d5e4d2e206968da7d641d3de1c95a7f AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 -DIST ImageMagick-6.9.10-11.tar.xz 8918436 BLAKE2B f7846b21a68d0e8e462cc7a86322f73ec0df7cfd10fb35e97f6adb375c9291b9571c07da901636bbc933330ec0f4c2ee27b3af673c6af28d30090e78a81b2bbc SHA512 b272eee7c74c3d2e6cdc7b5ba088bf87d7fad87c8828c9d2660986acb05c0ee06566c4b2b82913be9086a51e9b7c64ceb9ecc2bf28691d183b8e478a15384ead -DIST ImageMagick-6.9.10-12.tar.xz 8928804 BLAKE2B 061a1a855040fb861b200f3b1968c6f976048a09ae94e8881d81cb9b8618404b6c69aab62718285482a7f15826a946af6365af8e731a50bc2812f45396f6241c SHA512 f9f663c399afa3b86c9302607155ca62dd7d519573f61735916147be23ca27dd8bb29dffbdcb542f3433f367cb1cc97af879d18d72dda0d9a18d4c82f1b0f134 -DIST ImageMagick-7.0.8-11.tar.xz 8638236 BLAKE2B 927b9d467635f80d65b53e4d4d5c55e2ca4f8073b110881950d6bd9205a6da3b6ead91c624d1cccabb6c37f5bb841f9584c7c6d65714736898d17a22d9075a50 SHA512 b6f7493095097d3c551c70acd2181fb8e252750916534602646c7c765d756b5483c1bdd08b00d59f8b0bc3963729a2b64bf8cb467e3f23e26a4d35515b6d3b18 -DIST ImageMagick-7.0.8-12.tar.xz 8630340 BLAKE2B f2a568ed5c4cb1143a05d0d917969d9e60c1a967369523a0defcc2782e635f867dd49234bc445ceceae5bbabf826eb923e789ae0b4c7e6a6345cea6758a083b0 SHA512 b4b9d252e12fe60cb046e64558465eea5e635fd133053732810f0cbc7e68efb2d2b4a336b28b3e7e985e659bb07eabc4709ed437f0f20e57bcc5a9a13fa3cc31 -EBUILD imagemagick-6.9.10.11.ebuild 6483 BLAKE2B 4c197c04777ee0242c008610dbf7cbf04d7bd0ebfb4aabb6a327a03ac98191402b47156c25fa1a3c46f9ea16a6ab1ccc076c41d49bce83e362732a42d7ebc000 SHA512 6c5e1933716c829ee4e86623e441870def3924b9061168011a3228cae000c3caadfd2c0d4df55768cd4c4e68defec6faa32c3bd770c220d62763f0165e08e44e -EBUILD imagemagick-6.9.10.12.ebuild 6597 BLAKE2B 786a42c5ae37d50041a7c7af163df940961b68d55d58af3a82b16d23879d0098a87a9880b0b5abc87c1bf0c49f1ad9af85c79a5416aa5fed1aba972a0d6763ba SHA512 3338bd294b68ceb4e56af4b3dc5156ea3dce52daeeb6a869bcf6647bdc4ec85196358631af4501e94b5e2651c2e0244f6bfd19363f22ccc691fa28f9d2d8105b -EBUILD imagemagick-7.0.8.11.ebuild 6639 BLAKE2B bcd16d664b5976253c312714299974e712c8342be9f0fb4cb933944a46d20ac31bffff721ee3f53a2259bc15c3a3da218c188f7938dea8116bfb7f1693648bff SHA512 24ae4050a06bb6c06c1a5a1be43da47155158d7eec8823cb3f1fb67250e428c04fa961498d9217787197908db62f6e30dd15c1bc7d458079edb091c4e5d18b6a -EBUILD imagemagick-7.0.8.12.ebuild 6719 BLAKE2B 1a21382252a7bbebed69f3903ceb1c3340100172958e9460d482226d1be0f2f4586668278f8c5bb70fc470e29b9b6ea93f6f046e6df33e6bfb224e6d1f7db617 SHA512 4b18be303504204b3cf3ff24ff9718120069bc542d3cc1c18df58d60379b504e62114c300f7a69d213934ea025993ac2893f2941882d8076ed49ffc55a4a626c -EBUILD imagemagick-9999.ebuild 6722 BLAKE2B 387644c8c74c286dd2b3036646c621737e838dc02686f9def8c40f4e0bcaadfab7a5f7aa91dbab946fc4e73f4440ffe5d01583f7cf41bcc4d8196ccd8ee65fdc SHA512 c885e27422ec79fcba24e1fe6608bb949f4fa1c8e16eeb7779c91896f6ea61ecf063198918f62d461b96b43e0f817d7cec0106880235f378f419cb1f56e47b31 +DIST ImageMagick-6.9.10-14.tar.xz 8931552 BLAKE2B e064648947f661c41fe86dea6484c0b9e01e54fcd3428b8d6dd39b2b7f93735200af9e4b49f0bdc92b574afbaa53ed044aab2b4b751e087ba126e58cdda1f497 SHA512 1a2c9fb717b0441a18c638991cf5365c42d00c19c0f67bc7cce4bd2cba42bac602e4dba8bd4abc1dbc6609a08b1292403acc3657b61c58ed0609e2bf740d0725 +DIST ImageMagick-7.0.8-14.tar.xz 8634400 BLAKE2B 1d5ad294ce29f275790c3b6ba76445ffb4aeaa2ff94d91af4d52a00b407dca0e5a4f589ec1a860bf6695952f8e7943d507baee58b885dc5fca3510de1d84c8eb SHA512 0a5f3357f4ce5b245d60b178d81b58c3483effb45b669791d4686514a8c3b0ad04244e31caf0a4a614e73e3e071c17d851992670917ebcf2761c977d77c58dd6 +EBUILD imagemagick-6.9.10.14.ebuild 6789 BLAKE2B 55c818f40bca0a41d46c28e5adcbf4bcb6f5cb96496de91d2651624f1d2edc768b2915a8d1c6aaaaf2058e747991282c513fb366a15f775a4bc95c7ce1f20748 SHA512 cac9776476b2d7d05bff3163a109a7514b51d7b362f6696791c1e0ff7ed18ccc5cdd3ebe3a90e2d94bad18b09c0eedfcc95fc629663ef211fc7e194ff9ddf815 +EBUILD imagemagick-7.0.8.14.ebuild 6911 BLAKE2B 83a934d821a8a5b8a2d1c0f15038792c9fc09f1b4c2f2b306041d23a6fb0dc586e87c08dc4b0d79edd6d6943fae9c4ccd21ca04ca2bb7f01b1632a0dd6abf8fc SHA512 1f4732f65f6725013a4d88dc01183ffed52d20687234b50a45130f6e999f1a22986c625ea57d070985429053e908d91e53d63c09ae0201c5051a0fc1eec16d83 +EBUILD imagemagick-9999.ebuild 6920 BLAKE2B c48c6fcf967b904616a5bdc0ec0f06451956776f308cfd9064ef15bf2b75d55496d85eebaaef50961ea980bbd5a30eda33ffde2b774ff160af468341e92270d4 SHA512 2949766ec9289e1003cde57c1487d34989becea06ccbf8b2c4a980afe03cae06b91f04164421d2420b6432f7c60f4751a4dd217b27966d265f485e5df43d6e78 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch b/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch deleted file mode 100644 index 4514dcc7d2c6..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/664226 - -From 6cc5e2d68431249a647f22e5320f8a0481e3e3f4 Mon Sep 17 00:00:00 2001 -From: Cristy <urban-warrior@imagemagick.org> -Date: Wed, 15 Aug 2018 16:59:30 -0400 -Subject: [PATCH] Fix compile exception - ---- - MagickCore/quantum-private.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h -index e02c70348c..2ff6babb7c 100644 ---- a/MagickCore/quantum-private.h -+++ b/MagickCore/quantum-private.h -@@ -659,7 +659,7 @@ static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum) - return(0); - if (quantum >= 18446744073709551615) - return(18446744073709551615); -- return((MagickSizeType (quantum+0.5)); -+ return((MagickSizeType) (quantum+0.5)); - #endif - } - diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild deleted file mode 100644 index a2998e183119..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local mesa_cards ati_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild index 1895f401aabb..ba0ba14a935f 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" @@ -80,13 +80,6 @@ src_prepare() { die "Failed to apply hardening of policy.xml" einfo "policy.xml hardened" - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - elibtoolize # for Darwin modules # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 @@ -172,8 +165,22 @@ src_configure() { } src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + "${S}"/magick.sh \ + ${im_command} || die + done } src_install() { diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild deleted file mode 100644 index 9730724f1a11..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_P=ImageMagick-$(ver_rs 3 '-') - SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/${PV}" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild index 428e6d1e2116..f7b720973aae 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.14.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P=ImageMagick-$(ver_rs 3 '-') SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A collection of tools and libraries for many image formats" @@ -84,13 +84,6 @@ src_prepare() { die "Failed to apply hardening of policy.xml" einfo "policy.xml hardened" - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - elibtoolize # for Darwin modules # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 @@ -176,8 +169,22 @@ src_configure() { } src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + "${S}"/magick.sh \ + ${im_command} || die + done } src_install() { diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 6f0dd75e82cd..adf47c49a562 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -84,13 +84,6 @@ src_prepare() { die "Failed to apply hardening of policy.xml" einfo "policy.xml hardened" - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - elibtoolize # for Darwin modules # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 @@ -176,8 +169,22 @@ src_configure() { } src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + "${S}"/magick.sh \ + ${im_command} || die + done } src_install() { diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 4726fe6211a4..51373471c3f9 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -12,6 +12,5 @@ DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500 -EBUILD inkscape-0.92.3-r1.ebuild 4007 BLAKE2B ade435eae89e3aed84e0c5d1f87bb9af5e93da5c3fb4affda53f7105ffdd8a543c019835e04041af771187d0fff7ae3584b4d3330feab0cd6446e23958257ef1 SHA512 5369a4f50cab735c5af3143f9aa4aa896d2e2d00b894c33833a4984357a9059f3f10026608f11fc28fe53edf810cd30b16091b6b3a0cfc443709199bbe11ccb2 -EBUILD inkscape-0.92.3.ebuild 3958 BLAKE2B 301b320e79f50648df33780705180fbb0b781d7b1e65cbe755c56aa6178ae2cc6962922a2cef62b5e663ac7197a8ef9c8676b5631099646238663de618cacf1b SHA512 bac3b875f935d5a64a85058b33571693ad394b0fb7a14f0b0ae7d20d33d1e1df52c7b3c55396822c7bd9fcfed739cb0064b1cd9d2aad54d3836d6237f163eb57 +EBUILD inkscape-0.92.3-r1.ebuild 3980 BLAKE2B cea0a705ca29033a5bedd87547a54565281854e3a7847d1d09f1272109e0b84662085f011971467923778e26cbfdf62e43632030dfa332463efe38deb9c6e89f SHA512 d130279688318e0a35647a8fbe341a12dedf3e101ba2f87196a04f57dad0dd61712365fb16a7195a4a987d56adca7ae474f5a4459fcb1ac0b8490945b755db07 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild index 36a68a10d4e9..c022c704d3a7 100644 --- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="xml" - inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 MY_P="${P/_/}" -DESCRIPTION="A SVG based generic vector-drawing program" +DESCRIPTION="SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" @@ -21,10 +21,9 @@ IUSE+=" lcms nls spell static-libs visio wpg" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND=" - ${PYTHON_DEPS} +COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.48 + >=dev-cpp/glibmm-2.54.1 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= @@ -44,9 +43,9 @@ COMMON_DEPEND=" >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( - media-libs/libcdr app-text/libwpg:0.3 dev-libs/librevenge + media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) @@ -59,16 +58,15 @@ COMMON_DEPEND=" app-text/gtkspell:2 ) visio? ( - media-libs/libvisio app-text/libwpg:0.3 dev-libs/librevenge + media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) " - # These only use executables provided by these packages # See share/extensions for more details. inkscape can tell you to # install these so we could of course just not depend on those and rely @@ -84,9 +82,9 @@ RDEPEND="${COMMON_DEPEND} ) postscript? ( app-text/ghostscript-gpl ) " - DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.36 + dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig @@ -163,10 +161,6 @@ src_install() { python_optimize "${ED%/}"/usr/share/${PN}/extensions } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { gnome2_icon_cache_update xdg_mimeinfo_database_update diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild deleted file mode 100644 index 89ad5363774c..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.3.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 - -MY_P="${P/_/}" - -DESCRIPTION="A SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" -IUSE+=" lcms nls spell static-libs visio wpg" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.48 - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-cpp/cairomm-1.9.8 - >=dev-libs/boehm-gc-7.1:= - >=dev-libs/glib-2.28 - >=dev-libs/libsigc++-2.0.12 - >=dev-libs/libxml2-2.6.20 - >=dev-libs/libxslt-1.0.15 - dev-libs/popt - dev-python/lxml[${PYTHON_USEDEP}] - media-gfx/potrace - media-gfx/scour[${PYTHON_USEDEP}] - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sci-libs/gsl:= - x11-libs/libX11 - >=x11-libs/gtk+-2.10.7:2 - >=x11-libs/pango-1.24 - cdr? ( - media-libs/libcdr - app-text/libwpg:0.3 - dev-libs/librevenge - ) - dbus? ( dev-libs/dbus-glib ) - exif? ( media-libs/libexif ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( media-gfx/imagemagick:=[cxx] ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - ) - visio? ( - media-libs/libvisio - app-text/libwpg:0.3 - dev-libs/librevenge - ) - wpg? ( - app-text/libwpg:0.3 - dev-libs/librevenge - ) -" - -# These only use executables provided by these packages -# See share/extensions for more details. inkscape can tell you to -# install these so we could of course just not depend on those and rely -# on that. -RDEPEND="${COMMON_DEPEND} - dev-python/numpy[${PYTHON_USEDEP}] - media-gfx/uniconvertor - dia? ( app-office/dia ) - latex? ( - media-gfx/pstoedit[plotutils] - app-text/dvipsk - app-text/texlive-core - ) - postscript? ( app-text/ghostscript-gpl ) -" - -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.36 - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.1-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.92.1-desktop.patch" - "${FILESDIR}/${PN}-0.91_pre3-exif.patch" - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" - "${FILESDIR}/${PN}-0.48.4-epython.patch" - "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" - "${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch" - "${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch" -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - default - - sed -i "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable openmp) - $(use_enable exif) - $(use_enable jpeg) - $(use_enable lcms) - --enable-poppler-cairo - $(use_enable wpg) - $(use_enable visio) - $(use_enable cdr) - $(use_enable dbus dbusapi) - $(use_enable imagemagick magick) - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_with spell gtkspell) - $(use_with spell aspell) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest index f46cee5c3953..8abb49104bff 100644 --- a/media-gfx/openexr_viewers/Manifest +++ b/media-gfx/openexr_viewers/Manifest @@ -1,6 +1,6 @@ AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 BLAKE2B adf9fb0455af68739344527f5119ef31976ce1f078f445900567e9afbb23bf233c3890b669db931d33114bf2e497f4550882747730803147e271441416992e90 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7 AUX openexr_viewers-2.2.0-Remove-nVidia-automagic.patch 869 BLAKE2B 5a3576eaa7c5cc87e885e75fd13e5cf00386be0473fec7655278ddacb8b4084570cbe821097ec32036d9e37f8d8414e391171a8efd511114a6c1c285e236aa93 SHA512 232f990857bfbac7c8417e818e2efe0926a3d5fc20d7392c90a79a4762f26bf3044cc46729feafe407c73c75372ef52af8fa22247d82a4eb982fe538ac71de40 -AUX openexr_viewers-2.3.0-fix-cg-libdir.patch 487 BLAKE2B d9bb262f3e2a3e51cacdcd58acece3da30f797b4f892c9256ea04732092e97b2ea7883d8db17549720e89656bcaf84f99455ddb974d25bb95e790d3424377f40 SHA512 925c7fdd23e6f4855fe8b11ce392f9f616aead6f9f7267b5fe8bfc351c56792bbf68a58799718bfa6f28a4dd44d4d85ea6b8ed93a17dce35167e8cb84f9cbc07 +AUX openexr_viewers-2.3.0--with-cg-libdir.patch 811 BLAKE2B 0f2789e55efd1cd25308abfde02bb67fe77a099a509a4bac78eca078de6b18e326705718db061338b4881414e688fa307d70d132a0ba0ff72eaade127234b732 SHA512 02f579d246936f1ebb8e6afa36e21c10cc6fc7eb1a24e168b75c27aafc6a6abccead8e9879d1128a1d6f22ddab4162c97c2df5940c6b71cc6d6fc2cb89527bda AUX openexr_viewers-2.3.0-fix-configure.patch 2449 BLAKE2B 226728e4183784337ab684b9245f74110772156fea1b4be8441c7bb14fe2887484691c200e05604f9308204c9221d5b7e7f3c343e5db3cdf0a8896fb13fc5590 SHA512 29a22fee7f88ce1359e74185f8baffa9e734f20555943cced71c198f5c716ab8f8aa5686f11f40e5ebc10911cb82453b784eeac06632f6700d8f4fd3a9ec5e1a DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235 DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf @@ -10,5 +10,5 @@ EBUILD openexr_viewers-2.0.1.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb EBUILD openexr_viewers-2.1.0.ebuild 1220 BLAKE2B d3eece43d3c4c80570fe7a385e5f353d91414d5bfb2573a0f155c7d842e7da23c67633f6d967af1a5b2f2b4486ba8d6491f3ce5bc80f27b6a7da87369f67067b SHA512 f2132a37c732990c3043fdbbc2db64ef46e4fc4b87938233c6c96d95224665c28b6e6171a98eff1b80852717850224a0c042600cbb63beb0054c3a0d49287fce EBUILD openexr_viewers-2.2.0-r1.ebuild 1228 BLAKE2B 6406bb6f15b05d1ae4b0a4aeba3eeb149a0860fd371673fbb2ddb8a597b071fb93274aaf361e067ce4c037d7c4d017c4dbfc232b6d0791688832596bfc52e6ff SHA512 5a2f7c5b8978e32e766cf5da6f089db8cdedc5522e44a619faca728d73398fefa11924ab34e3dd7a5eb0b4f6d0595b442d6dcca9e3fc66491bf58cce134cd6ce EBUILD openexr_viewers-2.2.0.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818 -EBUILD openexr_viewers-2.3.0.ebuild 1249 BLAKE2B c23c3819d053f5c4df61bf39ae604d2f8b24b074ae6bec9b1a697a007f9f3bf4ba57d4a525129396e24a2ecbc9a03e7e590d809c57ce99d61293608648aa41f4 SHA512 c22b09b03b743dc476376d975cae66d2f21c86aceda0ef0dbbe5a541eaa67e32c6633bd56feecae06d0e8c9afa006ad761c0b08fe17896e8640bf553413c1559 +EBUILD openexr_viewers-2.3.0.ebuild 1307 BLAKE2B 6486e650eb12a71f9525542f37052da5c9e5888f0bee7dba5bd1d192cc9c0d25995d35b0675b2d2abc467f302a595fcb28d6709be78780939ef21d5c8d78fc1e SHA512 b86ba68608e36b3b67384cfb62f7e51c7d190799fdb9d624833749634ed917c646add678eef1eac5746a775a61cee2df4e005e35f98c4e98f96daa44b813c794 MISC metadata.xml 379 BLAKE2B 3f58950f3fccc797478abbd2b60325904cc3288586e4a180a366e0b99bb7ffa4a08022138c658b3e0db861a720232b44b7bf4bb2b2bdb7f59856272961e1c6c8 SHA512 97d3ed7e0ee8f419d36df6b6ccc3b3e704445935b76fab412b4287ac1b88688591f775927e1cc333a85a64818cbe1c9c3e760d2ab734215c0f558639ca033b6a diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch new file mode 100644 index 000000000000..9d118e362d4c --- /dev/null +++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch @@ -0,0 +1,23 @@ +diff --git a/m4/path.cb.m4 b/m4/path.cb.m4 +index 7e38708..b5675b1 100644 +--- a/m4/path.cb.m4 ++++ b/m4/path.cb.m4 +@@ -10,9 +10,17 @@ dnl + AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (optional)], + cg_prefix="$withval", cg_prefix="") + ++AC_ARG_WITH(cg-libdir, [ --with-cg-libdir=PATH Directory where Cg libraries are installed (optional)], ++ cg_libdir="$withval", cg_libdir="") ++ + if test x$cg_prefix != x ; then + CG_CXXFLAGS="-I$cg_prefix/include" +- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut" ++ if test x$cg_libdir != x; then ++ CG_LDFLAGS="-L$cg_libdir" ++ else ++ CG_LDFLAGS="-L$cg_prefix/lib" ++ fi ++ CG_LDFLAGS="$CG_LDFLAGS -lGL -lCg -lCgGL -lGLU -lpthread -lglut" + else + case $host_os in + darwin*) diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch deleted file mode 100644 index 1c3ef1a59234..000000000000 --- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/m4/path.cb.m4 b/m4/path.cb.m4 -index 7e38708..832b96c 100644 ---- a/m4/path.cb.m4 -+++ b/m4/path.cb.m4 -@@ -12,7 +12,7 @@ AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (opt - - if test x$cg_prefix != x ; then - CG_CXXFLAGS="-I$cg_prefix/include" -- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut" -+ CG_LDFLAGS="-L$cg_prefix/lib64 -lGL -lCg -lCgGL -lGLU -lpthread -lglut" - else - case $host_os in - darwin*) diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild index e7eaf9ca0778..a1981cf42cdd 100644 --- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild +++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -31,7 +31,7 @@ DOCS=( ChangeLog README.md ) PATCHES=( "${FILESDIR}/${P}-fix-configure.patch" - "${FILESDIR}/${P}-fix-cg-libdir.patch" + "${FILESDIR}/${P}--with-cg-libdir.patch" ) src_prepare() { @@ -50,6 +50,7 @@ src_configure() { myeconfargs+=( --enable-cg --with-cg-prefix="/opt/nvidia-cg-toolkit" + --with-cg-libdir="/opt/nvidia-cg-toolkit/$(get_libdir)" ) append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked fi diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest index b7242d53f293..757a7e98f1a4 100644 --- a/media-gfx/pngcheck/Manifest +++ b/media-gfx/pngcheck/Manifest @@ -1,3 +1,3 @@ DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad -EBUILD pngcheck-2.3.0.ebuild 669 BLAKE2B aee1c4613d9f6fff6e4a1c6c5f9f1cd887ad16fad92c877c84b4909a15fe07cee090fef4f17ab8e63177c7d6f79f9493b5c163b21a3e4cb1633cdf6d5ad97cc3 SHA512 1c0d431094161212531dbe9c22041239c786ade1c401225b1d8e2d4aa7842019303abdd3093e28f7a2b4bbaede87afba393aa2e38995e29a55347b7f6befa160 +EBUILD pngcheck-2.3.0.ebuild 643 BLAKE2B 3ddd07326f91f14c7efc71c9a0b442d050ab3095ed52336f99edee0e34b325def2d14f18e96ce4c1cd726071b1610fdbf629c898f22a26c500e41954d0055f71 SHA512 cfcc71d19d8869482b92d390b9b4a65e81aa1ac9865af2b914a10e57afdc0b71f2df5738e7283c310604b550ebcd6b99edd7a8f7d3a15539bf72d39bb88e9eb8 MISC metadata.xml 336 BLAKE2B 233943d2b9383cb850bbb7d8230a938527331b28cec37e3dbf6d9455af87fffe547ba6f2b746f7fe05bc40a347d0d697c049dcb97e23ee85a9aeda617fc12c2d SHA512 1b1fb530bcdeb8afc7c5b1edf81cd1d02cfc6829e30273b0270a67a0a263030256b4e6fbe40d3cfdc52e5b709a0b8625d3a06e3dad0667ff88743326c35ef789 diff --git a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild b/media-gfx/pngcheck/pngcheck-2.3.0.ebuild index 9731e7c72fb2..4358988b8ba1 100644 --- a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild +++ b/media-gfx/pngcheck/pngcheck-2.3.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 + inherit toolchain-funcs -DESCRIPTION="verifies the integrity of PNG, JNG and MNG files with internal checksums" +DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums" HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html" SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz" @@ -20,10 +21,10 @@ src_compile() { emake -f Makefile.unx \ CC="$(tc-getCC)" \ CFLAGS="${LDFLAGS} ${CFLAGS} -DUSE_ZLIB" \ - ZLIB="-lz" || die + ZLIB="-lz" } src_install() { - dobin png{check,split,-fix-IDAT-windowsize} || die - dodoc CHANGELOG README + dobin png{check,split,-fix-IDAT-windowsize} + einstalldocs } diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest index cc6fb69b6274..b4ebe54b971f 100644 --- a/media-gfx/rawtherapee/Manifest +++ b/media-gfx/rawtherapee/Manifest @@ -3,5 +3,5 @@ DIST rawtherapee-5.3.tar.xz 11042548 BLAKE2B 7e0697fc0c0e8b3078ccf1f9079a4adebf7 DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a2af2b6a325e916e7b51f8a83b568b65bef47a489be547d1e2437f9637b2ecea0d69d95bfabd53b61b11b46d9e36bc SHA512 6dc9a82202b80675f90eeb8f08c4484700561861f296546ae9425c6e9603f6e84bdc0859896c333d2367cc0b371c6bb6ab2fe36ff3d6f56419cbf18a58d8ef89 EBUILD rawtherapee-5.2.ebuild 1645 BLAKE2B 1de2629c455de8965ad83b68a0f32f40fb40e6c9d65dea1c6b1f5b0da9862530f11d35475bc4e0412df943fd602a9fbda6ff5cbeb0a185ac95bd07db06ba2079 SHA512 3f06920c09a7b487bc2779ca665bab242469129af57f6bebdee9169eacddedb01cc68e81971406632557b3ce75452fc314fb3a3539b11b6fcf878d334cd4fbc1 EBUILD rawtherapee-5.3.ebuild 1667 BLAKE2B c6ba0b5a19be035fca4cfefbf466e029b8eccf8ed677eed0adf3a0d251935836dc533762f52aee0cfed285b0f0c612e376aa2e162fbdf575e6e613ca7f19830e SHA512 d1f0044b321b3063504d17ac9944d9173237f80401c543c99fc8f40d5b182e3f6f0d1f6070687069ebd2a1cba3f89d1fec649f3e927bdaf6f8e55c5e37a9ac4a -EBUILD rawtherapee-5.4.ebuild 1627 BLAKE2B 150ad9e29d75dde283c8fb628846dc283d72c03960015a61210c8be6fb223ef6797bc53d91e9a819ae93391abd085b58750cf8b08e655c7f1f1eb7676e0e41c9 SHA512 f03cadf053a7ec28132580d06f19b111b27135fc3aef593a4bbc6b11c941aabaa51d4f490ab7547236ce2d44c8e1d3227c1b201f22c167935e3fa3dd2225755e +EBUILD rawtherapee-5.4.ebuild 1626 BLAKE2B c85d316a1e741e3bb34b278429c35a01312bfb33ff413fdca05d3d14b329ed57f207ba56537711943c9afef4c3177c421af9f46bcf1d95a96a361cef5c3bac7b SHA512 f9645dfa2bda00054821956bc1a9de57066c06c8f74ec1d8ebdaf0b1ed2e4453b253fb66ae4ff7a8f0e55d8a455176cea71b5502e76a8004f435a65bc877bcf9 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9 diff --git a/media-gfx/rawtherapee/rawtherapee-5.4.ebuild b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild index 02f58d5e2e52..0b50baaa01ce 100644 --- a/media-gfx/rawtherapee/rawtherapee-5.4.ebuild +++ b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="openmp" |