diff options
| author |   Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-03 05:18:13 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-03 05:18:13 +0000 |
| commit | 4d10f010f4cf2049c43583afbd5fd85ac6df91a8 (patch) | |
| tree | 5049367e7a77c64a8b8622ba74a3fb06fa265df0 /meta-extras/packages/python | |
| parent | dc5aa58b06af479eee6fd00429310ccd32802402 (diff) | |
| download | openembedded-core-contrib-4d10f010f4cf2049c43583afbd5fd85ac6df91a8.tar.gz | |
python-imaging: added from OE (required for flumotion update)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4162 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/python')
| -rw-r--r-- | meta-extras/packages/python/python-imaging/path.patch | 37 | ||||
| -rw-r--r-- | meta-extras/packages/python/python-imaging_1.1.6.bb | 30 |
2 files changed, 67 insertions, 0 deletions
diff --git a/meta-extras/packages/python/python-imaging/path.patch b/meta-extras/packages/python/python-imaging/path.patch new file mode 100644 index 0000000000..1dc467a56d --- /dev/null +++ b/meta-extras/packages/python/python-imaging/path.patch @@ -0,0 +1,37 @@ +Index: Imaging-1.1.5/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 @@ + # + # 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 + ++ + # FIXME: add mechanism to explicitly *disable* the use of a library + + # -------------------------------------------------------------------- +@@ -175,15 +176,6 @@ + add_directory(include_dirs, include_root) + + # +- # add standard directories +- +- add_directory(library_dirs, "/usr/local/lib") +- add_directory(include_dirs, "/usr/local/include") +- +- add_directory(library_dirs, "/usr/lib") +- add_directory(include_dirs, "/usr/include") +- +- # + # insert new dirs *before* default libs, to avoid conflicts + # between Python PYD stub libs and real libraries + diff --git a/meta-extras/packages/python/python-imaging_1.1.6.bb b/meta-extras/packages/python/python-imaging_1.1.6.bb new file mode 100644 index 0000000000..9f3b6323dd --- /dev/null +++ b/meta-extras/packages/python/python-imaging_1.1.6.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;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/ + +} |