From 1921742c8fb5ff2f7287dca16f060ed3add1f4c0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Jan 2026 07:12:02 +0000 Subject: [PATCH] dev-python/pillow: Sync with Gentoo It's from Gentoo commit 96b51161a1db265c606e7d088ca9be6ed3c79b33. Signed-off-by: Flatcar Buildbot --- .../portage-stable/dev-python/pillow/Manifest | 1 + .../dev-python/pillow/pillow-11.3.0.ebuild | 2 +- .../dev-python/pillow/pillow-12.0.0.ebuild | 2 +- .../dev-python/pillow/pillow-12.1.0.ebuild | 169 ++++++++++++++++++ 4 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest index af5b38e211..1f224a5360 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest @@ -1,3 +1,4 @@ DIST pillow-11.3.0.gh.tar.gz 47173056 BLAKE2B 1260c7025e6013c50782024756a0c891d3735bd7d4c1c9d0a89d9eb1c94bd2f762369086f7269d487100e8a0e2678a73012bf29172697c1a1a18e58f9019a9bd SHA512 7d97e623bd41da94dd89a66dc600cea016d0a4f33fbf036175768ea96b2031c1968acf4fc3d9b2835ce93f9533838a9ce68a6579a7397f4aeccafb6032adb3db DIST pillow-12.0.0.gh.tar.gz 47078314 BLAKE2B 14540f6b016004de56e5736f66f23999ebc2683c4be5053631fd6890502d7416d05e9ef858460fec4473d873893303b51f251ed3b50facb11616211b0629e79c SHA512 816237bf65b65a8f7ec941db6ea07814af602efe6f214e2a253b1d0b6b9dbbe9895a9822c6de67af40bd507e658b8c088707440f689d5fd237985f4ee0f7bfc2 +DIST pillow-12.1.0.gh.tar.gz 47045570 BLAKE2B 1ba09d4a9540584c6649f29f03c8f2673fa675a8309f0a7ff45eb95b878498d3adfa239a755dda2d14035c2d4ac22920b78d2caeaa1c2f403ad4da0c50960f8e SHA512 f542780a7894ca4eade3ee2c806f2bb0866cd93967ce45228ffaff9d0c9fb09eb3193a5afc9aa08caff1ed7f495031414fbd4a1addb3c373f8fa76a373a0be8d DIST pillow-test-images-7077675d2cda485d63de4aefe0fefbf6f655c5a0.gh.tar.gz 57430276 BLAKE2B 6e8dcde60832004f5a0ea0e14024fdcd0b08cf0e225f27e39b7c2058582d6d5efe7fcaccb5bd28754affa6fe4125735fb4beeaa2075e6aceea0a998ebc0747fe SHA512 795f015c9b73a8c941fb5cd880b1ab36b24d38612db53367ab0e6c05dd1cdbfd47034decb7e36d7de940eeea1582d644ca7bee3b131577578692569c2c60c32b diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild index 74a0d2b036..9fb70e8585 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild @@ -35,7 +35,7 @@ S=${WORKDIR}/${MY_P} LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild index 99f42e4ef5..130bfbe577 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild @@ -35,7 +35,7 @@ S=${WORKDIR}/${MY_P} LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild new file mode 100644 index 0000000000..14e6df655a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +# setuptools wrapper +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{11..14} pypy3_11 ) +PYTHON_REQ_USE='tk?,threads(+)' + +inherit distutils-r1 toolchain-funcs virtualx + +MY_PN=Pillow +MY_P=${MY_PN}-${PV} + +# upstream always fetches from main +TEST_IMAGE_COMMIT="7077675d2cda485d63de4aefe0fefbf6f655c5a0" + +DESCRIPTION="Python Imaging Library (fork)" +HOMEPAGE=" + https://python-pillow.github.io/ + https://github.com/python-pillow/Pillow/ + https://pypi.org/project/pillow/ +" +SRC_URI=" + https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + test? ( + https://github.com/python-pillow/test-images/archive/${TEST_IMAGE_COMMIT}.tar.gz + -> pillow-test-images-${TEST_IMAGE_COMMIT}.gh.tar.gz + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" +REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" +RESTRICT="!test? ( test )" + +DEPEND=" + avif? ( media-libs/libavif:= ) + imagequant? ( media-gfx/libimagequant:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + lcms? ( media-libs/lcms:2= ) + tiff? ( media-libs/tiff:=[jpeg,zlib] ) + truetype? ( + media-libs/freetype:2= + media-libs/harfbuzz:= + ) + webp? ( media-libs/libwebp:= ) + xcb? ( x11-libs/libxcb ) + zlib? ( virtual/zlib:= ) +" +RDEPEND=" + ${DEPEND} + dev-python/olefile[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/pybind11[${PYTHON_USEDEP}] + >=dev-python/setuptools-77[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + virtual/pkgconfig + test? ( + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + || ( + media-gfx/imagemagick[png] + media-gfx/graphicsmagick[png] + ) + ) +" + +EPYTEST_PLUGINS=( pytest-timeout ) +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + local PATCHES=( + # https://github.com/python-pillow/pillow/pull/7634 + "${FILESDIR}/${PN}-10.2.0-cross.patch" + ) + + distutils-r1_src_prepare + + if use test; then + mv "${WORKDIR}/test-images-${TEST_IMAGE_COMMIT}"/* \ + Tests/images || die + fi +} + +usepil() { + usex "${1}" enable disable +} + +python_configure_all() { + cat >> setup.cfg <<-EOF || die + [build_ext] + debug = True + disable_platform_guessing = True + $(usepil avif)_avif = True + $(usepil truetype)_freetype = True + $(usepil jpeg)_jpeg = True + $(usepil jpeg2k)_jpeg2000 = True + $(usepil lcms)_lcms = True + $(usepil tiff)_tiff = True + $(usepil imagequant)_imagequant = True + $(usepil webp)_webp = True + $(usepil xcb)_xcb = True + $(usepil zlib)_zlib = True + EOF + if use truetype; then + # these dependencies are implicitly disabled by USE=-truetype + # and we can't pass both disable_* and vendor_* + # https://bugs.gentoo.org/935124 + cat >> setup.cfg <<-EOF || die + vendor_raqm = False + vendor_fribidi = False + EOF + fi + + tc-export PKG_CONFIG +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + local EPYTEST_DESELECT=( + # TODO (is clipboard unreliable in Xvfb?) + Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard + # requires xz-utils[extra-filters]? + Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma + ) + + case ${ARCH} in + ppc) + EPYTEST_DESELECT+=( + # https://github.com/python-pillow/Pillow/issues/7008 + # (we've reverted the upstream patch because it was worse + # than the original issue) + Tests/test_file_libtiff.py::TestFileLibTiff::test_exif_ifd + ) + ;; + esac + + "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" + # leak tests are fragile and broken under xdist + # nonfatal implied by xvfb + nonfatal epytest -k "not leak" || die "Tests failed with ${EPYTHON}" +} + +python_install() { + python_doheader src/libImaging/*.h + distutils-r1_python_install +} + +python_install_all() { + if use examples ; then + docinto example + dodoc docs/example/* + docompress -x /usr/share/doc/${PF}/example + fi + distutils-r1_python_install_all +}