diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-06-02 12:25:57 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:27 +0100 |
commit | 68cea002055bba97a6eff3b4f15773a58ee399ac (patch) | |
tree | e3829ea77793be588d76617c350e1f9f79f6d808 /meta/recipes-devtools/python | |
parent | 5cd554fbe255bd460c81226fb61e3c87fc75304d (diff) | |
download | poky-68cea002055bba97a6eff3b4f15773a58ee399ac.tar.gz |
python-imaging: remove unused recipe
(From OE-Core rev: b03ebfaee278eb98b4bd0e11a682ac0cda192086)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
4 files changed, 0 insertions, 195 deletions
diff --git a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch deleted file mode 100644 index 2575306bec..0000000000 --- a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 15 Nov 2011 13:16:54 +0100 | ||
4 | Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | |||
8 | Upstream-Status: Inappropriate [embedded specific] | ||
9 | --- | ||
10 | setup.py | 14 +++----------- | ||
11 | 1 files changed, 3 insertions(+), 11 deletions(-) | ||
12 | |||
13 | diff --git a/setup.py b/setup.py | ||
14 | index 5d4d53a..b1a22ec 100644 | ||
15 | --- a/setup.py | ||
16 | +++ b/setup.py | ||
17 | @@ -34,10 +34,10 @@ def libinclude(root): | ||
18 | # TIFF_ROOT = libinclude("/opt/tiff") | ||
19 | |||
20 | TCL_ROOT = None | ||
21 | -JPEG_ROOT = None | ||
22 | -ZLIB_ROOT = None | ||
23 | +JPEG_ROOT = os.environ['STAGING_LIBDIR'] | ||
24 | +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] | ||
25 | TIFF_ROOT = None | ||
26 | -FREETYPE_ROOT = None | ||
27 | +FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
28 | LCMS_ROOT = None | ||
29 | |||
30 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
31 | @@ -147,7 +147,6 @@ class pil_build_ext(build_ext): | ||
32 | add_directory(library_dirs, "/opt/local/lib") | ||
33 | add_directory(include_dirs, "/opt/local/include") | ||
34 | |||
35 | - add_directory(library_dirs, "/usr/local/lib") | ||
36 | # FIXME: check /opt/stuff directories here? | ||
37 | |||
38 | prefix = sysconfig.get_config_var("prefix") | ||
39 | @@ -207,13 +206,6 @@ class pil_build_ext(build_ext): | ||
40 | if os.path.isfile(os.path.join(tcl_dir, "tk.h")): | ||
41 | add_directory(include_dirs, tcl_dir) | ||
42 | |||
43 | - # standard locations | ||
44 | - add_directory(library_dirs, "/usr/local/lib") | ||
45 | - add_directory(include_dirs, "/usr/local/include") | ||
46 | - | ||
47 | - add_directory(library_dirs, "/usr/lib") | ||
48 | - add_directory(include_dirs, "/usr/include") | ||
49 | - | ||
50 | # | ||
51 | # insert new dirs *before* default libs, to avoid conflicts | ||
52 | # between Python PYD stub libs and real libraries | ||
53 | -- | ||
54 | 1.7.2.5 | ||
55 | |||
diff --git a/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch b/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch deleted file mode 100644 index 4960ed4661..0000000000 --- a/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | At least lcms wasn't deterministicly detected from sysroot. | ||
2 | |||
3 | This will allow to export LCMS_ENABLED=False when lcms isn't in PACKAGECONFIG. | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | |||
9 | diff -uNr Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py | ||
10 | --- Imaging-1.1.7.orig/setup.py 2013-07-22 10:17:02.081457075 +0200 | ||
11 | +++ Imaging-1.1.7/setup.py 2013-07-22 13:10:09.029707492 +0200 | ||
12 | @@ -39,6 +39,12 @@ | ||
13 | TIFF_ROOT = None | ||
14 | FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
15 | LCMS_ROOT = None | ||
16 | +TCL_ENABLED = os.getenv('TCL_ENABLED', "True") | ||
17 | +JPEG_ENABLED = os.getenv('JPEG_ENABLED', "True") | ||
18 | +ZLIB_ENABLED = os.getenv('ZLIB_ENABLED', "True") | ||
19 | +TIFF_ENABLED = os.getenv('TIFF_ENABLED', "True") | ||
20 | +FREETYPE_ENABLED = os.getenv('FREETYPE_ENABLED', "True") | ||
21 | +LCMS_ENABLED = os.getenv('LCMS_ENABLED', "True") | ||
22 | |||
23 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
24 | |||
25 | @@ -220,22 +226,22 @@ | ||
26 | zlib = jpeg = tiff = freetype = tcl = tk = lcms = None | ||
27 | feature = feature() | ||
28 | |||
29 | - if find_include_file(self, "zlib.h"): | ||
30 | + if ZLIB_ENABLED == 'True' and find_include_file(self, "zlib.h"): | ||
31 | if find_library_file(self, "z"): | ||
32 | feature.zlib = "z" | ||
33 | elif sys.platform == "win32" and find_library_file(self, "zlib"): | ||
34 | feature.zlib = "zlib" # alternative name | ||
35 | |||
36 | - if find_include_file(self, "jpeglib.h"): | ||
37 | + if JPEG_ENABLED == 'True' and find_include_file(self, "jpeglib.h"): | ||
38 | if find_library_file(self, "jpeg"): | ||
39 | feature.jpeg = "jpeg" | ||
40 | elif sys.platform == "win32" and find_library_file(self, "libjpeg"): | ||
41 | feature.jpeg = "libjpeg" # alternative name | ||
42 | |||
43 | - if find_library_file(self, "tiff"): | ||
44 | + if TIFF_ENABLED == 'True' and find_library_file(self, "tiff"): | ||
45 | feature.tiff = "tiff" | ||
46 | |||
47 | - if find_library_file(self, "freetype"): | ||
48 | + if FREETYPE_ENABLED == 'True' and find_library_file(self, "freetype"): | ||
49 | # look for freetype2 include files | ||
50 | freetype_version = 0 | ||
51 | for dir in self.compiler.include_dirs: | ||
52 | @@ -256,11 +262,11 @@ | ||
53 | if dir: | ||
54 | add_directory(self.compiler.include_dirs, dir, 0) | ||
55 | |||
56 | - if find_include_file(self, "lcms.h"): | ||
57 | + if LCMS_ENABLED == 'True' and find_include_file(self, "lcms.h"): | ||
58 | if find_library_file(self, "lcms"): | ||
59 | feature.lcms = "lcms" | ||
60 | |||
61 | - if _tkinter and find_include_file(self, "tk.h"): | ||
62 | + if TCL_ENABLED == 'True' and _tkinter and find_include_file(self, "tk.h"): | ||
63 | # the library names may vary somewhat (e.g. tcl84 or tcl8.4) | ||
64 | version = TCL_VERSION[0] + TCL_VERSION[2] | ||
65 | if find_library_file(self, "tcl" + version): | ||
diff --git a/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch b/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch deleted file mode 100644 index 9ecc63a0d6..0000000000 --- a/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001 | ||
5 | From: Andrew Stromnov <stromnov@gmail.com> | ||
6 | Date: Thu, 28 Nov 2013 16:58:43 +0400 | ||
7 | Subject: [PATCH] fix compiling with FreeType 2.5.1 | ||
8 | |||
9 | --- | ||
10 | _imagingft.c | 4 ++++ | ||
11 | 1 file changed, 4 insertions(+) | ||
12 | |||
13 | diff --git a/_imagingft.c b/_imagingft.c | ||
14 | index 47d50bd..f19555b 100644 | ||
15 | --- a/_imagingft.c | ||
16 | +++ b/_imagingft.c | ||
17 | @@ -59,7 +59,11 @@ struct { | ||
18 | const char* message; | ||
19 | } ft_errors[] = | ||
20 | |||
21 | +#if defined(USE_FREETYPE_2_1) | ||
22 | +#include FT_ERRORS_H | ||
23 | +#else | ||
24 | #include <freetype/fterrors.h> | ||
25 | +#endif | ||
26 | |||
27 | /* -------------------------------------------------------------------- */ | ||
28 | /* font objects */ | ||
29 | -- | ||
30 | 1.8.5.1 | ||
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb deleted file mode 100644 index a678328275..0000000000 --- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | SUMMARY = "Python Imaging Library (PIL)" | ||
2 | SECTION = "devel/python" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec" | ||
5 | DEPENDS = "freetype jpeg tiff" | ||
6 | SRCNAME = "Imaging" | ||
7 | PR = "r5" | ||
8 | |||
9 | SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ | ||
10 | file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \ | ||
11 | file://allow.to.disable.some.features.patch \ | ||
12 | file://fix-freetype-includes.patch" | ||
13 | |||
14 | SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e" | ||
15 | SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211" | ||
16 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
17 | |||
18 | # There isn't enable/disable option, and lcms is in meta-oe, at least make it explicit when enabled | ||
19 | # setup.py already has FIXME: add mechanism to explicitly *disable* the use of a library | ||
20 | PACKAGECONFIG ??= "" | ||
21 | PACKAGECONFIG[lcms] = ",,lcms" | ||
22 | |||
23 | inherit distutils | ||
24 | |||
25 | do_compile() { | ||
26 | export STAGING_LIBDIR=${STAGING_LIBDIR} | ||
27 | export STAGING_INCDIR=${STAGING_INCDIR} | ||
28 | export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} | ||
29 | distutils_do_compile | ||
30 | } | ||
31 | |||
32 | do_install() { | ||
33 | export STAGING_LIBDIR=${STAGING_LIBDIR} | ||
34 | export STAGING_INCDIR=${STAGING_INCDIR} | ||
35 | export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} | ||
36 | distutils_do_install | ||
37 | install -d ${D}${datadir}/doc/${BPN}/html/ | ||
38 | install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/ | ||
39 | install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${BPN}/html/ | ||
40 | |||
41 | # get rid of #!/usr/local/bin/python | ||
42 | sed -i -e 's:/usr/local/bin/:${bindir}/env :g' ${D}${bindir}/* | ||
43 | } | ||
44 | |||
45 | RDEPENDS_${PN} += "python-lang python-stringold" | ||