Merge 03cd0a0a83 into fda33d5c09

CHANGES.rst

@@ -2,6 +2,15 @@
 Changelog (Pillow)
 ==================
 
+5.1.1 (2018-04-12)
+------------------
+
+- Fix _i2f compilation on some GCC versions #3067
+  [homm]
+
+- Build macOS wheels with Xcode 6.4, supporting older macOS versions #3068
+  [wiredfool]
+
 5.1.0 (2018-04-02)
 ------------------
 

docs/handbook/overview.rst

@@ -27,7 +27,7 @@ presentation formats.
 Image Display
 -------------
 
-The current release includes Tk :py:class:`~PIL.ImageTk.PhotoImage` and
+The current release includes :py:class:`~PIL.ImageTk.PhotoImage` and
 :py:class:`~PIL.ImageTk.BitmapImage` interfaces, as well as a :py:mod:`Windows
 DIB interface <PIL.ImageWin>` that can be used with PythonWin and other
 Windows-based toolkits. Many other GUI toolkits come with some kind of PIL

docs/releasenotes/5.1.1.rst

@@ -0,0 +1,18 @@
+5.1.1
+-----
+
+Build macOS wheels with Xcode 6.4, supporting older macOS versions
+==================================================================
+
+The macOS wheels for Pillow 5.1.0 were built with Xcode 9.2, meaning 10.12
+Sierra was the lowest supported version.
+
+Prior to Pillow 5.1.0, Xcode 8 was used, supporting El Capitan 10.11.
+
+Instead, Pillow 5.1.1 is built with the oldest available Xcode 6.4 to support
+at least 10.10 Yosemite.
+
+Fix _i2f compilation with some GCC versions
+===========================================
+
+For example, this allows compilation with GCC 4.8 on NetBSD.

docs/releasenotes/index.rst

@@ -6,6 +6,7 @@ Release Notes
 .. toctree::
   :maxdepth: 2
 
+  5.1.1
   5.1.0
   5.0.0
   4.3.0

src/PIL/version.py

@@ -1,2 +1,2 @@
 # Master version for Pillow
-__version__ = '5.1.0'
+__version__ = '5.1.1'

src/libImaging/ImagingUtils.h

@@ -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) );
+    __asm__("xorps %0, %0; cvtsi2ss %1, %0" : "=x"(x) : "r"(v) );
     return x;
 }
 #else