CVS commit: pkgsrc/graphics/py-Pillow

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jan 12 19:50:52 UTC 2018

Modified Files:
        pkgsrc/graphics/py-Pillow: distinfo
Added Files:
        pkgsrc/graphics/py-Pillow/patches: patch-src_libImaging_ImagingUtils.h

Log Message:
py-Pillow: disable wrong hack for GCC <4.9


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/py-Pillow/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.

Modified files:

Index: pkgsrc/graphics/py-Pillow/distinfo
diff -u pkgsrc/graphics/py-Pillow/distinfo:1.29 pkgsrc/graphics/py-Pillow/distinfo:1.30
--- pkgsrc/graphics/py-Pillow/distinfo:1.29     Thu Jan  4 20:59:49 2018
+++ pkgsrc/graphics/py-Pillow/distinfo  Fri Jan 12 19:50:52 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.29 2018/01/04 20:59:49 adam Exp $
+$NetBSD: distinfo,v 1.30 2018/01/12 19:50:52 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 (patch-setup.py) = 742b6c24b49e1f797b0e012ee7e094f35f60740f
+SHA1 (patch-src_libImaging_ImagingUtils.h) = 72b191be439c05b74c278109f1afc6066e5dbad6

Added files:

Index: pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h
diff -u /dev/null pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h:1.1
--- /dev/null   Fri Jan 12 19:50:52 2018
+++ pkgsrc/graphics/py-Pillow/patches/patch-src_libImaging_ImagingUtils.h       Fri Jan 12 19:50:52 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_libImaging_ImagingUtils.h,v 1.1 2018/01/12 19:50:52 adam Exp $
+
+Disable the work around; it does not really work.
+
+--- src/libImaging/ImagingUtils.h.orig 2018-01-12 19:46:54.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;
+-    __asm__("xorps %0, %0; cvtsi2ss %1, %0" : "=X"(x) : "r"(v) );
+-    return x;
+-}
+-#else
+ static float inline _i2f(int v) { return (float) v; }
+-#endif