jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pillow: update to Pillow-5.1.0

Browse Source
This commit is contained in:
MilhouseVH 2018-05-28 02:38:40 +01:00
parent fd17a54cd0
commit 82395ecc81
2 changed files with 15 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/python/graphics/Pillow/package.mk
View File

@ -17,8 +17,8 @@
################################################################################ ################################################################################
PKG_NAME="Pillow" PKG_NAME="Pillow"
PKG_VERSION="3.2.0" PKG_VERSION="5.1.0"
PKG_SHA256="64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a" PKG_SHA256="cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="BSD" PKG_LICENSE="BSD"
PKG_SITE="http://www.pythonware.com/products/pil/" PKG_SITE="http://www.pythonware.com/products/pil/"

104
packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch
View File

@ -1,93 +1,13 @@
diff -Naur Pillow-3.1.0/setup.py Pillow-3.1.0.patch/setup.py diff --git a/setup.py b/setup.py
--- Pillow-3.1.0/setup.py 2016-01-04 11:07:30.000000000 +0100 index 4a0ad86c5..c07e1a938 100755
+++ Pillow-3.1.0.patch/setup.py 2016-01-11 02:05:31.504822915 +0100 --- a/setup.py
@@ -236,65 +236,10 @@ +++ b/setup.py
_add_directory(include_dirs, "/usr/X11/include") @@ -194,7 +194,7 @@ class pil_build_ext(build_ext):
]
elif sys.platform.startswith("linux"): def initialize_options(self):
- arch_tp = (plat.processor(), plat.architecture()[0]) - self.disable_platform_guessing = None
- if arch_tp == ("x86_64", "32bit"): + self.disable_platform_guessing = True
- # 32-bit build on 64-bit machine. build_ext.initialize_options(self)
- _add_directory(library_dirs, "/usr/lib/i386-linux-gnu") for x in self.feature:
- else: setattr(self, 'disable_%s' % x, None)
- for platform_ in arch_tp:
-
- if not platform_:
- continue
-
- 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")
- break
- elif platform_ in ["i386", "i686", "32bit"]:
- _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")
- break
- elif platform_ in ["arm", "armv7l"]:
- _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")
- break
- elif platform_ in ["ppc"]:
- _add_directory(library_dirs, "/usr/lib/ppc-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")
- break
- elif platform_ in ["s390"]:
- _add_directory(library_dirs, "/usr/lib/s390-linux-gnu")
- break
- else:
- raise ValueError(
- "Unable to identify Linux platform: `%s`" % platform_)
-
- # XXX Kludge. Above /\ we brute force support multiarch. Here we
- # try Barry's more general approach. Afterward, something should
- # work ;-)
- self.add_multiarch_paths()
+ pass
elif sys.platform.startswith("gnu"):
- self.add_multiarch_paths()
+ pass
elif sys.platform.startswith("freebsd"):
_add_directory(library_dirs, "/usr/local/lib")
@@ -345,21 +289,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":