python-imaging: upgrade from 1.1.6 to 1.1.7
Rebased the path.patch to the newer code Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit is contained in:
parent
97e7eed13a
commit
9710898615
|
@ -1,30 +1,26 @@
|
|||
Index: Imaging-1.1.5/setup.py
|
||||
Index: Imaging-1.1.7/setup.py
|
||||
===================================================================
|
||||
--- Imaging-1.1.5.orig/setup.py 2005-03-23 19:16:40.000000000 +0100
|
||||
+++ Imaging-1.1.5/setup.py 2006-05-31 14:36:07.000000000 +0200
|
||||
@@ -28,12 +28,13 @@
|
||||
#
|
||||
--- Imaging-1.1.7.orig/setup.py
|
||||
+++ Imaging-1.1.7/setup.py
|
||||
@@ -34,10 +34,10 @@ def libinclude(root):
|
||||
# TIFF_ROOT = libinclude("/opt/tiff")
|
||||
|
||||
-FREETYPE_ROOT = None
|
||||
-JPEG_ROOT = None
|
||||
+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
|
||||
+JPEG_ROOT = os.environ['STAGING_LIBDIR']
|
||||
TIFF_ROOT = None
|
||||
-ZLIB_ROOT = None
|
||||
+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
|
||||
TCL_ROOT = None
|
||||
-JPEG_ROOT = None
|
||||
-ZLIB_ROOT = None
|
||||
+JPEG_ROOT = os.environ['STAGING_LIBDIR']
|
||||
+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
|
||||
TIFF_ROOT = None
|
||||
-FREETYPE_ROOT = None
|
||||
+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
|
||||
LCMS_ROOT = None
|
||||
|
||||
+
|
||||
# FIXME: add mechanism to explicitly *disable* the use of a library
|
||||
@@ -207,14 +207,6 @@ class pil_build_ext(build_ext):
|
||||
if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
|
||||
add_directory(include_dirs, tcl_dir)
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
@@ -175,15 +176,6 @@
|
||||
add_directory(include_dirs, include_root)
|
||||
|
||||
#
|
||||
- # add standard directories
|
||||
-
|
||||
- # standard locations
|
||||
- add_directory(library_dirs, "/usr/local/lib")
|
||||
- add_directory(include_dirs, "/usr/local/include")
|
||||
-
|
||||
|
|
|
@ -8,7 +8,7 @@ SRCNAME = "Imaging"
|
|||
PR = "ml0"
|
||||
|
||||
SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
|
||||
file://path.patch;patch=1"
|
||||
file://path.patch"
|
||||
S = "${WORKDIR}/${SRCNAME}-${PV}"
|
||||
|
||||
inherit distutils
|
Loading…
Reference in New Issue