Merge branch 'master' into libpng1632

This commit is contained in:
Hugo 2018-05-09 23:02:47 +03:00 committed by GitHub
commit 93c9c81fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 5 deletions

View File

@ -17,7 +17,7 @@ python: 3.5
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
osx_image: xcode9.2 osx_image: xcode6.4
matrix: matrix:
exclude: exclude:

2
Pillow

@ -1 +1 @@
Subproject commit 0b578f25d54a86884c87b5e1cb0d3a14d3dfc747 Subproject commit fda33d5c09142c4bb0e99964919d01c2cc5f5995

Binary file not shown.

Binary file not shown.

View File

@ -2,14 +2,14 @@
# Test for OSX with [ -n "$IS_OSX" ] # Test for OSX with [ -n "$IS_OSX" ]
# Package versions for fresh source builds # Package versions for fresh source builds
FREETYPE_VERSION=2.9 FREETYPE_VERSION=2.9.1
LIBPNG_VERSION=1.6.32 LIBPNG_VERSION=1.6.32
ZLIB_VERSION=1.2.11 ZLIB_VERSION=1.2.11
JPEG_VERSION=9b JPEG_VERSION=9b
OPENJPEG_VERSION=2.1 OPENJPEG_VERSION=2.1
TIFF_VERSION=4.0.9 TIFF_VERSION=4.0.9
LCMS2_VERSION=2.9 LCMS2_VERSION=2.9
LIBWEBP_VERSION=0.6.1 LIBWEBP_VERSION=1.0.0
function pre_build { function pre_build {
# Any stuff that you need to do before you start building the wheels # Any stuff that you need to do before you start building the wheels

@ -1 +1 @@
Subproject commit cba6a4228b28922799fde42e8a19833b81016816 Subproject commit ae3e559829d34a74c706baa9389a101e52d8e2d0