diff options
Diffstat (limited to 'dev-python/pillow')
-rw-r--r-- | dev-python/pillow/Manifest | 10 | ||||
-rw-r--r-- | dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch | 32 | ||||
-rw-r--r-- | dev-python/pillow/pillow-10.2.0-r1.ebuild | 2 | ||||
-rw-r--r-- | dev-python/pillow/pillow-10.3.0.ebuild | 2 | ||||
-rw-r--r-- | dev-python/pillow/pillow-10.4.0.ebuild | 2 | ||||
-rw-r--r-- | dev-python/pillow/pillow-11.0.0-r1.ebuild | 149 | ||||
-rw-r--r-- | dev-python/pillow/pillow-11.0.0.ebuild | 136 |
7 files changed, 327 insertions, 6 deletions
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index f50aa6120f0a..e2d6e1f58363 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,9 +1,13 @@ AUX pillow-10.2.0-cross.patch 2390 BLAKE2B d690b3f93d59c32d0f1b209b51ea4787230892488059ec206f548276a1f697394ca539fcd9f92fa7c547b37dd6b4fc738400a3034f54eec6260f0f98ae372b39 SHA512 4afaec6964298e2f1c21fea77791ce0cdacdbc65bf9798d46e99681c772065c1ad1175f5821162157cacac64f556e320af2ca7dcbd0806c07d04f8116f8f508c AUX pillow-10.3.0-py313.patch 691 BLAKE2B acd10146af5467543c44a29bd8236f79fee803d1d0b3bf97b3db2e6ae817f81f30382e9751ae694039ae589a04e4f1ac5169e9a2e60ba5a10c9d2bee1fe00dfb SHA512 5ecd82ae120e3456902f3ab44b0c7a3491ba33de987d005e2a966e8150c45baef46dd357db997662c02734ac00eeaa6a544372610c06e6435e282f5e4fed73aa +AUX pillow-11.0.0-wrong-arg.patch 1242 BLAKE2B 0da76fa225e8107ad15639e540b3935e868e7682d4a241ca609fb019e1269f473b084c35e35d30102c20ee1ca505d1290953e3393e382dcf15bd6f794e080415 SHA512 5f74e04d76f7280bd053b02b01bbff22ce2fc95c1fa8e7c279df9171c61d6a747bbf46644a065fde15457ac6ec008713d8746d611561caf2a0058a84448be15f DIST pillow-10.2.0.gh.tar.gz 46244216 BLAKE2B 27bb076f0adade34295e6dfec5c5a1499471036e4f5358f0b3985c064a0ae962be9e91985851b369a49162ef520a84bb20eb1a5acb074fe94d861f042e4ada92 SHA512 d77ebedfb89d541db2fcba4fc354e097b9917594170bad07c67e22de123c9e0bbc9c55a938fc152bbdcca3ce23de6fa374a6d3d3bdbd44f16dbc2616c1bddf60 DIST pillow-10.3.0.gh.tar.gz 46636534 BLAKE2B 523486a3adc8905dbe0691e7092654e7884c34703f351e228a49b1cb6e9cffdf504b842aa0c83b18afb8f0dbe1265274044003aba540d6427ec3cd46ddda1498 SHA512 11095f435ba30ac364575271de4c94d498b6fc1d67730b8212fae6f187902129018ca950aa878843f4d1b29e25aab1be245ed313fd3bc110ccf9ce3ae266d840 DIST pillow-10.4.0.gh.tar.gz 46617167 BLAKE2B 3eb7852ab087d18e5b9a03d6cbf83ead96b637a71d4209a4574d66c9d098936d240c0be3235d9e951ec094b9b0def196b265a8e68f59802f843171c74ca7bbac SHA512 835a8766c384ec3fcf67b42c9bbad35dad0848cc5bd9eba1b0768a864e174a1d9c4a5e989f22496a40f2c29dd7f492f6f80465903fe872b10749cfa0340e1bc5 -EBUILD pillow-10.2.0-r1.ebuild 3271 BLAKE2B dcbe6350a55e28c2fdb6cfbbe33e638bde17fa291b5b507b5071084a8cc13a16be2c87ba986e7c59acd27ffb01cfc8ea4d6ae58cc845890aee6356dc29434139 SHA512 45e05f96ad73aa58e11d6f0fce2afc4b727f6538801b861aec0f586d8714ed4270532973b063f2e3af3e0971986dd75f22606dadcb267a907930bd8d9d82a623 -EBUILD pillow-10.3.0.ebuild 3459 BLAKE2B 6b3bb0499eaed048c66a196cd328a5f8875b36fe09564238a24fbdcbd3bdf2b6f43b56a2d72593c03cc3b81c02af244c4ae1ecfd400e013f16552f7f494aacb5 SHA512 783085b083b8b5ba185962aa0a655d806163b471a7f0df54397360fc969f4d89a352596bb682c2bc56913b90c4b0bc77160a7f8dac7bef5519b71fb963a5e90b -EBUILD pillow-10.4.0.ebuild 3383 BLAKE2B b70406e4f80e4246214e3cbc31f1e6499e296485a66a2791b5c19c3d41eaf350650cf9e915a0d9f7b16e29cd4b0302484d3e14a7416b96bfc9766e5580c2bb49 SHA512 2f0f3047099050d5b09d7f329fed4427d1a387d3fd4a04a3b19409ec32f1add00de48787f92751fb2e3bdf89e34c374907b9325038442a5cf3849495a1649617 +DIST pillow-11.0.0.gh.tar.gz 46807844 BLAKE2B c91b92152d2f763fd20a74e2bddf413a669430074b8c5304b623ff63df177346ec4031e928fbc9765e1e0ca5f21cc101d5b7688a09dea19c5828f0cea02fe018 SHA512 0a74d7b12311acb3c9b39af87dc4e1e2ecae22134300a2a8c979daa3947a20f78bf77a93cd7f0029e98936a07e8d5e4fae826322fe0ccc1d1a8200350f9cbb7b +EBUILD pillow-10.2.0-r1.ebuild 3265 BLAKE2B 5a95a0777e9a5db4fc6f77a63292d489638241dce247d54fbe5deb0c2affff91dd7887646cdf92ac1d21eb89b302a0395dd35deecdc62cb6ce9d918d23b2ee1a SHA512 92b7156bbd9c3dc2ae5fb38e7ebd4fd20a1a784651d7fb32e798e70497d6aa4ea4acd8b2c8b0056488817b55459d22aa48937c0ba33da23b47167e50c436e4e9 +EBUILD pillow-10.3.0.ebuild 3453 BLAKE2B ca42e9e8ca086a04bacae7feddf787fc3c61670ab77bca49dbf9f8288e50e4537dc173f4df9515cad93c2fbce321379ef00862f80f987532bfeb232b3a4c2baa SHA512 9f2beda5c4276b9a4c62746c89cd89a90298baff6a9f1c432c0c576e435ab620e2025b0ddd56f649fdd1f663c57a9e6258187cfa3f237662b1d3b4bba43df090 +EBUILD pillow-10.4.0.ebuild 3376 BLAKE2B 7a97c501376a84236ef8cf1e5d128a20510a3ac0c8ee278241596bd2a67be08ba6a4d1512304d24a459dac15ba340ece49877936d5dc919cc6dc6cb417159f95 SHA512 54d5277fa23251448b9d0be74940e2b79d38e32e78a872e93c7f2d37752b0432e9752b7c88654651bbbf0cd712f3bec6ce0f82cf4775603376ba75bcb2151332 +EBUILD pillow-11.0.0-r1.ebuild 3714 BLAKE2B bd927d4da938b7df8da8abbbe5173ffbaa5de4466f55a9bcb51baf7920df17acbddef5d6c8dc23c5f89c302105b4fdddc87c1b09bf4d091df5c84c16bde596ac SHA512 1093baca5cc647df55bec38a7d0ae539cd90920ce291de29c9244553746c9b7b7f0b594d9ece0a27aec6d31226eb8605fa1a98746c182b7ed758abb4bc848e11 +EBUILD pillow-11.0.0.ebuild 3345 BLAKE2B fe43dbfff81caee000ee2881b890d09bf2306291bc7eedaad8241e938cdf4dd9a89b8469f4d2ed3cb484c6b4a0ae545cf147f876be2a96d19ad738d67b0e52bf SHA512 ab171a3740b758ccf9ede559d4d4cc59305d5d01be8473b1d0597fcf290bc5ac8cb53a22746412e8ad5acf83b9567fee93c1025bfa28287e3885475eee315e30 MISC metadata.xml 480 BLAKE2B 9fe5188b0a5eb4f19b53f34efad5c7da2ba086dd5eb9ed2e4fce8b6a6fac14d9a848392980cd1d2eaff5b334d7c5e39f58d60b763f44879d852dfb0b4f5e3efc SHA512 2b15d9e07b13a6028e87a3d5f0e72b2d252cfb2fa843783acfd2a9dd38bb6f0641f94d067f3a900fede445c606da361d509de2d4541513126b57c6782f69a5bb diff --git a/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch b/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch new file mode 100644 index 000000000000..3337b8c4be23 --- /dev/null +++ b/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch @@ -0,0 +1,32 @@ +From 180c1d1ef0c0ef12e0c56adfe10c7779dff3b55f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 3 Nov 2024 16:35:54 +0100 +Subject: [PATCH] Revert "Corrected passing TIFF_LONG to libtiff" + +This is the wrong solution to the problem at hand, and results +in passing an int64_t where libtiff expects uint32_t. This seems +to miraculously work on most of our platforms but it is clearly wrong, +and it breaks ppc32. + +Bug: https://github.com/python-pillow/Pillow/issues/8522 +Reverts: b1b0353d17bcdca99cfcb2ea48c6af7861fb43ba +--- + src/encode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/encode.c b/src/encode.c +index 1a4cd489d..ba350c39a 100644 +--- a/src/encode.c ++++ b/src/encode.c +@@ -929,7 +929,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { + ); + } else if (type == TIFF_LONG) { + status = ImagingLibTiffSetField( +- &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value) ++ &encoder->state, (ttag_t)key_int, (UINT32)PyLong_AsLong(value) + ); + } else if (type == TIFF_SSHORT) { + status = ImagingLibTiffSetField( +-- +2.47.0 + diff --git a/dev-python/pillow/pillow-10.2.0-r1.ebuild b/dev-python/pillow/pillow-10.2.0-r1.ebuild index 7c2640a4b324..c9d3ec32f1c5 100644 --- a/dev-python/pillow/pillow-10.2.0-r1.ebuild +++ b/dev-python/pillow/pillow-10.2.0-r1.ebuild @@ -28,7 +28,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 )" diff --git a/dev-python/pillow/pillow-10.3.0.ebuild b/dev-python/pillow/pillow-10.3.0.ebuild index d97803483ddb..81b77d909bc5 100644 --- a/dev-python/pillow/pillow-10.3.0.ebuild +++ b/dev-python/pillow/pillow-10.3.0.ebuild @@ -28,7 +28,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~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 )" diff --git a/dev-python/pillow/pillow-10.4.0.ebuild b/dev-python/pillow/pillow-10.4.0.ebuild index 379545ad4d09..4b882d2ca2df 100644 --- a/dev-python/pillow/pillow-10.4.0.ebuild +++ b/dev-python/pillow/pillow-10.4.0.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~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 )" diff --git a/dev-python/pillow/pillow-11.0.0-r1.ebuild b/dev-python/pillow/pillow-11.0.0-r1.ebuild new file mode 100644 index 000000000000..3ffd135f83db --- /dev/null +++ b/dev-python/pillow/pillow-11.0.0-r1.ebuild @@ -0,0 +1,149 @@ +# 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..13} 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 ~loong ~m68k ~mips 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? ( + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + || ( + media-gfx/imagemagick[png] + media-gfx/graphicsmagick[png] + ) + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +PATCHES=( + # https://github.com/python-pillow/pillow/pull/7634 + "${FILESDIR}/${PN}-10.2.0-cross.patch" + # https://github.com/python-pillow/Pillow/issues/8522 + "${FILESDIR}/${P}-wrong-arg.patch" +) + +usepil() { + usex "${1}" enable disable +} + +python_configure_all() { + cat >> setup.cfg <<-EOF || die + [build_ext] + debug = True + 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 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}" + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + # leak tests are fragile and broken under xdist + epytest -k "not leak" -p timeout || 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 +} diff --git a/dev-python/pillow/pillow-11.0.0.ebuild b/dev-python/pillow/pillow-11.0.0.ebuild new file mode 100644 index 000000000000..1545baf35679 --- /dev/null +++ b/dev-python/pillow/pillow-11.0.0.ebuild @@ -0,0 +1,136 @@ +# 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..13} 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 ~loong ~m68k ~mips ~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? ( + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + || ( + media-gfx/imagemagick[png] + media-gfx/graphicsmagick[png] + ) + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +PATCHES=( + # https://github.com/python-pillow/pillow/pull/7634 + "${FILESDIR}/${PN}-10.2.0-cross.patch" +) + +usepil() { + usex "${1}" enable disable +} + +python_configure_all() { + cat >> setup.cfg <<-EOF || die + [build_ext] + debug = True + 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 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 + ) + + "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + # leak tests are fragile and broken under xdist + epytest -k "not leak" -p timeout || 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 +} |