[121715] trunk/dports/python/py-Pillow
stromnov at macports.org
stromnov at macports.org
Fri Jul 4 16:04:28 PDT 2014
Revision: 121715
https://trac.macports.org/changeset/121715
Author: stromnov at macports.org
Date: 2014-07-04 16:04:28 -0700 (Fri, 04 Jul 2014)
Log Message:
-----------
py-Pillow: update to version 2.5.0
Modified Paths:
--------------
trunk/dports/python/py-Pillow/Portfile
trunk/dports/python/py-Pillow/files/patch-setup.py.diff
Modified: trunk/dports/python/py-Pillow/Portfile
===================================================================
--- trunk/dports/python/py-Pillow/Portfile 2014-07-04 22:54:25 UTC (rev 121714)
+++ trunk/dports/python/py-Pillow/Portfile 2014-07-04 23:04:28 UTC (rev 121715)
@@ -5,8 +5,8 @@
PortGroup python 1.0
name py-Pillow
-version 2.4.0
-revision 1
+version 2.5.0
+revision 0
categories-append devel
platforms darwin
license BSD
@@ -24,13 +24,13 @@
distname Pillow-${version}
-checksums rmd160 2692fee280a9abc595ebbb8df6d6a73f5c83667a \
- sha256 2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a
+checksums rmd160 d962dbf1664b3c21a68ee82b2d7da9c0a9489e55 \
+ sha256 32776f3782d5321dc2720a7cc01497c47ffa4d0e07e7f762d8d9bc2d4e2e9d95
if {${name} ne ${subport}} {
use_zip yes
- conflicts py${python.version}-pil
+ conflicts py${python.version}-pil
depends_build port:py${python.version}-setuptools
depends_lib-append port:py${python.version}-tkinter \
@@ -48,8 +48,6 @@
reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py
}
- #build.args-append --enable-zlib
-
livecheck.type none
} else {
livecheck.type regex
Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-Pillow/files/patch-setup.py.diff 2014-07-04 22:54:25 UTC (rev 121714)
+++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff 2014-07-04 23:04:28 UTC (rev 121715)
@@ -1,6 +1,15 @@
---- setup.py.orig 2014-04-01 18:21:44.000000000 +0400
-+++ setup.py 2014-04-02 12:16:12.000000000 +0400
-@@ -196,34 +196,8 @@
+--- setup.py.orig 2014-07-04 17:25:36.000000000 +0200
++++ setup.py 2014-07-04 17:33:05.000000000 +0200
+@@ -19,7 +19,7 @@
+ from setuptools import Extension, setup, find_packages
+
+ # monkey patch import hook. Even though flake8 says it's not used, it is.
+-# comment this out to disable multi threaded builds.
++# comment this out to disable multi threaded builds.
+ import mp_compile
+
+ _IMAGING = (
+@@ -200,44 +200,8 @@
"/usr/lib", "python%s" % sys.version[:3], "config"))
elif sys.platform == "darwin":
@@ -13,31 +22,41 @@
- # darwin ports installation directories
- _add_directory(library_dirs, "/opt/local/lib")
- _add_directory(include_dirs, "/opt/local/include")
--
-- # if homebrew is installed, use its lib and include directories
+-
+- # if Homebrew is installed, use its lib and include directories
- import subprocess
- try:
-- prefix = subprocess.check_output(['brew', '--prefix'])
-- if prefix:
-- prefix = prefix.strip()
-- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
-- _add_directory(include_dirs, os.path.join(prefix, 'include'))
--
-- # freetype2 is a key-only brew under opt/
-- _add_directory(library_dirs, os.path.join(prefix, 'opt', 'freetype', 'lib'))
-- _add_directory(include_dirs, os.path.join(prefix, 'opt', 'freetype', 'include'))
+- prefix = subprocess.check_output(
+- ['brew', '--prefix']
+- ).strip().decode('latin1')
- except:
-- pass # homebrew not installed
--
-- # freetype2 ships with X11 (after homebrew, so that homebrew freetype is preferred)
-- _add_directory(library_dirs, "/usr/X11/lib")
-- _add_directory(include_dirs, "/usr/X11/include")
+- # Homebrew not installed
+- prefix = None
+-
+- ft_prefix = None
+-
+- if prefix:
+- # add Homebrew's include and lib directories
+- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
+- _add_directory(include_dirs, os.path.join(prefix, 'include'))
+- ft_prefix = os.path.join(prefix, 'opt', 'freetype')
+-
+- if ft_prefix and os.path.isdir(ft_prefix):
+- # freetype might not be linked into Homebrew's prefix
+- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
+- _add_directory(
+- include_dirs, os.path.join(ft_prefix, 'include'))
+- else:
+- # fall back to freetype from XQuartz if
+- # Homebrew's freetype is missing
+- _add_directory(library_dirs, "/usr/X11/lib")
+- _add_directory(include_dirs, "/usr/X11/include")
+ _add_directory(library_dirs, "@prefix@/lib")
+ _add_directory(include_dirs, "@prefix@/include")
elif sys.platform.startswith("linux"):
arch_tp = (plat.processor(), plat.architecture()[0])
-@@ -315,21 +289,6 @@
+@@ -337,21 +301,6 @@
else:
TCL_ROOT = None
@@ -57,9 +76,18 @@
- _add_directory(include_dirs, "/usr/include")
-
# on Windows, look for the OpenJPEG libraries in the location that
- # the official installed puts them
+ # the official installer puts them
if sys.platform == "win32":
-@@ -507,29 +466,7 @@
+@@ -410,7 +359,7 @@
+ for directory in self.compiler.include_dirs:
+ try:
+ listdir = os.listdir(directory)
+- except Exception:
++ except Exception:
+ # WindowsError, FileNotFoundError
+ continue
+ for name in listdir:
+@@ -570,29 +519,7 @@
exts.append(Extension(
"PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140704/43004d21/attachment.html>
More information about the macports-changes
mailing list