mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Pillow: update to 10.1.0
This commit is contained in:
parent
bb0e8232c2
commit
0bbc56ec87
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="Pillow"
|
||||
PKG_VERSION="10.0.1"
|
||||
PKG_SHA256="5df55f87434f1b42d9ebe4247ed50a0f0742cd1ad5be2820e3d1b1f4b4bc696f"
|
||||
PKG_VERSION="10.1.0"
|
||||
PKG_SHA256="39ca46877a38414abd0c7ab15ee885b72efd884c4a43f5a82697685917b7704c"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="https://python-pillow.org/"
|
||||
PKG_URL="https://github.com/python-pillow/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
|
||||
|
@ -1,62 +0,0 @@
|
||||
From d17947e802498a1315ea070cb0df5f01cb5c43c0 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Sat, 8 Jul 2023 12:39:40 +0000
|
||||
Subject: [PATCH] Fix missing symbols as libtiff can depend on libjpeg
|
||||
|
||||
when compiling Pillow with libtiff and libjpeg (with jpeg12 enabled -
|
||||
which is the default with libjpeg-3.0.0) the libtiff object
|
||||
tif_jpeg_12.c.o uses the following libjpeg12 functions:
|
||||
jpeg12_read_raw_data, jpeg12_read_scanlines, jpeg12_write_raw_data,
|
||||
jpeg12_write_scanlines.
|
||||
|
||||
update the ordering of libs.append(feature.tiff) to be before
|
||||
libs.append(feature.jpeg) to allow the linker to include the required
|
||||
functions.
|
||||
|
||||
this issue occurs when the libtiff and libjpeg libraries are static
|
||||
(not shared.)
|
||||
|
||||
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
---
|
||||
setup.py | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 024634ad8..baf7b9395 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -816,6 +816,15 @@ class pil_build_ext(build_ext):
|
||||
|
||||
libs = self.add_imaging_libs.split()
|
||||
defs = []
|
||||
+ if feature.tiff:
|
||||
+ libs.append(feature.tiff)
|
||||
+ defs.append(("HAVE_LIBTIFF", None))
|
||||
+ if sys.platform == "win32":
|
||||
+ # This define needs to be defined if-and-only-if it was defined
|
||||
+ # when compiling LibTIFF. LibTIFF doesn't expose it in `tiffconf.h`,
|
||||
+ # so we have to guess; by default it is defined in all Windows builds.
|
||||
+ # See #4237, #5243, #5359 for more information.
|
||||
+ defs.append(("USE_WIN32_FILEIO", None))
|
||||
if feature.jpeg:
|
||||
libs.append(feature.jpeg)
|
||||
defs.append(("HAVE_LIBJPEG", None))
|
||||
@@ -830,15 +839,6 @@ class pil_build_ext(build_ext):
|
||||
if feature.imagequant:
|
||||
libs.append(feature.imagequant)
|
||||
defs.append(("HAVE_LIBIMAGEQUANT", None))
|
||||
- if feature.tiff:
|
||||
- libs.append(feature.tiff)
|
||||
- defs.append(("HAVE_LIBTIFF", None))
|
||||
- if sys.platform == "win32":
|
||||
- # This define needs to be defined if-and-only-if it was defined
|
||||
- # when compiling LibTIFF. LibTIFF doesn't expose it in `tiffconf.h`,
|
||||
- # so we have to guess; by default it is defined in all Windows builds.
|
||||
- # See #4237, #5243, #5359 for more information.
|
||||
- defs.append(("USE_WIN32_FILEIO", None))
|
||||
if feature.xcb:
|
||||
libs.append(feature.xcb)
|
||||
defs.append(("HAVE_XCB", None))
|
||||
--
|
||||
2.34.1
|
||||
|
Loading…
x
Reference in New Issue
Block a user