summaryrefslogtreecommitdiffstats
path: root/meta/packages/python
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-07-07 03:55:53 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-16 16:25:16 +0100
commit97108986150563b481b04543b4c51a26f59d227c (patch)
treea29a9cfe93394f6a191af9b6acbe18377e0ff7ab /meta/packages/python
parent97e7eed13a1b83e49b4c9f0128e8bc3b9db3cb35 (diff)
downloadpoky-97108986150563b481b04543b4c51a26f59d227c.tar.gz
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>
Diffstat (limited to 'meta/packages/python')
-rw-r--r--meta/packages/python/python-imaging/path.patch32
-rw-r--r--meta/packages/python/python-imaging_1.1.7.bb (renamed from meta/packages/python/python-imaging_1.1.6.bb)2
2 files changed, 15 insertions, 19 deletions
diff --git a/meta/packages/python/python-imaging/path.patch b/meta/packages/python/python-imaging/path.patch
index 1dc467a56d..264dcc09b8 100644
--- a/meta/packages/python/python-imaging/path.patch
+++ b/meta/packages/python/python-imaging/path.patch
@@ -1,30 +1,26 @@
1Index: Imaging-1.1.5/setup.py 1Index: Imaging-1.1.7/setup.py
2=================================================================== 2===================================================================
3--- Imaging-1.1.5.orig/setup.py 2005-03-23 19:16:40.000000000 +0100 3--- Imaging-1.1.7.orig/setup.py
4+++ Imaging-1.1.5/setup.py 2006-05-31 14:36:07.000000000 +0200 4+++ Imaging-1.1.7/setup.py
5@@ -28,12 +28,13 @@ 5@@ -34,10 +34,10 @@ def libinclude(root):
6 #
7 # TIFF_ROOT = libinclude("/opt/tiff") 6 # TIFF_ROOT = libinclude("/opt/tiff")
8 7
9-FREETYPE_ROOT = None 8 TCL_ROOT = None
10-JPEG_ROOT = None 9-JPEG_ROOT = None
11+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
12+JPEG_ROOT = os.environ['STAGING_LIBDIR']
13 TIFF_ROOT = None
14-ZLIB_ROOT = None 10-ZLIB_ROOT = None
11+JPEG_ROOT = os.environ['STAGING_LIBDIR']
15+ZLIB_ROOT = os.environ['STAGING_LIBDIR'] 12+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
16 TCL_ROOT = None 13 TIFF_ROOT = None
14-FREETYPE_ROOT = None
15+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
16 LCMS_ROOT = None
17 17
18+
19 # FIXME: add mechanism to explicitly *disable* the use of a library 18 # FIXME: add mechanism to explicitly *disable* the use of a library
19@@ -207,14 +207,6 @@ class pil_build_ext(build_ext):
20 if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
21 add_directory(include_dirs, tcl_dir)
20 22
21 # -------------------------------------------------------------------- 23- # standard locations
22@@ -175,15 +176,6 @@
23 add_directory(include_dirs, include_root)
24
25 #
26- # add standard directories
27-
28- add_directory(library_dirs, "/usr/local/lib") 24- add_directory(library_dirs, "/usr/local/lib")
29- add_directory(include_dirs, "/usr/local/include") 25- add_directory(include_dirs, "/usr/local/include")
30- 26-
diff --git a/meta/packages/python/python-imaging_1.1.6.bb b/meta/packages/python/python-imaging_1.1.7.bb
index 9f3b6323dd..98120432ac 100644
--- a/meta/packages/python/python-imaging_1.1.6.bb
+++ b/meta/packages/python/python-imaging_1.1.7.bb
@@ -8,7 +8,7 @@ SRCNAME = "Imaging"
8PR = "ml0" 8PR = "ml0"
9 9
10SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ 10SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
11 file://path.patch;patch=1" 11 file://path.patch"
12S = "${WORKDIR}/${SRCNAME}-${PV}" 12S = "${WORKDIR}/${SRCNAME}-${PV}"
13 13
14inherit distutils 14inherit distutils