Changeset 121715


Ignore:
Timestamp:
Jul 4, 2014, 11:04:28 PM (4 years ago)
Author:
stromnov@…
Message:

py-Pillow: update to version 2.5.0

Location:
trunk/dports/python/py-Pillow
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/python/py-Pillow/Portfile

    r119847 r121715  
    66
    77name                py-Pillow
    8 version             2.4.0
    9 revision            1
     8version             2.5.0
     9revision            0
    1010categories-append   devel
    1111platforms           darwin
     
    2525distname            Pillow-${version}
    2626
    27 checksums           rmd160  2692fee280a9abc595ebbb8df6d6a73f5c83667a \
    28                     sha256  2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a
     27checksums           rmd160  d962dbf1664b3c21a68ee82b2d7da9c0a9489e55 \
     28                    sha256  32776f3782d5321dc2720a7cc01497c47ffa4d0e07e7f762d8d9bc2d4e2e9d95
    2929
    3030if {${name} ne ${subport}} {
    3131    use_zip             yes
    3232
    33     conflicts       py${python.version}-pil
     33    conflicts           py${python.version}-pil
    3434
    3535    depends_build       port:py${python.version}-setuptools
     
    4949    }
    5050
    51     #build.args-append   --enable-zlib
    52 
    5351    livecheck.type      none
    5452} else {
  • trunk/dports/python/py-Pillow/files/patch-setup.py.diff

    r118430 r121715  
    1 --- setup.py.orig       2014-04-01 18:21:44.000000000 +0400
    2 +++ setup.py    2014-04-02 12:16:12.000000000 +0400
    3 @@ -196,34 +196,8 @@
     1--- setup.py.orig       2014-07-04 17:25:36.000000000 +0200
     2+++ setup.py    2014-07-04 17:33:05.000000000 +0200
     3@@ -19,7 +19,7 @@
     4 from setuptools import Extension, setup, find_packages
     5 
     6 # monkey patch import hook. Even though flake8 says it's not used, it is.
     7-# comment this out to disable multi threaded builds.
     8+# comment this out to disable multi threaded builds.
     9 import mp_compile
     10 
     11 _IMAGING = (
     12@@ -200,44 +200,8 @@
    413                 "/usr/lib", "python%s" % sys.version[:3], "config"))
    514 
     
    1423-            _add_directory(library_dirs, "/opt/local/lib")
    1524-            _add_directory(include_dirs, "/opt/local/include")
    16 -           
    17 -            # if homebrew is installed, use its lib and include directories
     25-
     26-            # if Homebrew is installed, use its lib and include directories
    1827-            import subprocess
    1928-            try:
    20 -                prefix = subprocess.check_output(['brew', '--prefix'])
    21 -                if prefix:
    22 -                    prefix = prefix.strip()
    23 -                    _add_directory(library_dirs, os.path.join(prefix, 'lib'))
    24 -                    _add_directory(include_dirs, os.path.join(prefix, 'include'))
    25 -                   
    26 -                    # freetype2 is a key-only brew under opt/
    27 -                    _add_directory(library_dirs, os.path.join(prefix, 'opt', 'freetype', 'lib'))
    28 -                    _add_directory(include_dirs, os.path.join(prefix, 'opt', 'freetype', 'include'))
     29-                prefix = subprocess.check_output(
     30-                    ['brew', '--prefix']
     31-                ).strip().decode('latin1')
    2932-            except:
    30 -                pass # homebrew not installed
    31 -           
    32 -            # freetype2 ships with X11 (after homebrew, so that homebrew freetype is preferred)
    33 -            _add_directory(library_dirs, "/usr/X11/lib")
    34 -            _add_directory(include_dirs, "/usr/X11/include")
     33-                # Homebrew not installed
     34-                prefix = None
     35-
     36-            ft_prefix = None
     37-
     38-            if prefix:
     39-                # add Homebrew's include and lib directories
     40-                _add_directory(library_dirs, os.path.join(prefix, 'lib'))
     41-                _add_directory(include_dirs, os.path.join(prefix, 'include'))
     42-                ft_prefix = os.path.join(prefix, 'opt', 'freetype')
     43-
     44-            if ft_prefix and os.path.isdir(ft_prefix):
     45-                # freetype might not be linked into Homebrew's prefix
     46-                _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
     47-                _add_directory(
     48-                    include_dirs, os.path.join(ft_prefix, 'include'))
     49-            else:
     50-                # fall back to freetype from XQuartz if
     51-                # Homebrew's freetype is missing
     52-                _add_directory(library_dirs, "/usr/X11/lib")
     53-                _add_directory(include_dirs, "/usr/X11/include")
    3554+            _add_directory(library_dirs, "@prefix@/lib")
    3655+            _add_directory(include_dirs, "@prefix@/include")
     
    3857         elif sys.platform.startswith("linux"):
    3958             arch_tp = (plat.processor(), plat.architecture()[0])
    40 @@ -315,21 +289,6 @@
     59@@ -337,21 +301,6 @@
    4160             else:
    4261                 TCL_ROOT = None
     
    5877-
    5978         # on Windows, look for the OpenJPEG libraries in the location that
    60          # the official installed puts them
     79         # the official installer puts them
    6180         if sys.platform == "win32":
    62 @@ -507,29 +466,7 @@
     81@@ -410,7 +359,7 @@
     82             for directory in self.compiler.include_dirs:
     83                 try:
     84                     listdir = os.listdir(directory)
     85-                except Exception: 
     86+                except Exception:
     87                     # WindowsError, FileNotFoundError
     88                     continue
     89                 for name in listdir:
     90@@ -570,29 +519,7 @@
    6391             exts.append(Extension(
    6492                 "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
Note: See TracChangeset for help on using the changeset viewer.