Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
Date: Wed, 17 Aug 2022 16:21:28
Message-Id: 1660753265.55871693ee3509844918f2e0353bd9092e76a5a5.mattst88@gentoo
1 commit: 55871693ee3509844918f2e0353bd9092e76a5a5
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 17 13:44:49 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 17 16:21:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55871693
7
8 media-libs/lcms: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 media-libs/lcms/Manifest | 3 --
13 .../files/lcms-2.13-grayscale-regression.patch | 38 ---------------
14 media-libs/lcms/lcms-2.11.ebuild | 46 ------------------
15 media-libs/lcms/lcms-2.12.ebuild | 51 --------------------
16 media-libs/lcms/lcms-2.13-r1.ebuild | 55 ----------------------
17 5 files changed, 193 deletions(-)
18
19 diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
20 index 0e2f5f4026f0..fd95b9973f31 100644
21 --- a/media-libs/lcms/Manifest
22 +++ b/media-libs/lcms/Manifest
23 @@ -1,4 +1 @@
24 -DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
25 -DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
26 DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617
27 -DIST lcms2-2.13.tar.gz 7259337 BLAKE2B 243e45852a31fb980c80f4468da14eaf1a2b6824cfa4ca0d6260064945faf0ededfa3b69fa8b041cbad49be1ddb7c6099d3b25873ec0d6e31beecea014808c8f SHA512 28cc5310b54b6254447c04ec8072878eb59e539095c400c05a15975b636f2f49daa2e5fa9021a3f9886a1b50e6c85bd950cefa8f171e3f4ee3be269a8dadc4d2
28
29 diff --git a/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
30 deleted file mode 100644
31 index d1ce0483ee6f..000000000000
32 --- a/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
33 +++ /dev/null
34 @@ -1,38 +0,0 @@
35 -https://github.com/mm2/Little-CMS/commit/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7
36 -https://bugs.gentoo.org/832520
37 -
38 -From: Marti Maria <marti.maria@×××××××××.com>
39 -Date: Sun, 30 Jan 2022 16:56:48 +0100
40 -Subject: [PATCH] Fix for optimisation error on grayscale
41 -
42 -Thanks to Aaron Boxer for reporting this issue
43 ---- a/src/cmsintrp.c
44 -+++ b/src/cmsintrp.c
45 -@@ -278,10 +278,10 @@ void Eval1Input(CMSREGISTER const cmsUInt16Number Input[],
46 - // if last value...
47 - if (Input[0] == 0xffff || p16->Domain[0] == 0) {
48 -
49 -- cmsUInt16Number y0 = LutTable[p16->Domain[0]];
50 --
51 -+ cmsUInt32Number y0 = p16->Domain[0] * p16->opta[0];
52 -+
53 - for (OutChan = 0; OutChan < p16->nOutputs; OutChan++) {
54 -- Output[OutChan] = y0;
55 -+ Output[OutChan] = LutTable[y0 + OutChan];
56 - }
57 - }
58 - else
59 -@@ -324,10 +324,10 @@ void Eval1InputFloat(const cmsFloat32Number Value[],
60 - // if last value...
61 - if (val2 == 1.0 || p->Domain[0] == 0) {
62 -
63 -- y0 = LutTable[p->Domain[0]];
64 -+ cmsUInt32Number start = p->Domain[0] * p->opta[0];
65 -
66 - for (OutChan = 0; OutChan < p->nOutputs; OutChan++) {
67 -- Output[OutChan] = y0;
68 -+ Output[OutChan] = LutTable[start + OutChan];
69 - }
70 - }
71 - else
72 -
73
74 diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
75 deleted file mode 100644
76 index d35c2fd1aa2c..000000000000
77 --- a/media-libs/lcms/lcms-2.11.ebuild
78 +++ /dev/null
79 @@ -1,46 +0,0 @@
80 -# Copyright 1999-2021 Gentoo Authors
81 -# Distributed under the terms of the GNU General Public License v2
82 -
83 -EAPI=7
84 -
85 -inherit libtool multilib-minimal
86 -
87 -DESCRIPTION="A lightweight, speed optimized color management engine"
88 -HOMEPAGE="http://www.littlecms.com/"
89 -SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
90 -
91 -LICENSE="MIT"
92 -SLOT="2"
93 -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"
94 -IUSE="doc jpeg static-libs test +threads tiff"
95 -RESTRICT="!test? ( test )"
96 -
97 -RDEPEND="
98 - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
99 - tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
100 -"
101 -DEPEND="${RDEPEND}"
102 -
103 -S="${WORKDIR}/lcms2-${PV}"
104 -
105 -src_prepare() {
106 - default
107 - elibtoolize # for Prefix/Solaris
108 -}
109 -
110 -multilib_src_configure() {
111 - local myeconfargs=(
112 - $(use_with jpeg)
113 - $(use_enable static-libs static)
114 - $(use_with threads)
115 - $(use_with tiff)
116 - --without-zlib
117 - )
118 - ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
119 -}
120 -
121 -multilib_src_install_all() {
122 - find "${ED}" -type f -name "*.la" -delete || die
123 -
124 - use doc && dodoc doc/*.odt
125 -}
126
127 diff --git a/media-libs/lcms/lcms-2.12.ebuild b/media-libs/lcms/lcms-2.12.ebuild
128 deleted file mode 100644
129 index 0d89a0d3b270..000000000000
130 --- a/media-libs/lcms/lcms-2.12.ebuild
131 +++ /dev/null
132 @@ -1,51 +0,0 @@
133 -# Copyright 1999-2021 Gentoo Authors
134 -# Distributed under the terms of the GNU General Public License v2
135 -
136 -EAPI=7
137 -
138 -inherit libtool multilib-minimal
139 -
140 -DESCRIPTION="A lightweight, speed optimized color management engine"
141 -HOMEPAGE="http://www.littlecms.com/"
142 -SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
143 -S="${WORKDIR}/lcms2-${PV}"
144 -
145 -LICENSE="MIT"
146 -SLOT="2"
147 -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"
148 -IUSE="doc jpeg static-libs test +threads tiff zlib"
149 -REQUIRED_USE="tiff? ( zlib )"
150 -
151 -RESTRICT="!test? ( test )"
152 -
153 -RDEPEND="
154 - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
155 - tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
156 - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
157 -"
158 -DEPEND="${RDEPEND}"
159 -
160 -src_prepare() {
161 - default
162 -
163 - # for Prefix/Solaris
164 - elibtoolize
165 -}
166 -
167 -multilib_src_configure() {
168 - local myeconfargs=(
169 - $(use_with jpeg)
170 - $(use_enable static-libs static)
171 - $(use_with threads)
172 - $(use_with tiff)
173 - $(use_with zlib)
174 - )
175 -
176 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
177 -}
178 -
179 -multilib_src_install_all() {
180 - find "${ED}" -type f -name "*.la" -delete || die
181 -
182 - use doc && dodoc doc/*.pdf
183 -}
184
185 diff --git a/media-libs/lcms/lcms-2.13-r1.ebuild b/media-libs/lcms/lcms-2.13-r1.ebuild
186 deleted file mode 100644
187 index c93f0392edea..000000000000
188 --- a/media-libs/lcms/lcms-2.13-r1.ebuild
189 +++ /dev/null
190 @@ -1,55 +0,0 @@
191 -# Copyright 1999-2022 Gentoo Authors
192 -# Distributed under the terms of the GNU General Public License v2
193 -
194 -EAPI=8
195 -
196 -inherit libtool multilib-minimal
197 -
198 -DESCRIPTION="A lightweight, speed optimized color management engine"
199 -HOMEPAGE="http://www.littlecms.com/"
200 -SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
201 -S="${WORKDIR}/lcms2-${PV}"
202 -
203 -LICENSE="MIT"
204 -SLOT="2"
205 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
206 -IUSE="doc jpeg static-libs test +threads tiff zlib"
207 -REQUIRED_USE="tiff? ( zlib )"
208 -
209 -RESTRICT="!test? ( test )"
210 -
211 -RDEPEND="
212 - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
213 - tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
214 - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
215 -"
216 -DEPEND="${RDEPEND}"
217 -
218 -PATCHES=(
219 - "${FILESDIR}"/${P}-grayscale-regression.patch
220 -)
221 -
222 -src_prepare() {
223 - default
224 -
225 - # for Prefix/Solaris
226 - elibtoolize
227 -}
228 -
229 -multilib_src_configure() {
230 - local myeconfargs=(
231 - $(use_with jpeg)
232 - $(use_enable static-libs static)
233 - $(use_with threads)
234 - $(use_with tiff)
235 - $(use_with zlib)
236 - )
237 -
238 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
239 -}
240 -
241 -multilib_src_install_all() {
242 - find "${ED}" -type f -name "*.la" -delete || die
243 -
244 - use doc && dodoc doc/*.pdf
245 -}