From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- media-libs/lcms/Manifest | 6 ++- .../files/lcms-2.13-grayscale-regression.patch | 38 +++++++++++++++ .../files/lcms-2.13.1-fix-configure-bashisms.patch | 22 +++++++++ media-libs/lcms/lcms-2.13-r1.ebuild | 55 +++++++++++++++++++++ media-libs/lcms/lcms-2.13.1.ebuild | 57 ++++++++++++++++++++++ media-libs/lcms/lcms-2.13.ebuild | 51 ------------------- 6 files changed, 177 insertions(+), 52 deletions(-) create mode 100644 media-libs/lcms/files/lcms-2.13-grayscale-regression.patch create mode 100644 media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch create mode 100644 media-libs/lcms/lcms-2.13-r1.ebuild create mode 100644 media-libs/lcms/lcms-2.13.1.ebuild delete mode 100644 media-libs/lcms/lcms-2.13.ebuild (limited to 'media-libs/lcms') diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest index f831e319f6f2..00c1bf227809 100644 --- a/media-libs/lcms/Manifest +++ b/media-libs/lcms/Manifest @@ -1,7 +1,11 @@ +AUX lcms-2.13-grayscale-regression.patch 1292 BLAKE2B 09dbb8d22bebbef348aa4f86fd6d32e3398c0577b70321ef7813185fda17475b489a06b315700747442464a03d2644d48d5ade549d0372ff3ba9023fffa6f051 SHA512 b173f31f2428bd9f8590d0b7bdbced17c9e07e9a871b05fed3a2eb73261e4ee52b751cd0fd1a50ad6bc2478b30079df4fba139b233297216910f53b8840c2227 +AUX lcms-2.13.1-fix-configure-bashisms.patch 544 BLAKE2B 8b129f74cea00033a5cf02c07d7102c7d2f6c5c442d570fd27998d6e9fcc32224822fbc6dac66a8ad07597d9dd02a4622643421459d2d62fc15710fb5887f03e SHA512 1df85b4372a1df8cebe49415c187d19a830eaaac5b1bc1946246bc1baf60bedf11fe2d4761c929fe58c61206420be96b5ab1fd0088cf4da8007de41d079262e1 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed +DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617 DIST lcms2-2.13.tar.gz 7259337 BLAKE2B 243e45852a31fb980c80f4468da14eaf1a2b6824cfa4ca0d6260064945faf0ededfa3b69fa8b041cbad49be1ddb7c6099d3b25873ec0d6e31beecea014808c8f SHA512 28cc5310b54b6254447c04ec8072878eb59e539095c400c05a15975b636f2f49daa2e5fa9021a3f9886a1b50e6c85bd950cefa8f171e3f4ee3be269a8dadc4d2 EBUILD lcms-2.11.ebuild 1161 BLAKE2B 6544d7c87de96c0bb45bc117c190419149322d86d5169af3d2da67d5764cec68b7adea5e13b28109c8ee33b19ca696bc205140e56f21c6d9654732466a803797 SHA512 67668031db5c0b28115fa4c94bbfd7229bd0e901d1fc03138b741bf04002b794f1bfac019b3d936ba5d70cf4688ffee03d394ef3b86af27704dbb3d6fa6a6178 EBUILD lcms-2.12.ebuild 1283 BLAKE2B 4491db59f78ff4242cb145e0013a08d004cdacfeb16d382869f26696649adca511cd6979914b6e56948352dca7811983161136c1bfad99ae6e592f7c9713a003 SHA512 93052efb79a9102e2558a83c289aecf88c519a233cf6c7cc436aed8e2055b5e8fd858403244691293e778f892458e9e475ca5bcabc8531856c56edad391b96f3 -EBUILD lcms-2.13.ebuild 1291 BLAKE2B 38a2bbe39eab23763a8bf27ece4eb90d30b5e033921c8a13cd28517b94b29638621aa9879358e0607eee29361716224760e0e224303614d118c1dc21d0aaaf2b SHA512 41d18dcd572448d8651c4d845f88d754dcf6e308a029bab2ba3a7b99a11f96d3678b2f84bf38a724bb5f6c339fbcba5fd40e2bc50682fc92c9dad147fa74cb83 +EBUILD lcms-2.13-r1.ebuild 1351 BLAKE2B 59c944d988c637f0522a7d4ac5796834a2ae10aaf0b56ed8d8cffab406b0166d3d85fc7d763a8af5958c72ee6f5045af428f9ad434a59f6ae2267bc798dd3585 SHA512 a5c1a3ebfeba65ca1d7d02d6ccdbdddb9aea6fde725b6ea4b04a68b1c02e37cd48ccfc74004bdf47a487e16b75db41d32b5a8bdaa5d9875261d78585cca0e8ad +EBUILD lcms-2.13.1.ebuild 1456 BLAKE2B 3b18cf1b4696e6d4c4618b7cc65c363fdfe9a2eaeb8c6b82589b10dd967b75b18c4780091efee1d8e43b5933c8ba682e67ebbf0a4835c8918fba8132417fb855 SHA512 696c7a1edf1fd2150319bbfd59c224f3ef585a81ac0b16abca4deebca14073e08585c12fa87c62acb9dc9bce42b62589660fb22156331eae05daf397908bb261 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35 diff --git a/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch new file mode 100644 index 000000000000..d1ce0483ee6f --- /dev/null +++ b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch @@ -0,0 +1,38 @@ +https://github.com/mm2/Little-CMS/commit/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7 +https://bugs.gentoo.org/832520 + +From: Marti Maria +Date: Sun, 30 Jan 2022 16:56:48 +0100 +Subject: [PATCH] Fix for optimisation error on grayscale + +Thanks to Aaron Boxer for reporting this issue +--- a/src/cmsintrp.c ++++ b/src/cmsintrp.c +@@ -278,10 +278,10 @@ void Eval1Input(CMSREGISTER const cmsUInt16Number Input[], + // if last value... + if (Input[0] == 0xffff || p16->Domain[0] == 0) { + +- cmsUInt16Number y0 = LutTable[p16->Domain[0]]; +- ++ cmsUInt32Number y0 = p16->Domain[0] * p16->opta[0]; ++ + for (OutChan = 0; OutChan < p16->nOutputs; OutChan++) { +- Output[OutChan] = y0; ++ Output[OutChan] = LutTable[y0 + OutChan]; + } + } + else +@@ -324,10 +324,10 @@ void Eval1InputFloat(const cmsFloat32Number Value[], + // if last value... + if (val2 == 1.0 || p->Domain[0] == 0) { + +- y0 = LutTable[p->Domain[0]]; ++ cmsUInt32Number start = p->Domain[0] * p->opta[0]; + + for (OutChan = 0; OutChan < p->nOutputs; OutChan++) { +- Output[OutChan] = y0; ++ Output[OutChan] = LutTable[start + OutChan]; + } + } + else + diff --git a/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch b/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch new file mode 100644 index 000000000000..41e12fdf1f4e --- /dev/null +++ b/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/832733 +--- a/configure.ac ++++ b/configure.ac +@@ -55,7 +55,7 @@ + AC_PROG_LIBTOOL + AC_SUBST(LIBTOOL_DEPS) + +-LIB_PLUGINS = '' ++LIB_PLUGINS='' + + # Add configure option --enable-maintainer-mode which enables dependency + # checking and generation useful to package maintainers. This is made an +@@ -149,7 +149,7 @@ + [ + with_fastfloat='no' + ]) +-if test "$with_fastfloat" == "yes" ++if test "$with_fastfloat" = "yes" + then + LIB_PLUGINS="$LIB_PLUGINS -llcms2_fast_float" + fi + diff --git a/media-libs/lcms/lcms-2.13-r1.ebuild b/media-libs/lcms/lcms-2.13-r1.ebuild new file mode 100644 index 000000000000..5ffc35b8645b --- /dev/null +++ b/media-libs/lcms/lcms-2.13-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool multilib-minimal + +DESCRIPTION="A lightweight, speed optimized color management engine" +HOMEPAGE="http://www.littlecms.com/" +SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz" +S="${WORKDIR}/lcms2-${PV}" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc jpeg static-libs test +threads tiff zlib" +REQUIRED_USE="tiff? ( zlib )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-grayscale-regression.patch +) + +src_prepare() { + default + + # for Prefix/Solaris + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + $(use_with jpeg) + $(use_enable static-libs static) + $(use_with threads) + $(use_with tiff) + $(use_with zlib) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die + + use doc && dodoc doc/*.pdf +} diff --git a/media-libs/lcms/lcms-2.13.1.ebuild b/media-libs/lcms/lcms-2.13.1.ebuild new file mode 100644 index 000000000000..d1f7d6df39a5 --- /dev/null +++ b/media-libs/lcms/lcms-2.13.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="A lightweight, speed optimized color management engine" +HOMEPAGE="http://www.littlecms.com/" +SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz" +S="${WORKDIR}/lcms2-${PV}" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc jpeg static-libs test +threads tiff zlib" +REQUIRED_USE="tiff? ( zlib )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.13.1-fix-configure-bashisms.patch +) + +src_prepare() { + default + + # TODO: Swap back to elibtoolize once dropped eautoreconf (for bashism patch) + # for Prefix/Solaris + #elibtoolize + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(use_with jpeg) + $(use_enable static-libs static) + $(use_with threads) + $(use_with tiff) + $(use_with zlib) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die + + use doc && dodoc doc/*.pdf +} diff --git a/media-libs/lcms/lcms-2.13.ebuild b/media-libs/lcms/lcms-2.13.ebuild deleted file mode 100644 index 592a2703d159..000000000000 --- a/media-libs/lcms/lcms-2.13.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit libtool multilib-minimal - -DESCRIPTION="A lightweight, speed optimized color management engine" -HOMEPAGE="http://www.littlecms.com/" -SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz" -S="${WORKDIR}/lcms2-${PV}" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc jpeg static-libs test +threads tiff zlib" -REQUIRED_USE="tiff? ( zlib )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - # for Prefix/Solaris - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - $(use_with jpeg) - $(use_enable static-libs static) - $(use_with threads) - $(use_with tiff) - $(use_with zlib) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die - - use doc && dodoc doc/*.pdf -} -- cgit v1.2.3