Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Pillow: update to Pillow-3.2.0
Signed-off-by: Stephan Raue <stephan@openelec.tv>
  • Loading branch information
sraue committed Apr 5, 2016
1 parent 28a9f41 commit 331b05b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 26 deletions.
2 changes: 1 addition & 1 deletion packages/python/graphics/Pillow/package.mk
Expand Up @@ -17,7 +17,7 @@
################################################################################

PKG_NAME="Pillow"
PKG_VERSION="3.1.0"
PKG_VERSION="3.2.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
Expand Down
@@ -1,7 +1,7 @@
diff -Naur Pillow-3.1.0/setup.py Pillow-3.1.0.patch/setup.py
--- Pillow-3.1.0/setup.py 2016-01-04 11:07:30.000000000 +0100
+++ Pillow-3.1.0.patch/setup.py 2016-01-11 02:05:31.504822915 +0100
@@ -241,66 +241,10 @@
diff -Naur Pillow-3.2.0/setup.py Pillow-3.2.0.patch/setup.py
--- Pillow-3.2.0/setup.py 2016-04-01 15:10:57.000000000 +0200
+++ Pillow-3.2.0.patch/setup.py 2016-04-05 15:59:09.938928539 +0200
@@ -236,65 +236,10 @@
_add_directory(include_dirs, "/usr/X11/include")

elif sys.platform.startswith("linux"):
Expand All @@ -18,38 +18,37 @@ diff -Naur Pillow-3.1.0/setup.py Pillow-3.1.0.patch/setup.py
- if platform_ in ["x86_64", "64bit"]:
- _add_directory(library_dirs, "/lib64")
- _add_directory(library_dirs, "/usr/lib64")
- _add_directory(
- library_dirs, "/usr/lib/x86_64-linux-gnu")
- _add_directory(library_dirs,
- "/usr/lib/x86_64-linux-gnu")
- break
- elif platform_ in ["i386", "i686", "32bit"]:
- _add_directory(
- library_dirs, "/usr/lib/i386-linux-gnu")
- _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
- break
- elif platform_ in ["aarch64"]:
- _add_directory(library_dirs, "/usr/lib64")
- _add_directory(
- library_dirs, "/usr/lib/aarch64-linux-gnu")
- _add_directory(library_dirs,
- "/usr/lib/aarch64-linux-gnu")
- break
- elif platform_ in ["arm", "armv7l"]:
- _add_directory(
- library_dirs, "/usr/lib/arm-linux-gnueabi")
- _add_directory(library_dirs,
- "/usr/lib/arm-linux-gnueabi")
- break
- elif platform_ in ["ppc64"]:
- _add_directory(library_dirs, "/usr/lib64")
- _add_directory(
- library_dirs, "/usr/lib/ppc64-linux-gnu")
- _add_directory(
- library_dirs, "/usr/lib/powerpc64-linux-gnu")
- _add_directory(library_dirs,
- "/usr/lib/ppc64-linux-gnu")
- _add_directory(library_dirs,
- "/usr/lib/powerpc64-linux-gnu")
- break
- elif platform_ in ["ppc"]:
- _add_directory(library_dirs, "/usr/lib/ppc-linux-gnu")
- _add_directory(
- library_dirs, "/usr/lib/powerpc-linux-gnu")
- _add_directory(library_dirs,
- "/usr/lib/powerpc-linux-gnu")
- break
- elif platform_ in ["s390x"]:
- _add_directory(library_dirs, "/usr/lib64")
- _add_directory(
- library_dirs, "/usr/lib/s390x-linux-gnu")
- _add_directory(library_dirs,
- "/usr/lib/s390x-linux-gnu")
- break
- elif platform_ in ["s390"]:
- _add_directory(library_dirs, "/usr/lib/s390-linux-gnu")
Expand All @@ -70,12 +69,10 @@ diff -Naur Pillow-3.1.0/setup.py Pillow-3.1.0.patch/setup.py

elif sys.platform.startswith("freebsd"):
_add_directory(library_dirs, "/usr/local/lib")
@@ -345,21 +289,6 @@
else:
TCL_ROOT = None
@@ -345,19 +290,6 @@

# add standard directories

- # add standard directories
-
- # look for tcl specific subdirectory (e.g debian)
- if _tkinter:
- tcl_dir = "/usr/include/tcl" + TCL_VERSION
Expand Down

0 comments on commit 331b05b

Please sign in to comment.