* [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
@ 2018-09-18 18:25 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-09-18 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 139bfc57747c094af6dc04e4485e433dd56acbde
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 15:41:14 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 18:25:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139bfc57
media-libs/lcms: Cleanup vulnerable
Bug: https://bugs.gentoo.org/628478
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/lcms/Manifest | 1 -
.../lcms/files/lcms-2.8-CVE-2016-10165.patch | 22 ----------
media-libs/lcms/lcms-2.8-r1.ebuild | 46 -------------------
media-libs/lcms/lcms-2.8-r2.ebuild | 51 ----------------------
4 files changed, 120 deletions(-)
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 52781d41770..619b6ff86f5 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,2 +1 @@
-DIST lcms2-2.8.tar.gz 6687005 BLAKE2B fb187eeb5ffbd5bc9c836fa75c26111605c582281edcdf27c91175248b8b71c69017b9bcd632b5a51360173777c87dff58cab51d209c0e8dda9f329f0d2e3eaf SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f
DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
diff --git a/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch b/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch
deleted file mode 100644
index b380cf40d5a..00000000000
--- a/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5ca71a7bc18b6897ab21d815d15e218e204581e2 Mon Sep 17 00:00:00 2001
-From: Marti <marti.maria@tktbrainpower.com>
-Date: Mon, 15 Aug 2016 23:31:39 +0200
-Subject: [PATCH] Added an extra check to MLU bounds
-
-Thanks to Ibrahim el-sayed for spotting the bug
----
- src/cmstypes.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cmstypes.c b/src/cmstypes.c
-index cb61860..c7328b9 100644
---- a/src/cmstypes.c
-+++ b/src/cmstypes.c
-@@ -1460,6 +1460,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
-
- // Check for overflow
- if (Offset < (SizeOfHeader + 8)) goto Error;
-+ if ((Offset + Len) > SizeOfTag + 8) goto Error;
-
- // True begin of the string
- BeginOfThisString = Offset - SizeOfHeader - 8;
diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
deleted file mode 100644
index df3cb187556..00000000000
--- a/media-libs/lcms/lcms-2.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-inherit eutils multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs +threads test tiff zlib"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/lcms2-${PV}
-
-PATCHES=(
- "${FILESDIR}/${P}-CVE-2016-10165.patch"
-)
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_with jpeg)
- $(use_with tiff)
- $(use_with zlib)
- $(use_with threads)
- )
- ECONF_SOURCE="${S}" \
- econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
- find "${ED}" \( -name "*.la" -o -name "*.a" \) -delete || die
-
- if use doc; then
- docinto pdf
- dodoc doc/*.pdf
- fi
-}
diff --git a/media-libs/lcms/lcms-2.8-r2.ebuild b/media-libs/lcms/lcms-2.8-r2.ebuild
deleted file mode 100644
index e39e224c996..00000000000
--- a/media-libs/lcms/lcms-2.8-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs test +threads tiff"
-
-RDEPEND="
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lcms2-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2016-10165.patch" )
-
-src_prepare() {
- default
- elibtoolize # for Prefix/Solaris
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_with jpeg)
- $(use_enable static-libs static)
- $(use_with threads)
- $(use_with tiff)
- --without-zlib
- )
- ECONF_SOURCE="${S}" \
- econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
- find "${ED}" -name "*.la" -delete || die
-
- if use doc; then
- docinto pdf
- dodoc doc/*.pdf
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
@ 2022-02-03 10:50 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-02-03 10:50 UTC (permalink / raw
To: gentoo-commits
commit: 98cddc12ba0bbc204444db2162389fa1b430a14e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 3 10:50:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 10:50:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98cddc12
media-libs/lcms: backport grayscale regression fix
Closes: https://bugs.gentoo.org/832520
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/lcms-2.13-grayscale-regression.patch | 38 ++++++++++++++++++++++
.../lcms/{lcms-2.13.ebuild => lcms-2.13-r1.ebuild} | 4 +++
2 files changed, 42 insertions(+)
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 <marti.maria@littlecms.com>
+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/lcms-2.13.ebuild b/media-libs/lcms/lcms-2.13-r1.ebuild
similarity index 95%
rename from media-libs/lcms/lcms-2.13.ebuild
rename to media-libs/lcms/lcms-2.13-r1.ebuild
index 592a2703d159..5ffc35b8645b 100644
--- a/media-libs/lcms/lcms-2.13.ebuild
+++ b/media-libs/lcms/lcms-2.13-r1.ebuild
@@ -25,6 +25,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-grayscale-regression.patch
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
@ 2022-02-06 11:22 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-02-06 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 01d345a2a91f782d33a2d1217fdf63617e962413
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 6 11:21:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 6 11:22:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d345a2
media-libs/lcms: add 2.13.1
Bug: https://bugs.gentoo.org/832520
Closes: https://bugs.gentoo.org/832733
Thanks-to: Matt Whitlock <gentoo <AT> mattwhitlock.name> (bashism fix)
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/lcms/Manifest | 1 +
.../files/lcms-2.13.1-fix-configure-bashisms.patch | 22 +++++++++
media-libs/lcms/lcms-2.13.1.ebuild | 57 ++++++++++++++++++++++
3 files changed, 80 insertions(+)
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 8ae5280bd78d..0e2f5f4026f0 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,3 +1,4 @@
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
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.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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
@ 2022-08-17 16:21 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2022-08-17 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 55871693ee3509844918f2e0353bd9092e76a5a5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:44:49 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:21:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55871693
media-libs/lcms: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/lcms/Manifest | 3 --
.../files/lcms-2.13-grayscale-regression.patch | 38 ---------------
media-libs/lcms/lcms-2.11.ebuild | 46 ------------------
media-libs/lcms/lcms-2.12.ebuild | 51 --------------------
media-libs/lcms/lcms-2.13-r1.ebuild | 55 ----------------------
5 files changed, 193 deletions(-)
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 0e2f5f4026f0..fd95b9973f31 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,4 +1 @@
-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
diff --git a/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch b/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
deleted file mode 100644
index d1ce0483ee6f..000000000000
--- a/media-libs/lcms/files/lcms-2.13-grayscale-regression.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/mm2/Little-CMS/commit/fdbfb7694f9d7048d53674b79ddfc38068bfdaf7
-https://bugs.gentoo.org/832520
-
-From: Marti Maria <marti.maria@littlecms.com>
-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/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
deleted file mode 100644
index d35c2fd1aa2c..000000000000
--- a/media-libs/lcms/lcms-2.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lcms2-${PV}"
-
-src_prepare() {
- default
- elibtoolize # for Prefix/Solaris
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_with jpeg)
- $(use_enable static-libs static)
- $(use_with threads)
- $(use_with tiff)
- --without-zlib
- )
- ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-
- use doc && dodoc doc/*.odt
-}
diff --git a/media-libs/lcms/lcms-2.12.ebuild b/media-libs/lcms/lcms-2.12.ebuild
deleted file mode 100644
index 0d89a0d3b270..000000000000
--- a/media-libs/lcms/lcms-2.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-}
diff --git a/media-libs/lcms/lcms-2.13-r1.ebuild b/media-libs/lcms/lcms-2.13-r1.ebuild
deleted file mode 100644
index c93f0392edea..000000000000
--- a/media-libs/lcms/lcms-2.13-r1.ebuild
+++ /dev/null
@@ -1,55 +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 ~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"
-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
@ 2023-04-13 1:57 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-13 1:57 UTC (permalink / raw
To: gentoo-commits
commit: 2c5edaf73d4f2ca6894fff3fbf13088997de98e2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 01:56:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 01:56:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5edaf7
media-libs/lcms: fix linking with pthread
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../lcms/files/lcms-2.15-pthread-linking.patch | 25 ++++++++++++++++++++++
media-libs/lcms/lcms-2.15.ebuild | 1 +
2 files changed, 26 insertions(+)
diff --git a/media-libs/lcms/files/lcms-2.15-pthread-linking.patch b/media-libs/lcms/files/lcms-2.15-pthread-linking.patch
new file mode 100644
index 000000000000..613d43415b3d
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.15-pthread-linking.patch
@@ -0,0 +1,25 @@
+https://github.com/mm2/Little-CMS/commit/1cb1e12fc298b86168ff5606d4ae8d5adb478021
+
+From 1cb1e12fc298b86168ff5606d4ae8d5adb478021 Mon Sep 17 00:00:00 2001
+From: Daniel Engberg <daniel.engberg.lists@pyret.net>
+Date: Sun, 19 Mar 2023 13:19:14 +0100
+Subject: [PATCH] meson: Link pthread library to threaded plugin
+
+Fixes
+```
+cc -o plugins/threaded/src/liblcms2_threaded.so plugins/threaded/src/liblcms2_threaded.so.p/threaded_core.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_main.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_scheduler.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_split.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group -Wl,-soname,liblcms2_threaded.so -fstack-protector-strong -O2 -pipe -fstack-protector-strong -fno-strict-aliasing '-Wl,-rpath,$ORIGIN/../../../src' -Wl,-rpath-link,/usr/ports/graphics/lcms2/work/lcms2-2.15/_build/src src/liblcms2.so.2.0.15 -Wl,--end-group
+ld: error: undefined symbol: pthread_create
+```
+OS: FreeBSD 13.2-BETA1 (amd64)
+--- a/plugins/threaded/src/meson.build
++++ b/plugins/threaded/src/meson.build
+@@ -21,7 +21,7 @@ liblcms2_threaded = library(
+ 'lcms2_threaded',
+ liblcms2_threaded_sources,
+ include_directories: lcms2_threaded_incdir,
+- dependencies: liblcms2_dep,
++ dependencies: [ liblcms2_dep, threads_dep ],
+ c_args: cargs,
+ install: true,
+ )
+
diff --git a/media-libs/lcms/lcms-2.15.ebuild b/media-libs/lcms/lcms-2.15.ebuild
index 20c12e472a27..d7c7043df029 100644
--- a/media-libs/lcms/lcms-2.15.ebuild
+++ b/media-libs/lcms/lcms-2.15.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.15-meson-big-endian.patch
"${FILESDIR}"/${PN}-2.15-meson-samples.patch
"${FILESDIR}"/${PN}-2.15-meson-psicc-man-page.patch
+ "${FILESDIR}"/${PN}-2.15-pthread-linking.patch
)
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
@ 2024-01-05 10:09 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-01-05 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 37205addd37ecdbc37fae7fc67386942e3714d91
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 10:07:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 10:07:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37205add
media-libs/lcms: drop 2.13.1-r3, 2.14-r4
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/lcms/Manifest | 2 -
.../files/lcms-2.13.1-clang-15-configure.patch | 29 -----------
.../files/lcms-2.13.1-fix-configure-bashisms.patch | 22 --------
media-libs/lcms/lcms-2.13.1-r3.ebuild | 58 ----------------------
media-libs/lcms/lcms-2.14-r4.ebuild | 52 -------------------
5 files changed, 163 deletions(-)
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 041db546046c..60d253d2191a 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,4 +1,2 @@
-DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617
-DIST lcms2-2.14.tar.gz 7406694 BLAKE2B 777b0bf65829121a3d32bca1ab936ac022f9af739bccdd02d5f86688c3386b974f526a012bdec4d36649566eea0aa659db317dd383eede6488236d601156a0f9 SHA512 92fba0a457ea81590eba0b8d98b7b621da6a83e3857948585e0b524235954954f9ac1670cf6a19b457c0fce22a87899ea4c5810db1ff2acf7c6b6e0dc4b61a1b
DIST lcms2-2.15.tar.gz 7548405 BLAKE2B 97ce1e87c8de17e7d0dd1b00e1b49cf4e3c6912c74ff16d5afb9979565ad830fd8b3f08f7535ae8b5e763fbd22d2a058c577536ddb7487b7aa8fb25d585f8c84 SHA512 ab038c369e66736e0dd3810fbac6cf5381bc3102c4dd693819367b1224f59d9e853ede081388464c0e7c213d92e6cddc48c23020953af10ad6c6802cfa17e213
DIST lcms2-2.16.tar.gz 7632822 BLAKE2B cf4d10908e6b8e6cf15ec8a99f0a299a9bcb7082f0df5ab1c9d84fcb739132855edf717c2ab746040fc09bace7afaaa8a39538e7ceabd0e68cdb3b4fb5627c6d SHA512 638dd6ad6787456c8145510d18b2d0727bd0a446a13ac2934aabc9531d1156eca2a2c0fd780a453823fbd35a1895f9d8de5dc4b3cab505459dd3f0535b4e837d
diff --git a/media-libs/lcms/files/lcms-2.13.1-clang-15-configure.patch b/media-libs/lcms/files/lcms-2.13.1-clang-15-configure.patch
deleted file mode 100644
index e723d1f4b3c7..000000000000
--- a/media-libs/lcms/files/lcms-2.13.1-clang-15-configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/mm2/Little-CMS/pull/338
-
-From 61493b49b91740a84dea61b72a8ce7dc40afa766 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 12 Sep 2022 17:56:31 +0100
-Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15
- (-Wimplicit-int)
-
-Clang 15 makes -Wimplicit-int an error by default.
-
-Before this fix, configure would think SSE2 support is not present
-when it is:
-```
-checking whether compiler supports SSE2... no
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -212,7 +212,7 @@ AC_LANG_PUSH([C])
- AC_MSG_CHECKING([whether compiler supports SSE2])
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include <emmintrin.h>
-- main() { __m128i n = _mm_set1_epi8(42); }]])],
-+ int main() { __m128i n = _mm_set1_epi8(42); }]])],
- [ac_compiler_supports_sse2=yes], [ac_compiler_supports_sse2=no])
- AC_MSG_RESULT([$ac_compiler_supports_sse2])
- AS_IF([test "x$ac_compiler_supports_sse2" != "xyes"],
-
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
deleted file mode 100644
index 41e12fdf1f4e..000000000000
--- a/media-libs/lcms/files/lcms-2.13.1-fix-configure-bashisms.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.1-r3.ebuild b/media-libs/lcms/lcms-2.13.1-r3.ebuild
deleted file mode 100644
index ca2201b84f49..000000000000
--- a/media-libs/lcms/lcms-2.13.1-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc jpeg static-libs test +threads tiff zlib"
-REQUIRED_USE="tiff? ( zlib )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r6:=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.13.1-fix-configure-bashisms.patch
- "${FILESDIR}"/${PN}-2.13.1-clang-15-configure.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.14-r4.ebuild b/media-libs/lcms/lcms-2.14-r4.ebuild
deleted file mode 100644
index a1d006cf1598..000000000000
--- a/media-libs/lcms/lcms-2.14-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc jpeg static-libs tiff zlib"
-REQUIRED_USE="tiff? ( zlib )"
-
-RDEPEND="
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r6:=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- # TODO: switch back to elibtoolize once https://github.com/mm2/Little-CMS/issues/339
- # is fixed.
- # for Prefix/Solaris
- #elibtoolize
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --with-threads
- $(use_with jpeg)
- $(use_enable static-libs static)
- $(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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-05 10:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-03 10:50 [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-05 10:09 Sam James
2023-04-13 1:57 Sam James
2022-08-17 16:21 Matt Turner
2022-02-06 11:22 Sam James
2018-09-18 18:25 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox