From b182a11066823e75fdb92e07982319ce2513cf7f Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 27 Jul 2025 19:03:11 +0300 Subject: media-libs/lcms: several fixes * fix FTBFS with gcc-14 (and a mistake because of which DWORDs had incorrect size on 64-bit systems) * bump EAPI 7->8 * fix SRC_URI * unkeyword ~ia64 - the arch is removed by upstream * replace virtual/jpeg -> media-libs/libjpeg-turbo; The former was declared deprecated Signed-off-by: Alexander Golubev --- .../files/lcms-1.19-use-correct-int-types.patch | 33 ++++++++++++ media-libs/lcms/lcms-1.19-r1.ebuild | 59 ---------------------- media-libs/lcms/lcms-1.19-r2.ebuild | 59 ++++++++++++++++++++++ 3 files changed, 92 insertions(+), 59 deletions(-) create mode 100644 media-libs/lcms/files/lcms-1.19-use-correct-int-types.patch delete mode 100644 media-libs/lcms/lcms-1.19-r1.ebuild create mode 100644 media-libs/lcms/lcms-1.19-r2.ebuild diff --git a/media-libs/lcms/files/lcms-1.19-use-correct-int-types.patch b/media-libs/lcms/files/lcms-1.19-use-correct-int-types.patch new file mode 100644 index 00000000..2eda0a1f --- /dev/null +++ b/media-libs/lcms/files/lcms-1.19-use-correct-int-types.patch @@ -0,0 +1,33 @@ +From cc41e96f91d96d737c66067113082dbb2d46f34d Mon Sep 17 00:00:00 2001 +From: Alexander Golubev +Date: Sun, 27 Jul 2025 18:41:16 +0300 +Subject: [PATCH] Use correct int types + +--- + include/lcms.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/include/lcms.h b/include/lcms.h +index 2c6f764..6a68c13 100755 +--- a/include/lcms.h ++++ b/include/lcms.h +@@ -185,11 +185,13 @@ typedef pthread_rwlock_t LCMS_RWLOCK_T; + # include + #endif + ++#include ++ + #ifndef LCMS_WIN_TYPES_ALREADY_DEFINED + +-typedef unsigned char BYTE, *LPBYTE; +-typedef unsigned short WORD, *LPWORD; +-typedef unsigned long DWORD, *LPDWORD; ++typedef uint8_t BYTE, *LPBYTE; ++typedef uint16_t WORD, *LPWORD; ++typedef uint32_t DWORD, *LPDWORD; + typedef char *LPSTR; + typedef void *LPVOID; + +-- +2.49.1 + diff --git a/media-libs/lcms/lcms-1.19-r1.ebuild b/media-libs/lcms/lcms-1.19-r1.ebuild deleted file mode 100644 index 0873292d..00000000 --- a/media-libs/lcms/lcms-1.19-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Copyright 2021 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools - -DESCRIPTION="Lightweight, speed optimized color management engine" -HOMEPAGE="https://www.littlecms.com/" -SRC_URI="mirror://sourceforge/lcms/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -IUSE="jpeg static-libs tiff zlib" - -# Don't use Gentoo mirrors -RESTRICT="mirror" - -RDEPEND=" - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-disable_static_modules.patch" - "${FILESDIR}/${P}-implicit.patch" -) - -src_prepare() { - - default - - eautoreconf -} - -src_configure() { - econf \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --bindir="${EPREFIX}"/usr/bin \ - --disable-dependency-tracking \ - $(use_enable static-libs static) \ - $(use_with jpeg) \ - $(use_with tiff) \ - $(use_with zlib) -} - -src_install() { - DOCS=(AUTHORS README* INSTALL NEWS doc/*) - - default - - insinto /usr/share/lcms/profiles - doins testbed/*.icm - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/lcms/lcms-1.19-r2.ebuild b/media-libs/lcms/lcms-1.19-r2.ebuild new file mode 100644 index 00000000..49693a66 --- /dev/null +++ b/media-libs/lcms/lcms-1.19-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Copyright 2021-2025 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools + +DESCRIPTION="Lightweight, speed optimized color management engine" +HOMEPAGE="https://www.littlecms.com/" +SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="jpeg static-libs tiff zlib" + +# Don't use Gentoo mirrors +RESTRICT="mirror" + +RDEPEND=" + jpeg? ( media-libs/libjpeg-turbo:0 ) + tiff? ( media-libs/tiff:0 ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-disable_static_modules.patch" + "${FILESDIR}/${P}-implicit.patch" + "${FILESDIR}/${P}-use-correct-int-types.patch" +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --bindir="${EPREFIX}"/usr/bin \ + --disable-dependency-tracking \ + $(use_enable static-libs static) \ + $(use_with jpeg) \ + $(use_with tiff) \ + $(use_with zlib) +} + +src_install() { + DOCS=(AUTHORS README* INSTALL NEWS doc/*) + + default + + insinto /usr/share/lcms/profiles + doins testbed/*.icm + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3