diff options
| -rw-r--r-- | patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch | 38 | ||||
| -rw-r--r-- | patches/Imaging-1.1.7/series | 3 | ||||
| -rw-r--r-- | rules/python-imaging.in | 24 | ||||
| -rw-r--r-- | rules/python-imaging.make | 81 |
4 files changed, 146 insertions, 0 deletions
diff --git a/patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch b/patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch new file mode 100644 index 000000000..e3f1da806 --- /dev/null +++ b/patches/Imaging-1.1.7/0001-setup.py-remove-host-directories-from-search-paths.patch @@ -0,0 +1,38 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 26 May 2011 17:07:26 +0200 +Subject: [PATCH] setup.py: remove host directories from search paths + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + setup.py | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/setup.py b/setup.py +index 5d4d53a..26d5672 100644 +--- a/setup.py ++++ b/setup.py +@@ -147,7 +147,6 @@ class pil_build_ext(build_ext): + add_directory(library_dirs, "/opt/local/lib") + add_directory(include_dirs, "/opt/local/include") + +- add_directory(library_dirs, "/usr/local/lib") + # FIXME: check /opt/stuff directories here? + + prefix = sysconfig.get_config_var("prefix") +@@ -207,13 +206,6 @@ class pil_build_ext(build_ext): + if os.path.isfile(os.path.join(tcl_dir, "tk.h")): + add_directory(include_dirs, tcl_dir) + +- # standard locations +- 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 +-- +1.7.5.1 + diff --git a/patches/Imaging-1.1.7/series b/patches/Imaging-1.1.7/series new file mode 100644 index 000000000..bfe5bcd05 --- /dev/null +++ b/patches/Imaging-1.1.7/series @@ -0,0 +1,3 @@ +# generated by git-ptx-patches +0001-setup.py-remove-host-directories-from-search-paths.patch +# d1e428f451e5d4fce235256d18430c0c - git-ptx-patches magic diff --git a/rules/python-imaging.in b/rules/python-imaging.in new file mode 100644 index 000000000..6fe9f6341 --- /dev/null +++ b/rules/python-imaging.in @@ -0,0 +1,24 @@ +## SECTION=multimedia_libs + +menuconfig PYTHON_IMAGING + tristate + select PYTHON + select ZLIB + select FREETYPE if PYTHON_IMAGING_FREETYPE + select LIBJPEG if PYTHON_IMAGING_JPEG + prompt "python-imaging" + help + FIXME + +if PYTHON_IMAGING + +config PYTHON_IMAGING_FREETYPE + bool + prompt "FreeType support" + +config PYTHON_IMAGING_JPEG + bool + prompt "jpeg support" + +endif + diff --git a/rules/python-imaging.make b/rules/python-imaging.make new file mode 100644 index 000000000..81edac970 --- /dev/null +++ b/rules/python-imaging.make @@ -0,0 +1,81 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON_IMAGING) += python-imaging + +# +# Paths and names +# +PYTHON_IMAGING_VERSION := 1.1.7 +PYTHON_IMAGING_MD5 := fc14a54e1ce02a0225be8854bfba478e +PYTHON_IMAGING := Imaging-$(PYTHON_IMAGING_VERSION) +PYTHON_IMAGING_SUFFIX := tar.gz +PYTHON_IMAGING_URL := http://effbot.org/downloads/$(PYTHON_IMAGING).$(PYTHON_IMAGING_SUFFIX) +PYTHON_IMAGING_SOURCE := $(SRCDIR)/$(PYTHON_IMAGING).$(PYTHON_IMAGING_SUFFIX) +PYTHON_IMAGING_DIR := $(BUILDDIR)/$(PYTHON_IMAGING) +PYTHON_IMAGING_LICENSE := unknown + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +PYTHON_IMAGING_PATH := PATH=$(CROSS_PATH) +PYTHON_IMAGING_CONF_TOOL := NO +PYTHON_IMAGING_MAKE_ENV := $(CROSS_ENV) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +$(STATEDIR)/python-imaging.compile: + @$(call targetinfo) + cd $(PYTHON_IMAGING_DIR) && \ + $(PYTHON_IMAGING_PATH) $(PYTHON_IMAGING_MAKE_ENV) \ + python setup.py build + @$(call touch) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/python-imaging.install: + @$(call targetinfo) + cd $(PYTHON_IMAGING_DIR) && \ + $(PYTHON_IMAGING_PATH) $(PYTHON_IMAGING_MAKE_ENV) \ + python setup.py install --prefix=$(PYTHON_IMAGING_PKGDIR)/usr + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/python-imaging.targetinstall: + @$(call targetinfo) + + @$(call install_init, python-imaging) + @$(call install_fixup, python-imaging,PRIORITY,optional) + @$(call install_fixup, python-imaging,SECTION,base) + @$(call install_fixup, python-imaging,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") + @$(call install_fixup, python-imaging,DESCRIPTION,missing) + + @for file in `find $(PYTHON_IMAGING_PKGDIR)/usr/lib/python$(PYTHON_MAJORMINOR)/site-packages/PIL \ + ! -type d ! -name "*.py" -printf "%f\n"`; do \ + $(call install_copy, python-imaging, 0, 0, 0644, -, \ + /usr/lib/python$(PYTHON_MAJORMINOR)/site-packages/PIL/$$file); \ + done + + @$(call install_finish, python-imaging) + + @$(call touch) + +# vim: syntax=make |