diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-07-07 03:55:53 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-16 16:25:16 +0100 |
| commit | 97108986150563b481b04543b4c51a26f59d227c (patch) | |
| tree | a29a9cfe93394f6a191af9b6acbe18377e0ff7ab | |
| parent | 97e7eed13a1b83e49b4c9f0128e8bc3b9db3cb35 (diff) | |
| download | openembedded-core-97108986150563b481b04543b4c51a26f59d227c.tar.gz openembedded-core-97108986150563b481b04543b4c51a26f59d227c.tar.bz2 openembedded-core-97108986150563b481b04543b4c51a26f59d227c.tar.xz openembedded-core-97108986150563b481b04543b4c51a26f59d227c.zip | |
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>
| -rw-r--r-- | meta/packages/python/python-imaging/path.patch | 32 | ||||
| -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 1dc467a56..264dcc09b 100644 --- a/meta/packages/python/python-imaging/path.patch +++ b/meta/packages/python/python-imaging/path.patch @@ -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 + TCL_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 ++JPEG_ROOT = os.environ['STAGING_LIBDIR'] +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] - TCL_ROOT = None + 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") - diff --git a/meta/packages/python/python-imaging_1.1.6.bb b/meta/packages/python/python-imaging_1.1.7.bb index 9f3b6323d..98120432a 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" 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 |