mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-07 09:16:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

python-imaging: upgrade from 1.1.6 to 1.1.7

Browse Source 
Rebased the path.patch to the newer code

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit is contained in:
Nitin A Kamble
2010-07-07 03:55:53 -07:00
committed by Richard Purdie
parent 97e7eed13a
commit 9710898615
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/packages/python/python-imaging/path.patch
View File

@@ -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")
-