149 lines
6.6 KiB
Diff
149 lines
6.6 KiB
Diff
|
diff --git a/setup.py b/setup.py
|
||
|
|
index 761d552..4ddc598 100755
|
||
|
|
--- a/setup.py
|
||
|
|
+++ b/setup.py
|
||
|
|
@@ -136,12 +136,12 @@ except (ImportError, OSError):
|
||
|
|
|
||
|
|
NAME = 'Pillow'
|
||
|
|
PILLOW_VERSION = get_version()
|
||
|
|
-JPEG_ROOT = None
|
||
|
|
+JPEG_ROOT = tuple(os.environ['JPEG_ROOT'].split('|')) if 'JPEG_ROOT' in os.environ else None
|
||
|
|
JPEG2K_ROOT = None
|
||
|
|
-ZLIB_ROOT = None
|
||
|
|
+ZLIB_ROOT = tuple(os.environ['ZLIB_ROOT'].split('|')) if 'ZLIB_ROOT' in os.environ else None
|
||
|
|
IMAGEQUANT_ROOT = None
|
||
|
|
TIFF_ROOT = None
|
||
|
|
-FREETYPE_ROOT = None
|
||
|
|
+FREETYPE_ROOT = tuple(os.environ['FREETYPE_ROOT'].split('|')) if 'FREETYPE_ROOT' in os.environ else None
|
||
|
|
LCMS_ROOT = None
|
||
|
|
|
||
|
|
|
||
|
|
@@ -194,7 +194,7 @@ class pil_build_ext(build_ext):
|
||
|
|
]
|
||
|
|
|
||
|
|
def initialize_options(self):
|
||
|
|
- self.disable_platform_guessing = None
|
||
|
|
+ self.disable_platform_guessing = True
|
||
|
|
build_ext.initialize_options(self)
|
||
|
|
for x in self.feature:
|
||
|
|
setattr(self, 'disable_%s' % x, None)
|
||
|
|
@@ -466,61 +466,6 @@ class pil_build_ext(build_ext):
|
||
|
|
feature.jpeg = "libjpeg" # alternative name
|
||
|
|
|
||
|
|
feature.openjpeg_version = None
|
||
|
|
- if feature.want('jpeg2000'):
|
||
|
|
- _dbg('Looking for jpeg2000')
|
||
|
|
- best_version = None
|
||
|
|
- best_path = None
|
||
|
|
-
|
||
|
|
- # Find the best version
|
||
|
|
- for directory in self.compiler.include_dirs:
|
||
|
|
- _dbg('Checking for openjpeg-#.# in %s', directory)
|
||
|
|
- try:
|
||
|
|
- listdir = os.listdir(directory)
|
||
|
|
- except Exception:
|
||
|
|
- # WindowsError, FileNotFoundError
|
||
|
|
- continue
|
||
|
|
- for name in listdir:
|
||
|
|
- if name.startswith('openjpeg-') and \
|
||
|
|
- os.path.isfile(os.path.join(directory, name,
|
||
|
|
- 'openjpeg.h')):
|
||
|
|
- _dbg('Found openjpeg.h in %s/%s', (directory, name))
|
||
|
|
- version = tuple(int(x) for x in name[9:].split('.'))
|
||
|
|
- if best_version is None or version > best_version:
|
||
|
|
- best_version = version
|
||
|
|
- best_path = os.path.join(directory, name)
|
||
|
|
- _dbg('Best openjpeg version %s so far in %s',
|
||
|
|
- (best_version, best_path))
|
||
|
|
-
|
||
|
|
- if best_version and _find_library_file(self, 'openjp2'):
|
||
|
|
- # Add the directory to the include path so we can include
|
||
|
|
- # <openjpeg.h> rather than having to cope with the versioned
|
||
|
|
- # include path
|
||
|
|
- # FIXME (melvyn-sopacua):
|
||
|
|
- # At this point it's possible that best_path is already in
|
||
|
|
- # self.compiler.include_dirs. Should investigate how that is
|
||
|
|
- # possible.
|
||
|
|
- _add_directory(self.compiler.include_dirs, best_path, 0)
|
||
|
|
- feature.jpeg2000 = 'openjp2'
|
||
|
|
- feature.openjpeg_version = '.'.join(str(x) for x in best_version)
|
||
|
|
-
|
||
|
|
- if feature.want('imagequant'):
|
||
|
|
- _dbg('Looking for imagequant')
|
||
|
|
- if _find_include_file(self, 'libimagequant.h'):
|
||
|
|
- if _find_library_file(self, "imagequant"):
|
||
|
|
- feature.imagequant = "imagequant"
|
||
|
|
- elif _find_library_file(self, "libimagequant"):
|
||
|
|
- feature.imagequant = "libimagequant"
|
||
|
|
-
|
||
|
|
- if feature.want('tiff'):
|
||
|
|
- _dbg('Looking for tiff')
|
||
|
|
- if _find_include_file(self, 'tiff.h'):
|
||
|
|
- if _find_library_file(self, "tiff"):
|
||
|
|
- feature.tiff = "tiff"
|
||
|
|
- if sys.platform == "win32" and _find_library_file(self, "libtiff"):
|
||
|
|
- feature.tiff = "libtiff"
|
||
|
|
- if (sys.platform == "darwin" and
|
||
|
|
- _find_library_file(self, "libtiff")):
|
||
|
|
- feature.tiff = "libtiff"
|
||
|
|
|
||
|
|
if feature.want('freetype'):
|
||
|
|
_dbg('Looking for freetype')
|
||
|
|
@@ -546,36 +491,6 @@ class pil_build_ext(build_ext):
|
||
|
|
if subdir:
|
||
|
|
_add_directory(self.compiler.include_dirs, subdir, 0)
|
||
|
|
|
||
|
|
- if feature.want('lcms'):
|
||
|
|
- _dbg('Looking for lcms')
|
||
|
|
- if _find_include_file(self, "lcms2.h"):
|
||
|
|
- if _find_library_file(self, "lcms2"):
|
||
|
|
- feature.lcms = "lcms2"
|
||
|
|
- elif _find_library_file(self, "lcms2_static"):
|
||
|
|
- # alternate Windows name.
|
||
|
|
- feature.lcms = "lcms2_static"
|
||
|
|
-
|
||
|
|
- if feature.want('webp'):
|
||
|
|
- _dbg('Looking for webp')
|
||
|
|
- if (_find_include_file(self, "webp/encode.h") and
|
||
|
|
- _find_include_file(self, "webp/decode.h")):
|
||
|
|
- # In Google's precompiled zip it is call "libwebp":
|
||
|
|
- if _find_library_file(self, "webp"):
|
||
|
|
- feature.webp = "webp"
|
||
|
|
- elif _find_library_file(self, "libwebp"):
|
||
|
|
- feature.webp = "libwebp"
|
||
|
|
-
|
||
|
|
- if feature.want('webpmux'):
|
||
|
|
- _dbg('Looking for webpmux')
|
||
|
|
- if (_find_include_file(self, "webp/mux.h") and
|
||
|
|
- _find_include_file(self, "webp/demux.h")):
|
||
|
|
- if (_find_library_file(self, "webpmux") and
|
||
|
|
- _find_library_file(self, "webpdemux")):
|
||
|
|
- feature.webpmux = "webpmux"
|
||
|
|
- if (_find_library_file(self, "libwebpmux") and
|
||
|
|
- _find_library_file(self, "libwebpdemux")):
|
||
|
|
- feature.webpmux = "libwebpmux"
|
||
|
|
-
|
||
|
|
for f in feature:
|
||
|
|
if not getattr(feature, f) and feature.require(f):
|
||
|
|
if f in ('jpeg', 'zlib'):
|
||
|
|
@@ -612,8 +527,6 @@ class pil_build_ext(build_ext):
|
||
|
|
defs.append(("HAVE_LIBTIFF", None))
|
||
|
|
if sys.platform == "win32":
|
||
|
|
libs.extend(["kernel32", "user32", "gdi32"])
|
||
|
|
- if struct.unpack("h", "\0\1".encode('ascii'))[0] == 1:
|
||
|
|
- defs.append(("WORDS_BIGENDIAN", None))
|
||
|
|
|
||
|
|
if sys.platform == "win32" and not (PLATFORM_PYPY or PLATFORM_MINGW):
|
||
|
|
defs.append(("PILLOW_VERSION", '"\\"%s\\""' % PILLOW_VERSION))
|
||
|
|
@@ -658,10 +571,6 @@ class pil_build_ext(build_ext):
|
||
|
|
define_macros=defs))
|
||
|
|
|
||
|
|
tk_libs = ['psapi'] if sys.platform == 'win32' else []
|
||
|
|
- exts.append(Extension("PIL._imagingtk",
|
||
|
|
- ["src/_imagingtk.c", "src/Tk/tkImaging.c"],
|
||
|
|
- include_dirs=['src/Tk'],
|
||
|
|
- libraries=tk_libs))
|
||
|
|
|
||
|
|
exts.append(Extension("PIL._imagingmath", ["src/_imagingmath.c"]))
|
||
|
|
exts.append(Extension("PIL._imagingmorph", ["src/_imagingmorph.c"]))
|