diff options
Diffstat (limited to 'dev-python/pillow')
| -rw-r--r-- | dev-python/pillow/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/pillow/files/pillow-10.2.0-cross.patch | 62 | ||||
| -rw-r--r-- | dev-python/pillow/pillow-10.2.0-r1.ebuild | 131 |
3 files changed, 195 insertions, 0 deletions
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index ad860567d2b7..f65cd27e3ae7 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,8 +1,10 @@ AUX pillow-10.1.0-olefile-0.47.patch 1456 BLAKE2B de5fda5245b9674f7a695bcde5125eeb326fdfa29c6cca2a7406c12b31af1d8e4b4ef2919c99e2ce8ed08dc6cb441b7728190cce23b7d4e1a384605a584a086b SHA512 3eef1572704eba1fa5047f866c11b563f0c79e04ae1da5f70aa2fb9876dbf21583376326c47d44691732492c092b0c4821fbd18f62de4de9a1970b6e177384dd +AUX pillow-10.2.0-cross.patch 2390 BLAKE2B d690b3f93d59c32d0f1b209b51ea4787230892488059ec206f548276a1f697394ca539fcd9f92fa7c547b37dd6b4fc738400a3034f54eec6260f0f98ae372b39 SHA512 4afaec6964298e2f1c21fea77791ce0cdacdbc65bf9798d46e99681c772065c1ad1175f5821162157cacac64f556e320af2ca7dcbd0806c07d04f8116f8f508c DIST pillow-10.0.1.gh.tar.gz 50539264 BLAKE2B 83c3bf4abc9c3eab210576dc28d6f8926ce0998ec344e792433afc05190bb248a926902ce7706e3569cd6cbf8deb640cafda86f102166cf6492ec00b66f9392f SHA512 27e2f0d86563c3b7f5a2e0ba2bbe98fc2cb2fa5871d0b6cbb5a0014e9d9eb03dde9969301419d806d1a22cd4881e624465a355ba9bc42b95746226e1f95712a9 DIST pillow-10.1.0.gh.tar.gz 50798274 BLAKE2B a69be8187e7206b50350af399b73b5c43b29c249a4a5a6bb23438dae9967bb84f1d487f52b188811cb3d2e550245f8d5a765668d8d5de1375a84fcd96fc531d9 SHA512 01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a DIST pillow-10.2.0.gh.tar.gz 46244216 BLAKE2B 27bb076f0adade34295e6dfec5c5a1499471036e4f5358f0b3985c064a0ae962be9e91985851b369a49162ef520a84bb20eb1a5acb074fe94d861f042e4ada92 SHA512 d77ebedfb89d541db2fcba4fc354e097b9917594170bad07c67e22de123c9e0bbc9c55a938fc152bbdcca3ce23de6fa374a6d3d3bdbd44f16dbc2616c1bddf60 EBUILD pillow-10.0.1.ebuild 3501 BLAKE2B 9f690f40ca87ce944906fd315fa702735587500b2c3948431206803aad95a09895920819eb5a44f39c2b12c01de7400042743e516fbf5c86615c39d62b067d16 SHA512 ae4ddcfdf4e60fe86eb2643f839e3a0d72dcb1e7b2d78ce6a9f476945e81d673d1b2319b09d1f69bfd6d1f27b6ed693355e1fd85536f51d6b2220484f65bdeb5 EBUILD pillow-10.1.0-r1.ebuild 3606 BLAKE2B bcec30251d71e5c9cc439bad1fef9e701721af432a05187165880ee2ba9e776ac6c7208275168e6843727d33987a7482977aacd1d6e7f77b492bd74d9ee10ebd SHA512 4ced9aa36035a8c9865497378df8fead39e50c9d61b8b47fb218031a1ba9f6ea9086d9104b594e75936ef41870e435601ee51d621f61cd1531dc6d99a1ce61cd +EBUILD pillow-10.2.0-r1.ebuild 3278 BLAKE2B bb638def6948d659bb7103ca40d9c720b185207be12c6b6408bc7da10daaf5b5ef1e3e297fe429284ab146afa66379ab04200ef7f3109b98b787fa367f22bbb2 SHA512 25fcccb1b650bb7735a34ab670564f0fde3940f2ad682b143d7810fdbf23e68e4262decc2d3950996429bd60fdf5078f01cc07d7d77536b3db72dfac4a3cef52 EBUILD pillow-10.2.0.ebuild 3509 BLAKE2B 1901ee3f18c79007ccfd0489719a022fa3d68d5c4a21d625e87579d54ebecb025eeef65b781518e3a85cf464e125887f2bd2344f7de12036b23d6ad7271d05e7 SHA512 9aef737b1689c30ce05eae1b96f9f9a83c4f3d1b5eb0223ae21a61994f8f28fceaee57d5ff5c4a3f145e8a4ae2a9700c527c29a4ef6357567361c125e39da2b9 MISC metadata.xml 480 BLAKE2B 9fe5188b0a5eb4f19b53f34efad5c7da2ba086dd5eb9ed2e4fce8b6a6fac14d9a848392980cd1d2eaff5b334d7c5e39f58d60b763f44879d852dfb0b4f5e3efc SHA512 2b15d9e07b13a6028e87a3d5f0e72b2d252cfb2fa843783acfd2a9dd38bb6f0641f94d067f3a900fede445c606da361d509de2d4541513126b57c6782f69a5bb diff --git a/dev-python/pillow/files/pillow-10.2.0-cross.patch b/dev-python/pillow/files/pillow-10.2.0-cross.patch new file mode 100644 index 000000000000..864a9b1218d1 --- /dev/null +++ b/dev-python/pillow/files/pillow-10.2.0-cross.patch @@ -0,0 +1,62 @@ +From 774d7a570d9f76903de3c3267512b8a7d252c21e Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Fri, 22 Dec 2023 22:38:27 +0000 +Subject: [PATCH] Fix cross-compiling by searching the right lib and include + directories + +We were previously searching the `{sys.prefix}/lib` and +`{sys.prefix}/include` directories unconditionally. This is problematic +when cross-compiling, as it does not take account of any sysroot where +alternative libraries and headers are located. Adding `-I/usr/include` +causes the build to explode, at least when cross-compiling from 64-bit +to 32-bit. + +Python does not officially support cross-compiling, but Gentoo achieves +this by modifying the sysconfig variables like `LIBDIR` and `INCLUDEDIR` +with great results. + +Assuming "lib" is bad. 64-bit Linux systems often use lib64, putting +32-bit libraries under lib. You cannot assume that either though, as +pure 64-bit Linux systems may just use lib instead. Things get even +stranger on RISC-V. + +The value of `sys.prefix` changes when using a virtualenv. Dependencies +may be installed here, so it does make sense to continue supporting this +case, even if it is incompatible with cross-compiling. Unlike regular +environments, "lib" is generally used for libraries, although a lib64 +symlink may also be present. +--- + setup.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 1bf0bcff558..07163d001fc 100755 +--- a/setup.py ++++ b/setup.py +@@ -15,6 +15,7 @@ + import struct + import subprocess + import sys ++import sysconfig + import warnings + + from setuptools import Extension, setup +@@ -504,8 +505,16 @@ def build_extensions(self): + for d in os.environ[k].split(os.path.pathsep): + _add_directory(library_dirs, d) + +- _add_directory(library_dirs, os.path.join(sys.prefix, "lib")) +- _add_directory(include_dirs, os.path.join(sys.prefix, "include")) ++ _add_directory( ++ library_dirs, ++ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("LIBDIR")) ++ or os.path.join(sys.prefix, "lib"), ++ ) ++ _add_directory( ++ include_dirs, ++ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("INCLUDEDIR")) ++ or os.path.join(sys.prefix, "include"), ++ ) + + # + # add platform directories diff --git a/dev-python/pillow/pillow-10.2.0-r1.ebuild b/dev-python/pillow/pillow-10.2.0-r1.ebuild new file mode 100644 index 000000000000..7baed0acf5a1 --- /dev/null +++ b/dev-python/pillow/pillow-10.2.0-r1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 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_{10..12} pypy3 ) +PYTHON_REQ_USE='tk?,threads(+)' + +inherit distutils-r1 toolchain-funcs virtualx + +MY_PN=Pillow +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python Imaging Library (fork)" +HOMEPAGE=" + https://python-pillow.org/ + 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 +" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" +REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" +RESTRICT="!test? ( test )" + +DEPEND=" + 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= ) + webp? ( media-libs/libwebp:= ) + xcb? ( x11-libs/libxcb ) + zlib? ( sys-libs/zlib:= ) +" +RDEPEND=" + ${DEPEND} + dev-python/olefile[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + virtual/pkgconfig + test? ( + ${RDEPEND} + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + || ( + media-gfx/imagemagick[png] + media-gfx/graphicsmagick[png] + ) + ) +" + +EPYTEST_DESELECT=( + # TODO; incompatible Qt version? + Tests/test_qt_image_qapplication.py::test_sanity +) + +PATCHES=( + # https://github.com/python-pillow/pillow/pull/7634 + "${FILESDIR}/${P}-cross.patch" +) + +usepil() { + usex "${1}" enable disable +} + +python_configure_all() { + # It's important that these flags are also passed during the install phase + # as well. Make sure of that if you change the lines below. See bug 661308. + cat >> setup.cfg <<-EOF || die + [build_ext] + disable_platform_guessing = 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 webp)_webpmux = True + $(usepil xcb)_xcb = True + $(usepil zlib)_zlib = True + EOF + + # We have patched in this env var. + 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 + ) + + "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" + # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed + epytest -p no:relaxed || 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 +} |