Imaging: move to Pillow, a fork of PIL

packages/python/graphics/Imaging/patches/Imaging-1.1.7-crosscompiling-0.1.patch

@@ -1,34 +0,0 @@
-diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
---- Imaging-1.1.7/setup.py	2011-04-17 09:31:07.000000000 +0200
-+++ Imaging-1.1.7.patch/setup.py	2011-04-17 09:54:20.880047886 +0200
-@@ -147,7 +147,6 @@
-             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")
-@@ -199,22 +198,6 @@
-             add_directory(include_dirs, include_root)
- 
-         #
--        # add standard directories
--
--        # look for tcl specific subdirectory (e.g debian)
--        if _tkinter:
--            tcl_dir = "/usr/include/tcl" + TCL_VERSION
--            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
- 

packages/python/graphics/Imaging/patches/Imaging-1.1.7-setuptools-0.1.patch

@@ -1,12 +0,0 @@
-diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
---- Imaging-1.1.7/setup.py	2009-11-15 17:06:10.000000000 +0100
-+++ Imaging-1.1.7.patch/setup.py	2011-04-17 09:31:07.545708559 +0200
-@@ -83,7 +83,7 @@
- # --------------------------------------------------------------------
- 
- from distutils import sysconfig
--from distutils.core import Extension, setup
-+from setuptools import Extension, setup
- from distutils.command.build_ext import build_ext
- 
- try:

packages/python/graphics/Pillow/package.mk

@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="Imaging"
-PKG_VERSION="1.1.7"
+PKG_NAME="Pillow"
+PKG_VERSION="2.7.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.pythonware.com/products/pil/"
-PKG_URL="http://effbot.org/media/downloads/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://pypi.python.org/packages/source/P/Pillow/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python distutilscross:host zlib freetype libjpeg-turbo"
 PKG_PRIORITY="optional"
 PKG_SECTION="python"

packages/python/graphics/Pillow/patches/Pillow-2.7.0-crosscompiling-0.1.patch

@@ -0,0 +1,24 @@
+--- a/setup.py
++++ b/setup.py
+@@ -337,21 +337,6 @@
+             else:
+                 TCL_ROOT = None
+ 
+-        # add standard directories
+-
+-        # look for tcl specific subdirectory (e.g debian)
+-        if _tkinter:
+-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
+-            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")
+-
+         # on Windows, look for the OpenJPEG libraries in the location that
+         # the official installer puts them
+         if sys.platform == "win32":

packages/virtual/mediacenter/package.mk

@@ -38,7 +38,7 @@ done
 
 if [ "$MEDIACENTER" = "kodi" ]; then
 # some python stuff needed for various addons
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Imaging"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Pillow"
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET simplejson"
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto"