mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
commit
39cf8c83ea
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="sqlite"
|
PKG_NAME="sqlite"
|
||||||
PKG_VERSION="autoconf-3100000"
|
PKG_VERSION="autoconf-3100100"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="PublicDomain"
|
PKG_LICENSE="PublicDomain"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="openssh"
|
PKG_NAME="openssh"
|
||||||
PKG_VERSION="7.1p1"
|
PKG_VERSION="7.1p2"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="Pillow"
|
PKG_NAME="Pillow"
|
||||||
PKG_VERSION="3.0.0"
|
PKG_VERSION="3.1.0"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="BSD"
|
PKG_LICENSE="BSD"
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index 90687d5..2f2be57 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -296,10 +296,9 @@ class pil_build_ext(build_ext):
|
|
||||||
# XXX Kludge. Above /\ we brute force support multiarch. Here we
|
|
||||||
# try Barry's more general approach. Afterward, something should
|
|
||||||
# work ;-)
|
|
||||||
- self.add_multiarch_paths()
|
|
||||||
|
|
||||||
elif sys.platform.startswith("gnu"):
|
|
||||||
- self.add_multiarch_paths()
|
|
||||||
+ pass
|
|
||||||
|
|
||||||
elif sys.platform.startswith("netbsd"):
|
|
||||||
_add_directory(library_dirs, "/usr/pkg/lib")
|
|
||||||
@@ -337,21 +336,6 @@ class pil_build_ext(build_ext):
|
|
||||||
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":
|
|
@ -0,0 +1,94 @@
|
|||||||
|
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 @@
|
||||||
|
_add_directory(include_dirs, "/usr/X11/include")
|
||||||
|
|
||||||
|
elif sys.platform.startswith("linux"):
|
||||||
|
- arch_tp = (plat.processor(), plat.architecture()[0])
|
||||||
|
- if arch_tp == ("x86_64", "32bit"):
|
||||||
|
- # 32-bit build on 64-bit machine.
|
||||||
|
- _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
|
||||||
|
- else:
|
||||||
|
- 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":
|
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="fuse"
|
PKG_NAME="fuse"
|
||||||
PKG_VERSION="2.9.4"
|
PKG_VERSION="2.9.5"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="libevdev"
|
PKG_NAME="libevdev"
|
||||||
PKG_VERSION="1.4.5"
|
PKG_VERSION="1.4.6"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user