diff options
| author | joerg <joerg@pkgsrc.org> | 2014-12-17 15:22:44 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-12-17 15:22:44 +0000 |
| commit | e0e4a759aabcd485ea373df1936fc1658ee8359f (patch) | |
| tree | 1f6216d10fc7307cddd37ff93c7159b43e50bc2d /graphics | |
| parent | 6eb2f56bce27663c6c27afeaa3d5e4956803ae77 (diff) | |
| download | pkgsrc-e0e4a759aabcd485ea373df1936fc1658ee8359f.tar.gz | |
Don't try to detect libz and friends, explicitly use them. Avoids
failing detection on SLES11.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/py-imaging/distinfo | 4 | ||||
| -rw-r--r-- | graphics/py-imaging/patches/patch-ab | 41 |
2 files changed, 40 insertions, 5 deletions
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo index 85f099c29bf..a2c3ee3008a 100644 --- a/graphics/py-imaging/distinfo +++ b/graphics/py-imaging/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2014/09/07 09:37:46 spz Exp $ +$NetBSD: distinfo,v 1.18 2014/12/17 15:22:44 joerg Exp $ SHA1 (python/Imaging-1.1.7.tar.gz) = 76c37504251171fda8da8e63ecb8bc42a69a5c81 RMD160 (python/Imaging-1.1.7.tar.gz) = 9af570fe100e250a4860314341fe3e6d695d7fde @@ -9,5 +9,5 @@ SHA1 (patch-PIL_Image.py) = 871994b3c8823c90ae23e6248762e403192e33fc SHA1 (patch-PIL_IptcImagePlugin.py) = bb809394b8c6f6e5b79aa1c90f429c3362e812e3 SHA1 (patch-PIL_JpegImagePlugin.py) = d4fd6d5d60ea011def2e42460d7faa2e0f47b65e SHA1 (patch-_imagingft.c) = b935ce5ebdd57061ace324f7b53055113782f89c -SHA1 (patch-ab) = 4d6b80cf6792c860baf7650b22263c441f057c89 +SHA1 (patch-ab) = f4b850da1ba15843b2d8b124c2ca8dfd17163c26 SHA1 (patch-ac) = 2ad2a988c7fdddb34812959ddfd60442282a48ea diff --git a/graphics/py-imaging/patches/patch-ab b/graphics/py-imaging/patches/patch-ab index 3cfba867e9b..074f0780f36 100644 --- a/graphics/py-imaging/patches/patch-ab +++ b/graphics/py-imaging/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2011/01/03 12:17:31 adam Exp $ +$NetBSD: patch-ab,v 1.8 2014/12/17 15:22:44 joerg Exp $ --- setup.py.orig 2009-11-15 17:06:10.000000000 +0100 +++ setup.py @@ -14,7 +14,42 @@ $NetBSD: patch-ab,v 1.7 2011/01/03 12:17:31 adam Exp $ def add_directory(path, dir, where=None): if dir and os.path.isdir(dir) and dir not in path: -@@ -331,7 +328,7 @@ class pil_build_ext(build_ext): +@@ -228,20 +225,9 @@ class pil_build_ext(build_ext): + zlib = jpeg = tiff = freetype = tcl = tk = lcms = None + feature = feature() + +- if find_include_file(self, "zlib.h"): +- if find_library_file(self, "z"): +- feature.zlib = "z" +- elif sys.platform == "win32" and find_library_file(self, "zlib"): +- feature.zlib = "zlib" # alternative name +- +- if find_include_file(self, "jpeglib.h"): +- if find_library_file(self, "jpeg"): +- feature.jpeg = "jpeg" +- elif sys.platform == "win32" and find_library_file(self, "libjpeg"): +- feature.jpeg = "libjpeg" # alternative name +- +- if find_library_file(self, "tiff"): +- feature.tiff = "tiff" ++ feature.zlib = "z" ++ feature.jpeg = "jpeg" ++ feature.tiff = "tiff" + + if find_library_file(self, "freetype"): + # look for freetype2 include files +@@ -264,9 +250,7 @@ class pil_build_ext(build_ext): + if dir: + add_directory(self.compiler.include_dirs, dir, 0) + +- if find_include_file(self, "lcms.h"): +- if find_library_file(self, "lcms"): +- feature.lcms = "lcms" ++ feature.lcms = "lcms" + + if _tkinter and find_include_file(self, "tk.h"): + # the library names may vary somewhat (e.g. tcl84 or tcl8.4) +@@ -331,7 +315,7 @@ class pil_build_ext(build_ext): "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra )) @@ -23,7 +58,7 @@ $NetBSD: patch-ab,v 1.7 2011/01/03 12:17:31 adam Exp $ # locate Tcl/Tk frameworks frameworks = [] framework_roots = [ -@@ -481,7 +478,7 @@ if __name__ == "__main__": +@@ -481,7 +465,7 @@ if __name__ == "__main__": package_dir={"": "PIL"}, packages=[""], platforms="Python 1.5.2 and later.", |