[147383] trunk/dports/python/py-Pillow
stromnov at macports.org
stromnov at macports.org
Sat Apr 2 14:54:41 PDT 2016
Revision: 147383
https://trac.macports.org/changeset/147383
Author: stromnov at macports.org
Date: 2016-04-02 14:54:41 -0700 (Sat, 02 Apr 2016)
Log Message:
-----------
py-Pillow: update to version 3.2.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 2016-04-02 21:42:43 UTC (rev 147382)
+++ trunk/dports/python/py-Pillow/Portfile 2016-04-02 21:54:41 UTC (rev 147383)
@@ -5,7 +5,7 @@
PortGroup python 1.0
name py-Pillow
-version 3.1.1
+version 3.2.0
revision 0
categories-append devel
platforms darwin
@@ -24,8 +24,8 @@
distname Pillow-${version}
-checksums rmd160 4825d86f16fd073583e19eaef473af83340d4c06 \
- sha256 486f4ccddee09429cb1c63ea56c02894aecf9d69acdcaf006c53835df2549fff
+checksums rmd160 939da559db631891347adbeb27c81b531b9dd602 \
+ sha256 64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a
if {${name} ne ${subport}} {
conflicts py${python.version}-pil
Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-Pillow/files/patch-setup.py.diff 2016-04-02 21:42:43 UTC (rev 147382)
+++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff 2016-04-02 21:54:41 UTC (rev 147383)
@@ -1,7 +1,7 @@
---- setup.py.orig 2015-10-01 18:27:21.000000000 +0300
-+++ setup.py 2015-10-04 23:38:00.000000000 +0300
-@@ -201,44 +201,8 @@
- "/usr/lib", "python%s" % sys.version[:3], "config"))
+--- setup.py.orig 2016-04-01 16:10:57.000000000 +0300
++++ setup.py 2016-04-03 00:45:49.000000000 +0300
+@@ -197,43 +197,9 @@
+ sys.version[:3], "config"))
elif sys.platform == "darwin":
- # attempt to make sure we pick freetype2 over other versions
@@ -10,16 +10,15 @@
- # fink installation directories
- _add_directory(library_dirs, "/sw/lib")
- _add_directory(include_dirs, "/sw/include")
-- # darwin ports installation directories
+ # 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
- import subprocess
- try:
-- prefix = subprocess.check_output(
-- ['brew', '--prefix']
-- ).strip().decode('latin1')
+- prefix = subprocess.check_output(['brew', '--prefix']).strip(
+- ).decode('latin1')
- except:
- # Homebrew not installed
- prefix = None
@@ -35,8 +34,8 @@
- 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'))
+- _add_directory(include_dirs,
+- os.path.join(ft_prefix, 'include'))
- else:
- # fall back to freetype from XQuartz if
- # Homebrew's freetype is missing
@@ -47,7 +46,7 @@
elif sys.platform.startswith("linux"):
arch_tp = (plat.processor(), plat.architecture()[0])
-@@ -341,21 +305,6 @@
+@@ -343,21 +309,6 @@
else:
TCL_ROOT = None
@@ -69,16 +68,16 @@
# on Windows, look for the OpenJPEG libraries in the location that
# the official installer puts them
if sys.platform == "win32":
-@@ -580,32 +529,9 @@
- "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
+@@ -580,32 +531,9 @@
+ define_macros=defs))
if feature.tcl and feature.tk:
- if sys.platform == "darwin":
- # locate Tcl/Tk frameworks
- frameworks = []
- framework_roots = [
-- "/Library/Frameworks",
-- "/System/Library/Frameworks"]
+- "/Library/Frameworks", "/System/Library/Frameworks"
+- ]
- for root in framework_roots:
- root_tcl = os.path.join(root, "Tcl.framework")
- root_tk = os.path.join(root, "Tk.framework")
@@ -91,17 +90,17 @@
- _add_directory(self.compiler.include_dirs, dir, 1)
- break
- if frameworks:
-- exts.append(Extension(
-- "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-- extra_compile_args=frameworks,
-- extra_link_args=frameworks))
+- exts.append(Extension("PIL._imagingtk",
+- ["_imagingtk.c", "Tk/tkImaging.c"],
+- extra_compile_args=frameworks,
+- extra_link_args=frameworks))
- else:
-- exts.append(Extension(
-- "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-- libraries=[feature.tcl, feature.tk]))
-+ exts.append(Extension(
-+ "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-+ libraries=[feature.tcl, feature.tk]))
+- exts.append(Extension("PIL._imagingtk",
+- ["_imagingtk.c", "Tk/tkImaging.c"],
+- libraries=[feature.tcl, feature.tk]))
++ exts.append(Extension("PIL._imagingtk",
++ ["_imagingtk.c", "Tk/tkImaging.c"],
++ libraries=[feature.tcl, feature.tk]))
if os.path.isfile("_imagingmath.c"):
exts.append(Extension("PIL._imagingmath", ["_imagingmath.c"]))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160402/25c0049d/attachment.html>
More information about the macports-changes
mailing list