python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-15 10:42:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

disable Raqm/FriBiDi vendoring by default, except in Windows tests

Browse Source
This commit is contained in:
nulano 2021-01-02 12:47:08 +01:00 committed by Andrew Murray
parent 8c02e3803b
commit 43bde01623
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
setup.py
View File

@ -125,7 +125,7 @@ _LIB_IMAGING = (
"codec_fd", "codec_fd",
) )
DEBUG = True DEBUG = False
class DependencyException(Exception): class DependencyException(Exception):
@ -292,7 +292,7 @@ class pil_build_ext(build_ext):
] ]
required = {"jpeg", "zlib"} required = {"jpeg", "zlib"}
system = set() vendor = set()
def __init__(self): def __init__(self):
for f in self.features: for f in self.features:
@ -305,7 +305,7 @@ class pil_build_ext(build_ext):
return getattr(self, feat) is None return getattr(self, feat) is None
def want_system(self, feat): def want_system(self, feat):
return feat in self.system return feat not in self.vendor
def __iter__(self): def __iter__(self):
yield from self.features yield from self.features
@ -317,7 +317,7 @@ class pil_build_ext(build_ext):
+ [(f"disable-{x}", None, f"Disable support for {x}") for x in feature] + [(f"disable-{x}", None, f"Disable support for {x}") for x in feature]
+ [(f"enable-{x}", None, f"Enable support for {x}") for x in feature] + [(f"enable-{x}", None, f"Enable support for {x}") for x in feature]
+ [ + [
(f"system-{x}", None, f"Use system version of {x}") (f"_vendor-{x}", None, f"Use vendored version of {x}")
for x in ("raqm", "fribidi") for x in ("raqm", "fribidi")
] ]
+ [ + [
@ -335,7 +335,7 @@ class pil_build_ext(build_ext):
setattr(self, f"disable_{x}", None) setattr(self, f"disable_{x}", None)
setattr(self, f"enable_{x}", None) setattr(self, f"enable_{x}", None)
for x in ("raqm", "fribidi"): for x in ("raqm", "fribidi"):
setattr(self, f"system_{x}", None) setattr(self, f"_vendor_{x}", None)
def finalize_options(self): def finalize_options(self):
build_ext.finalize_options(self) build_ext.finalize_options(self)
@ -374,17 +374,17 @@ class pil_build_ext(build_ext):
_dbg("--enable-raqm implies --enable-freetype") _dbg("--enable-raqm implies --enable-freetype")
self.feature.required.add("freetype") self.feature.required.add("freetype")
for x in ("raqm", "fribidi"): for x in ("raqm", "fribidi"):
if getattr(self, f"system_{x}"): if getattr(self, f"_vendor_{x}"):
if getattr(self, "disable_raqm"): if getattr(self, "disable_raqm"):
raise ValueError( raise ValueError(
f"Conflicting options: --system-{x} and --disable-raqm" f"Conflicting options: --_vendor-{x} and --disable-raqm"
) )
if x == "fribidi" and getattr(self, "system_raqm"): if x == "fribidi" and not getattr(self, "_vendor_raqm"):
raise ValueError( raise ValueError(
f"Conflicting options: --system-{x} and --system-raqm" f"Conflicting options: --_vendor-{x} and not --_vendor-raqm"
) )
_dbg("Using system version of %s", x) _dbg("Using vendored version of %s", x)
self.feature.system.add(x) self.feature.vendor.add(x)
def _update_extension(self, name, libraries, define_macros=None, sources=None): def _update_extension(self, name, libraries, define_macros=None, sources=None):
for extension in self.extensions: for extension in self.extensions:

2
winbuild/build_prepare.py
View File

@ -472,7 +472,7 @@ def build_pillow():
cmd_set("DISTUTILS_USE_SDK", "1"), # use same compiler to build Pillow cmd_set("DISTUTILS_USE_SDK", "1"), # use same compiler to build Pillow
cmd_set("MSSdk", "1"), # for PyPy3.6 cmd_set("MSSdk", "1"), # for PyPy3.6
cmd_set("py_vcruntime_redist", "true"), # use /MD, not /MT cmd_set("py_vcruntime_redist", "true"), # use /MD, not /MT
r'"{python_dir}\{python_exe}" setup.py build_ext %*', r'"{python_dir}\{python_exe}" setup.py build_ext --_vendor-raqm --_vendor-fribidi %*',
] ]
write_script("build_pillow.cmd", lines) write_script("build_pillow.cmd", lines)