commit 439250aed57cbaae42b6d3156ecc6449af326066 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Nov 4 19:13:19 2017 +1100 python-pillow: 2.8.1 -> 4.3.0 diff --git a/python-pillow/.footprint b/python-pillow/.footprint index 1cd2fa99..021269e5 100644 --- a/python-pillow/.footprint +++ b/python-pillow/.footprint @@ -1,10 +1,17 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/pilconvert.py --rwxr-xr-x root/root usr/bin/pildriver.py --rwxr-xr-x root/root usr/bin/pilfile.py --rwxr-xr-x root/root usr/bin/pilfont.py --rwxr-xr-x root/root usr/bin/pilprint.py +-rwxr-xr-x root/root usr/bin/enhancer +-rwxr-xr-x root/root usr/bin/explode +-rwxr-xr-x root/root usr/bin/gifmaker +-rwxr-xr-x root/root usr/bin/painter +-rwxr-xr-x root/root usr/bin/pilconvert +-rwxr-xr-x root/root usr/bin/pildriver +-rwxr-xr-x root/root usr/bin/pilfile +-rwxr-xr-x root/root usr/bin/pilfont +-rwxr-xr-x root/root usr/bin/pilprint +-rwxr-xr-x root/root usr/bin/player +-rwxr-xr-x root/root usr/bin/thresholder +-rwxr-xr-x root/root usr/bin/viewer drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ @@ -21,6 +28,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/CurImagePlugin.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/DcxImagePlugin.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/DcxImagePlugin.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/DdsImagePlugin.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/DdsImagePlugin.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/EpsImagePlugin.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/EpsImagePlugin.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ExifTags.py @@ -33,6 +42,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/FontFile.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/FpxImagePlugin.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/FpxImagePlugin.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/FtexImagePlugin.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/FtexImagePlugin.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/GbrImagePlugin.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/GbrImagePlugin.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/GdImageFile.py @@ -69,8 +80,6 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageEnhance.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageFile.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageFile.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageFileIO.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageFileIO.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageFilter.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageFilter.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/ImageFont.py @@ -123,7 +132,6 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/MpoImagePlugin.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/MspImagePlugin.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/MspImagePlugin.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/OleFileIO-README.md -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/OleFileIO.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/OleFileIO.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/PSDraw.py @@ -181,14 +189,23 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/_binary.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/_binary.pyc -rwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/_imaging.so +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/_imagingcms.so -rwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/_imagingmath.so -rwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/_imagingmorph.so +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/_imagingtk.so +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/_tkinter_finder.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/_tkinter_finder.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/_util.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/_util.pyc -rwxr-xr-x root/root usr/lib/python2.7/site-packages/PIL/_webp.so -drwxr-xr-x root/root usr/lib/python2.7/site-packages/Pillow-2.8.1-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-2.8.1-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-2.8.1-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-2.8.1-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-2.8.1-py2.7.egg-info/top_level.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-2.8.1-py2.7.egg-info/zip-safe +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/features.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/features.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/version.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/PIL/version.pyc +drwxr-xr-x root/root usr/lib/python2.7/site-packages/Pillow-4.3.0-py2.7.egg-info/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-4.3.0-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-4.3.0-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-4.3.0-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-4.3.0-py2.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-4.3.0-py2.7.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Pillow-4.3.0-py2.7.egg-info/zip-safe diff --git a/python-pillow/.md5sum b/python-pillow/.md5sum index 391cc1f1..8be5b9c4 100644 --- a/python-pillow/.md5sum +++ b/python-pillow/.md5sum @@ -1 +1,2 @@ -fb62af4625179f5316241772ae30c4b7 Pillow-2.8.1.tar.gz +7fdd2b8fe34dd6d97aae01bac3d0f575 Pillow-4.3.0.tar.gz +96877da43524fdab2c367541da547d2b Sane-v2.8.3.tar.gz diff --git a/python-pillow/.signature b/python-pillow/.signature index 1dbab884..fba803a4 100644 --- a/python-pillow/.signature +++ b/python-pillow/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36SbP1YianGdT3bHWGEpz0v3Ax6wY9OdqWJAnUvMC0ZBSsl7n+jdjB+CD3FDhm8MmFn4hH2tUf1vgA3dQb8g6go= -SHA256 (Pkgfile) = 26d63939ed6af66ab9b5509350454c65c9e25652fa76c2c37783eced6e123ab0 -SHA256 (.footprint) = 5b1c22be86f7766a5e209ae83c9a98c4f625b8e7006b4bb1913419ac3b3e1ac9 -SHA256 (Pillow-2.8.1.tar.gz) = 8760c118a0215eba163f7782110e7efcdbb15f8a7321f3f61c5ac0dbbb12c996 +RWSagIOpLGJF33zG7h/kqSkmCui77zTm7X2BW43KhHLe1DClPxxQvq7j3jgOCCjmLqURN5VPXUvUndbTy4hEgxXxs9UDYKpRnwg= +SHA256 (Pkgfile) = 35395b46cc70b4a63306ec4433bc0773106e8c46cef0ab9d24267f4bab57d403 +SHA256 (.footprint) = 98908d75c9c3816a5afe2d346a8dab5c68bf28c890d078c64f35d599efcecb66 +SHA256 (Pillow-4.3.0.tar.gz) = a7bd05a7a0d260c17e60fffa2d9f23ba977e01e98c65b7953163de90e0e102d3 +SHA256 (Sane-v2.8.3.tar.gz) = 1c3aa1c246007e9e6f7b11ca2c98256ebefed66f4ff13dcf38179c721677022f diff --git a/python-pillow/Pkgfile b/python-pillow/Pkgfile index 8d7791fc..897c2876 100644 --- a/python-pillow/Pkgfile +++ b/python-pillow/Pkgfile @@ -1,16 +1,38 @@ # Description: Python Imaging Library (PIL) fork. # URL: http://python-pillow.github.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me -# Depends on: python-setuptools lcms libwebp +# Depends on: lcms2 libwebp python-setuptools +# Optional: sane -name=pillow -version=2.8.1 +name=python-pillow +version=4.3.0 +_saneversion=2.8.3 release=1 -source=(https://pypi.python.org/packages/source/P/Pillow/Pillow-$version.tar.gz) +source=(https://github.com/python-pillow/Pillow/archive/$version/Pillow-$version.tar... + https://github.com/python-pillow/Sane/archive/v$_saneversion/Sane-v$_sanever...) build() { + # allow sane to build + sed -i -e "s|os.path.join|'../libImaging', &|" "$SRC/Sane-$_saneversion/setup.py" + cp -r "$SRC/Sane-$_saneversion" "$SRC/Pillow-$version/Sane" + cd Pillow-$version /usr/bin/python setup.py build /usr/bin/python setup.py install --root=$PKG --optimize=0 + + if pkg-config --exists sane-backends; then + cd Sane + /usr/bin/python setup.py build + /usr/bin/python setup.py install --root=$PKG --optimize=0 + cd - + + install -d -m 0755 "$PKG/usr/include/python2.7/" + install -m 0644 -t "$PKG/usr/include/python2.7/" libImaging/*.h + fi + + # clean up bins + cd $PKG/usr/bin + for f in *.py; do + mv "$f" "${f%.py}" + done }