|
@@ -0,0 +1,48 @@
|
|
1
|
+diff -rupN Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py
|
|
2
|
+--- Imaging-1.1.7.orig/setup.py 2009-11-15 17:06:10.000000000 +0100
|
|
3
|
++++ Imaging-1.1.7/setup.py 2014-12-11 01:01:10.857100877 +0100
|
|
4
|
+@@ -34,10 +34,10 @@ def libinclude(root):
|
|
5
|
+ # TIFF_ROOT = libinclude("/opt/tiff")
|
|
6
|
+
|
|
7
|
+ TCL_ROOT = None
|
|
8
|
+-JPEG_ROOT = None
|
|
9
|
+-ZLIB_ROOT = None
|
|
10
|
++JPEG_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
|
|
11
|
++ZLIB_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
|
|
12
|
+ TIFF_ROOT = None
|
|
13
|
+-FREETYPE_ROOT = None
|
|
14
|
++FREETYPE_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
|
|
15
|
+ LCMS_ROOT = None
|
|
16
|
+
|
|
17
|
+ # FIXME: add mechanism to explicitly *disable* the use of a library
|
|
18
|
+@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
|
|
19
|
+ add_directory(library_dirs, "/opt/local/lib")
|
|
20
|
+ add_directory(include_dirs, "/opt/local/include")
|
|
21
|
+
|
|
22
|
+- add_directory(library_dirs, "/usr/local/lib")
|
|
23
|
+ # FIXME: check /opt/stuff directories here?
|
|
24
|
+
|
|
25
|
+ prefix = sysconfig.get_config_var("prefix")
|
|
26
|
+@@ -199,22 +198,6 @@ class pil_build_ext(build_ext):
|
|
27
|
+ add_directory(include_dirs, include_root)
|
|
28
|
+
|
|
29
|
+ #
|
|
30
|
+- # add standard directories
|
|
31
|
+-
|
|
32
|
+- # look for tcl specific subdirectory (e.g debian)
|
|
33
|
+- if _tkinter:
|
|
34
|
+- tcl_dir = "/usr/include/tcl" + TCL_VERSION
|
|
35
|
+- if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
|
|
36
|
+- add_directory(include_dirs, tcl_dir)
|
|
37
|
+-
|
|
38
|
+- # standard locations
|
|
39
|
+- add_directory(library_dirs, "/usr/local/lib")
|
|
40
|
+- add_directory(include_dirs, "/usr/local/include")
|
|
41
|
+-
|
|
42
|
+- add_directory(library_dirs, "/usr/lib")
|
|
43
|
+- add_directory(include_dirs, "/usr/include")
|
|
44
|
+-
|
|
45
|
+- #
|
|
46
|
+ # insert new dirs *before* default libs, to avoid conflicts
|
|
47
|
+ # between Python PYD stub libs and real libraries
|
|
48
|
+
|