From 97108986150563b481b04543b4c51a26f59d227c Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Wed, 7 Jul 2010 03:55:53 -0700
Subject: 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>
---
 meta/packages/python/python-imaging/path.patch | 32 +++++++++++---------------
 meta/packages/python/python-imaging_1.1.6.bb   | 30 ------------------------
 meta/packages/python/python-imaging_1.1.7.bb   | 30 ++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 48 deletions(-)
 delete mode 100644 meta/packages/python/python-imaging_1.1.6.bb
 create mode 100644 meta/packages/python/python-imaging_1.1.7.bb

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.6.bb
deleted file mode 100644
index 9f3b6323d..000000000
--- a/meta/packages/python/python-imaging_1.1.6.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Python Imaging Library"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "freetype jpeg tiff"
-RDEPENDS = "python-lang python-stringold"
-SRCNAME = "Imaging"
-PR = "ml0"
-
-SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
-           file://path.patch;patch=1"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-do_compile() {
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    distutils_do_compile
-}
-
-do_install() {
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    distutils_do_install
-    install -d ${D}${datadir}/doc/${PN}/html/
-    install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
-    install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
-
-}
diff --git a/meta/packages/python/python-imaging_1.1.7.bb b/meta/packages/python/python-imaging_1.1.7.bb
new file mode 100644
index 000000000..98120432a
--- /dev/null
+++ b/meta/packages/python/python-imaging_1.1.7.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Python Imaging Library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "freetype jpeg tiff"
+RDEPENDS = "python-lang python-stringold"
+SRCNAME = "Imaging"
+PR = "ml0"
+
+SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
+           file://path.patch"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_compile() {
+    export STAGING_LIBDIR=${STAGING_LIBDIR}
+    export STAGING_INCDIR=${STAGING_INCDIR}
+    distutils_do_compile
+}
+
+do_install() {
+    export STAGING_LIBDIR=${STAGING_LIBDIR}
+    export STAGING_INCDIR=${STAGING_INCDIR}
+    distutils_do_install
+    install -d ${D}${datadir}/doc/${PN}/html/
+    install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
+    install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
+
+}
-- 
cgit v1.2.3