diff --git a/dev-python/pillow/licenses/HPND b/dev-python/pillow/licenses/HPND index 973b30e63..40aabc323 100644 --- a/dev-python/pillow/licenses/HPND +++ b/dev-python/pillow/licenses/HPND @@ -1,25 +1,30 @@ -Historical Permission Notice and Disclaimer -http://opensource.org/licenses/HPND +The Python Imaging Library (PIL) is ---- + Copyright © 1997-2011 by Secret Labs AB + Copyright © 1995-2011 by Fredrik Lundh - +Pillow is the friendly PIL fork. It is -Permission to use, copy, modify and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies[,] -[and] that both [that] [the] copyright notice and this permission -notice appear in supporting documentation[, and that the name [of] - [or ] not be used in advertising -or publicity pertaining to distribution of the software without -specific, written prior permission]. [ makes -no representations about the suitability of this software for any -purpose. It is provided "as is" without express or implied warranty.] + Copyright © 2010-2022 by Alex Clark and contributors -[ DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS[,][.] IN NO EVENT SHALL BE LIABLE FOR ANY -SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.] +Like PIL, Pillow is licensed under the open source HPND License: + +By obtaining, using, and/or copying this software and/or its associated +documentation, you agree that you have read, understood, and will comply +with the following terms and conditions: + +Permission to use, copy, modify, and distribute this software and its +associated documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appears in all copies, and that +both that copyright notice and this permission notice appear in supporting +documentation, and that the name of Secret Labs AB or the author not be +used in advertising or publicity pertaining to distribution of the software +without specific, written prior permission. + +SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. +IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, +INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/dev-python/pillow/pillow-6.2.1.recipe b/dev-python/pillow/pillow-9.2.0.recipe similarity index 82% rename from dev-python/pillow/pillow-6.2.1.recipe rename to dev-python/pillow/pillow-9.2.0.recipe index a78ef4d18..f1e536012 100644 --- a/dev-python/pillow/pillow-6.2.1.recipe +++ b/dev-python/pillow/pillow-9.2.0.recipe @@ -4,11 +4,12 @@ PIL is the Python Imaging Library by Fredrik Lundh and Contributors." HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow" COPYRIGHT="1997-2011 by Secret Labs AB - 1995-2011 by Fredrik Lundh" + 1995-2011 by Fredrik Lundh + 2010-2022 by Alex Clark and contributors" LICENSE="HPND" -REVISION="4" +REVISION="1" SOURCE_URI="https://github.com/python-pillow/Pillow/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="7bf2d6bdb68fa6ccec15c0fd9aa20fac9641cd20dc6079344f5a6534e13a70f9" +CHECKSUM_SHA256="95836f00972dbf724bf1270178683a0ac4ea23c6c3a980858fc9f2f9456e32ef" SOURCE_FILENAME="pillow-$portVersion.tar.gz" SOURCE_DIR="Pillow-$portVersion" @@ -26,6 +27,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liblcms2$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix + devel:libimagequant$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libopenjp2$secondaryArchSuffix devel:libtiff$secondaryArchSuffix @@ -38,8 +40,8 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PYTHON_PACKAGES=(python python3 python38 python39) -PYTHON_VERSIONS=(2.7 3.7 3.8 3.9) +PYTHON_PACKAGES=(python3 python38 python39 python310) +PYTHON_VERSIONS=(3.7 3.8 3.9 3.10) for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} pythonVersion=${PYTHON_VERSIONS[$i]} @@ -51,12 +53,18 @@ REQUIRES_$pythonPackage=\"\ cmd:python$pythonVersion\n\ lib:liblcms2$secondaryArchSuffix\n\ lib:libfreetype$secondaryArchSuffix\n\ + lib:libimagequant$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix\n\ lib:libopenjp2$secondaryArchSuffix\n\ lib:libtiff$secondaryArchSuffix\n\ lib:libwebp$secondaryArchSuffix\n\ lib:libz$secondaryArchSuffix\n\ \"" +if [ "$targetArchitecture" = "x86_gcc2" ]; then + eval "PROVIDES_${pythonPackage}+=\"\n\ + projectx_$pythonPackage = $portVersion\ + \"" +fi BUILD_REQUIRES="$BUILD_REQUIRES setuptools_$pythonPackage" BUILD_PREREQUIRES="$BUILD_PREREQUIRES