Received: by mail.netbsd.org (Postfix, from userid 605) id 7F9EB84D65; Tue, 3 Apr 2018 09:24:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7405184CD9 for ; Tue, 3 Apr 2018 09:24:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id WuPw4gcTidak for ; Tue, 3 Apr 2018 09:24:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 417DA84C71 for ; Tue, 3 Apr 2018 09:24:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3AEC9FBEC; Tue, 3 Apr 2018 09:24:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1522747460142990" MIME-Version: 1.0 Date: Tue, 3 Apr 2018 09:24:20 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/graphics/py-Pillow To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180403092420.3AEC9FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1522747460142990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Apr 3 09:24:20 UTC 2018 Modified Files: pkgsrc/graphics/py-Pillow: Makefile PLIST distinfo pkgsrc/graphics/py-Pillow/patches: patch-src_libImaging_ImagingUtils.h Log Message: py-Pillow: updated to 5.1.0 5.1.0: Close fp before return in ImagingSavePPM Added documentation for ICNS append_images Docs: Move intro text below its header CI: Rename appveyor.yml as .appveyor.yml Fix TypeError for JPEG2000 parser feed Certain corrupted jpegs can result in no data read Add support for BLP file format Simplify version checks Fix "invalid escape sequence" warning on Python 3.6+ Allow append_images to set .icns scaled images Support appending to existing PDFs Fix and improve efficient saving of ICNS on macOS Build: Enable pip cache in AppVeyor build Trim trailing whitespace Docs: Correct reference to Image.new method Rearrange ImageFilter classes into alphabetical order Test: Remove duplicate line Build: Update AppVeyor PyPy version Tiff: Open 8 bit Tiffs with 5 or 6 channels, discarding extra channels Readme: Added Twitter badge Removed __main__ code from ImageCms Test: Changed assert statements to unittest calls Depends: Update libimagequant to 2.11.10, raqm to 0.5.0, freetype to 2.9 Remove _imaging.crc32 in favor of builtin Python crc32 implementation Move Tk directory to src directory Enable pip cache in Travis CI Remove unused and duplicate imports Docs: Changed documentation references to 2.x to 2.7 Fix memory leak when opening webp files Setup: Fix "TypeError: 'NoneType' object is not iterable" for PPC and CRUX Setup: Add libdirs for ppc64le and armv7l To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/py-Pillow/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/py-Pillow/PLIST cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/py-Pillow/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1522747460142990 Content-Disposition: inline Content-Length: 5597 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/py-Pillow/Makefile diff -u pkgsrc/graphics/py-Pillow/Makefile:1.38 pkgsrc/graphics/py-Pillow/Makefile:1.39 --- pkgsrc/graphics/py-Pillow/Makefile:1.38 Thu Jan 4 20:59:49 2018 +++ pkgsrc/graphics/py-Pillow/Makefile Tue Apr 3 09:24:19 2018 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.38 2018/01/04 20:59:49 adam Exp $ +# $NetBSD: Makefile,v 1.39 2018/04/03 09:24:19 adam Exp $ -DISTNAME= Pillow-5.0.0 +DISTNAME= Pillow-5.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=P/Pillow/} @@ -15,8 +15,8 @@ USE_TOOLS+= pkg-config CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* DEPENDS+= ${PYPKGPREFIX}-olefile-[0-9]*:../../devel/py-olefile -BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test -BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner +TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test +TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" Index: pkgsrc/graphics/py-Pillow/PLIST diff -u pkgsrc/graphics/py-Pillow/PLIST:1.13 pkgsrc/graphics/py-Pillow/PLIST:1.14 --- pkgsrc/graphics/py-Pillow/PLIST:1.13 Thu Jan 4 20:59:49 2018 +++ pkgsrc/graphics/py-Pillow/PLIST Tue Apr 3 09:24:19 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2018/01/04 20:59:49 adam Exp $ +@comment $NetBSD: PLIST,v 1.14 2018/04/03 09:24:19 adam Exp $ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt @@ -7,6 +7,9 @@ ${PYSITELIB}/${EGG_INFODIR}/zip-safe ${PYSITELIB}/PIL/BdfFontFile.py ${PYSITELIB}/PIL/BdfFontFile.pyc ${PYSITELIB}/PIL/BdfFontFile.pyo +${PYSITELIB}/PIL/BlpImagePlugin.py +${PYSITELIB}/PIL/BlpImagePlugin.pyc +${PYSITELIB}/PIL/BlpImagePlugin.pyo ${PYSITELIB}/PIL/BmpImagePlugin.py ${PYSITELIB}/PIL/BmpImagePlugin.pyc ${PYSITELIB}/PIL/BmpImagePlugin.pyo @@ -202,6 +205,9 @@ ${PYSITELIB}/PIL/PcxImagePlugin.pyo ${PYSITELIB}/PIL/PdfImagePlugin.py ${PYSITELIB}/PIL/PdfImagePlugin.pyc ${PYSITELIB}/PIL/PdfImagePlugin.pyo +${PYSITELIB}/PIL/PdfParser.py +${PYSITELIB}/PIL/PdfParser.pyc +${PYSITELIB}/PIL/PdfParser.pyo ${PYSITELIB}/PIL/PixarImagePlugin.py ${PYSITELIB}/PIL/PixarImagePlugin.pyc ${PYSITELIB}/PIL/PixarImagePlugin.pyo Index: pkgsrc/graphics/py-Pillow/distinfo diff -u pkgsrc/graphics/py-Pillow/distinfo:1.31 pkgsrc/graphics/py-Pillow/distinfo:1.32 --- pkgsrc/graphics/py-Pillow/distinfo:1.31 Sat Mar 31 16:22:10 2018 +++ pkgsrc/graphics/py-Pillow/distinfo Tue Apr 3 09:24:19 2018 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.31 2018/03/31 16:22:10 adam Exp $ +$NetBSD: distinfo,v 1.32 2018/04/03 09:24:19 adam Exp $ -SHA1 (Pillow-5.0.0.tar.gz) = 595b035920996d43dcdb4164ac45cd9f30e653f1 -RMD160 (Pillow-5.0.0.tar.gz) = 0f88642e5b38a464682828ac0857822223546b5c -SHA512 (Pillow-5.0.0.tar.gz) = f6f1e138effe44a89897f48032a36406dab3c4ddff2a97b7d01e99c05865abad5cffa3ab0eefcacb243e422778063b49243b1a538012fe9c39a1e4329c0978f3 -Size (Pillow-5.0.0.tar.gz) = 14220993 bytes +SHA1 (Pillow-5.1.0.tar.gz) = aaa04f180d05a4b5d8e4eda234d75ae904bab46f +RMD160 (Pillow-5.1.0.tar.gz) = 300e2626b33b803b7bb6a553a15c5beab82922ea +SHA512 (Pillow-5.1.0.tar.gz) = 1e1d5f12054e2f3befa8dafef2551eb75dfefc06944a528638a1686ebc480b52edfc3eaa9964d687816caf003314ad1fc4891d7379cd92e41fbf4b3cbddd1cb9 +Size (Pillow-5.1.0.tar.gz) = 14286366 bytes SHA1 (patch-setup.py) = 14ab443eef8b53481d2610830533fbb988688bf6 -SHA1 (patch-src_libImaging_ImagingUtils.h) = 72b191be439c05b74c278109f1afc6066e5dbad6 +SHA1 (patch-src_libImaging_ImagingUtils.h) = 313a553db9e0774525c55281dfa4e784ab62b099 Index: pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h diff -u pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h:1.1 pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h:1.2 --- pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h:1.1 Fri Jan 12 19:50:52 2018 +++ pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h Tue Apr 3 09:24:20 2018 @@ -1,23 +1,15 @@ -$NetBSD: patch-src_libImaging_ImagingUtils.h,v 1.1 2018/01/12 19:50:52 adam Exp $ +$NetBSD: patch-src_libImaging_ImagingUtils.h,v 1.2 2018/04/03 09:24:20 adam Exp $ -Disable the work around; it does not really work. +Fix building with GCC 4.x; https://github.com/python-pillow/Pillow/issues/2956 ---- src/libImaging/ImagingUtils.h.orig 2018-01-12 19:46:54.000000000 +0000 +--- src/libImaging/ImagingUtils.h.orig 2018-01-01 21:04:32.000000000 +0000 +++ src/libImaging/ImagingUtils.h -@@ -30,16 +30,4 @@ - (MULDIV255(in1, (255 - mask), tmp1) + in2) - - --/* This is to work around a bug in GCC prior 4.9 in 64 bit mode. -- GCC generates code with partial dependency which is 3 times slower. -- See: http://stackoverflow.com/a/26588074/253146 */ --#if defined(__x86_64__) && defined(__SSE__) && ! defined(__NO_INLINE__) && \ -- ! defined(__clang__) && defined(GCC_VERSION) && (GCC_VERSION < 40900) --static float __attribute__((always_inline)) inline _i2f(int v) { -- float x; +@@ -37,7 +37,7 @@ + ! defined(__clang__) && defined(GCC_VERSION) && (GCC_VERSION < 40900) + static float __attribute__((always_inline)) inline _i2f(int v) { + float x; - __asm__("xorps %0, %0; cvtsi2ss %1, %0" : "=X"(x) : "r"(v) ); -- return x; --} --#else - static float inline _i2f(int v) { return (float) v; } --#endif ++ __asm__("xorps %0, %0; cvtsi2ss %1, %0" : "=x"(x) : "r"(v) ); + return x; + } + #else --_----------=_1522747460142990--