From 97ba3a70d3080c8bb6286b62c0d6ac0f86c1cf53 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Oct 2023 03:51:17 +0000 Subject: [PATCH 1/4] spirv-headers: update to githash e867c06 Supports build of glslang 13.1.0 --- packages/graphics/vulkan/spirv-headers/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/vulkan/spirv-headers/package.mk b/packages/graphics/vulkan/spirv-headers/package.mk index 4987317885..2e6b7801d4 100644 --- a/packages/graphics/vulkan/spirv-headers/package.mk +++ b/packages/graphics/vulkan/spirv-headers/package.mk @@ -6,8 +6,8 @@ PKG_NAME="spirv-headers" # The SPIRV-Headers pkg_version needs to match the compatible (known_good) glslang pkg_version. # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json # When updating glslang pkg_version please update to the known_good spirv-headers pkg_version. -PKG_VERSION="124a9665e464ef98b8b718d572d5f329311061eb" -PKG_SHA256="a039140fa01380be8cbe19bbb4f1bb475a620bac7eb80b290fd407c5ff1118e0" +PKG_VERSION="e867c06631767a2d96424cbec530f9ee5e78180f" +PKG_SHA256="98f8afbbadaea4a2c7d7d1a549785baf5ff8ccdb046ca176d00c0e58dcb09c79" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/SPIRV-headers" PKG_URL="https://github.com/KhronosGroup/SPIRV-headers/archive/${PKG_VERSION}.tar.gz" From c64e418f4de1976e4373b3a22d3e4e211e0a96b6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Oct 2023 03:51:18 +0000 Subject: [PATCH 2/4] spirv-tools: update to githash 360d469 Supports build of glslang 13.1.0 --- packages/graphics/vulkan/spirv-tools/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/vulkan/spirv-tools/package.mk b/packages/graphics/vulkan/spirv-tools/package.mk index 23b8ec3fb7..3bcfc50b36 100644 --- a/packages/graphics/vulkan/spirv-tools/package.mk +++ b/packages/graphics/vulkan/spirv-tools/package.mk @@ -6,8 +6,8 @@ PKG_NAME="spirv-tools" # The SPIRV-Tools pkg_version needs to match the compatible (known_good) glslang pkg_version. # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json # When updating glslang pkg_version please update to the known_good spirv-tools pkg_version. -PKG_VERSION="89ca3aa571fe238944b31e88d5d8fe75fab0227a" -PKG_SHA256="6f401744c1f1e1fb30f39f189a18858b3e98000ce3bf0537b634d2cab78bda40" +PKG_VERSION="360d469b9eac54d6c6e20f609f9ec35e3a5380ad" +PKG_SHA256="7370b821bc223965090c35d18dae74c0bb913f9000605a729901fab0954a6fac" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/SPIRV-Tools" PKG_URL="https://github.com/KhronosGroup/SPIRV-Tools/archive/${PKG_VERSION}.tar.gz" From bb0e8232c21423d7a0b018f71d77270558c321c4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Oct 2023 03:51:19 +0000 Subject: [PATCH 3/4] glslang: update to 13.1.0 Release notes: https://github.com/KhronosGroup/glslang/releases Supported by: - spirv-tools: 360d469b9eac54d6c6e20f609f9ec35e3a5380ad - spirv-headers: e867c06631767a2d96424cbec530f9ee5e78180f --- packages/graphics/vulkan/glslang/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/vulkan/glslang/package.mk b/packages/graphics/vulkan/glslang/package.mk index c807cd4aec..2d9a4109b9 100644 --- a/packages/graphics/vulkan/glslang/package.mk +++ b/packages/graphics/vulkan/glslang/package.mk @@ -6,8 +6,8 @@ PKG_NAME="glslang" # The SPIRV-Tools & SPIRV-Headers pkg_version/s need to match the compatible (known_good) glslang pkg_version. # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json # When updating glslang pkg_version please update to the known_good spirv-tools & spirv-headers pkg_version/s. -PKG_VERSION="13.0.0" -PKG_SHA256="bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715" +PKG_VERSION="13.1.0" +PKG_SHA256="926808f4bf129264a1b7d969978881ec041bb902ad49a180ba74270df7178494" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/glslang" PKG_URL="https://github.com/KhronosGroup/glslang/archive/${PKG_VERSION}.tar.gz" From 0bbc56ec876b38a4fc5fe9f20f561987ddae785d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 16 Oct 2023 10:46:34 +0000 Subject: [PATCH 4/4] Pillow: update to 10.1.0 --- packages/python/graphics/Pillow/package.mk | 4 +- ...ols-as-libtiff-can-depend-on-libjpeg.patch | 62 ------------------- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 packages/python/graphics/Pillow/patches/Pillow-0002-Fix-missing-symbols-as-libtiff-can-depend-on-libjpeg.patch diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk index a1cdd42d61..7955210df5 100644 --- a/packages/python/graphics/Pillow/package.mk +++ b/packages/python/graphics/Pillow/package.mk @@ -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" diff --git a/packages/python/graphics/Pillow/patches/Pillow-0002-Fix-missing-symbols-as-libtiff-can-depend-on-libjpeg.patch b/packages/python/graphics/Pillow/patches/Pillow-0002-Fix-missing-symbols-as-libtiff-can-depend-on-libjpeg.patch deleted file mode 100644 index 69d07dbeb0..0000000000 --- a/packages/python/graphics/Pillow/patches/Pillow-0002-Fix-missing-symbols-as-libtiff-can-depend-on-libjpeg.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d17947e802498a1315ea070cb0df5f01cb5c43c0 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -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 ---- - 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 -