Skip to content

Commit e8d186c

Browse files
authored
Merge pull request #67 from thexai/Pillow-12.2.0
Bump Python to 3.14.4 / Pillow to 12.2.0
2 parents 95e00b5 + 891b92b commit e8d186c

4 files changed

Lines changed: 41 additions & 18 deletions

File tree

CMakeLists.txt

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,20 @@ add_dependency_project_package(libiconv 1.19)
145145

146146
ExternalProject_Add(openssl
147147
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
148-
URL https://www.openssl.org/source/openssl-3.0.19.tar.gz
149-
URL_HASH SHA256=fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072
148+
URL https://www.openssl.org/source/openssl-3.0.20.tar.gz
149+
URL_HASH SHA256=c80a01dfc70ece4dc21168932c37739042d404d46ccc81a5986dd75314ecda6f
150150
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
151151
CMAKE_ARGS
152152
${ADDITIONAL_ARGS}
153153
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
154154
)
155-
add_dependency_project_package(openssl 3.0.19)
155+
add_dependency_project_package(openssl 3.0.20)
156156

157157
ExternalProject_Add(zlib
158158
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
159159
URL https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.gz
160160
URL_HASH SHA256=bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16
161+
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
161162
CMAKE_ARGS
162163
${ADDITIONAL_ARGS}
163164
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
@@ -167,8 +168,8 @@ add_dependency_project_package(zlib 1.3.2)
167168

168169
ExternalProject_Add(xz
169170
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
170-
URL https://github.com/tukaani-project/xz/releases/download/v5.8.1/xz-5.8.1.tar.gz
171-
URL_HASH SHA256=507825b599356c10dca1cd720c9d0d0c9d5400b9de300af00e4d1ea150795543
171+
URL https://github.com/tukaani-project/xz/releases/download/v5.8.3/xz-5.8.3.tar.gz
172+
URL_HASH SHA256=3d3a1b973af218114f4f889bbaa2f4c037deaae0c8e815eec381c3d546b974a0
172173
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
173174
CMAKE_ARGS
174175
${ADDITIONAL_ARGS}
@@ -179,7 +180,7 @@ ExternalProject_Add(xz
179180
-DXZ_TOOL_LZMADEC:BOOL=OFF
180181
-DXZ_DOC:BOOL=OFF
181182
)
182-
add_dependency_project_package(xz 5.8.1)
183+
add_dependency_project_package(xz 5.8.3)
183184

184185
ExternalProject_Add(miniwdk
185186
GIT_REPOSITORY https://github.com/Paxxi/miniwdk
@@ -194,14 +195,14 @@ ExternalProject_Add(miniwdk
194195

195196
ExternalProject_Add(freetype
196197
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
197-
URL https://sourceforge.net/projects/freetype/files/freetype2/2.14.2/freetype-2.14.2.tar.xz
198-
URL_HASH SHA256=4b62dcab4c920a1a860369933221814362e699e26f55792516d671e6ff55b5e1
198+
URL https://sourceforge.net/projects/freetype/files/freetype2/2.14.3/freetype-2.14.3.tar.xz
199+
URL_HASH SHA256=36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f
199200
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
200201
CMAKE_ARGS
201202
${ADDITIONAL_ARGS}
202203
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
203204
)
204-
add_dependency_project_package(freetype 2.14.2)
205+
add_dependency_project_package(freetype 2.14.3)
205206

206207
ExternalProject_Add(fstrcmp
207208
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
@@ -257,15 +258,15 @@ add_dependency_project_package(harfbuzz 12.3.2)
257258

258259
ExternalProject_Add(sqlite
259260
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
260-
URL https://www.sqlite.org/2025/sqlite-amalgamation-3500400.zip
261-
URL_HASH SHA256=1d3049dd0f830a025a53105fc79fd2ab9431aea99e137809d064d8ee8356b032
261+
URL https://sqlite.org/2026/sqlite-amalgamation-3510300.zip
262+
URL_HASH SHA256=acb1e6f5d832484bf6d32b681e858c38add8b2acdfd42ac5df24b8afb46552b4
262263
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
263264
CMAKE_ARGS
264265
${ADDITIONAL_ARGS}
265266
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
266267
-DBUILD_SHARED_LIBS:BOOL=ON
267268
)
268-
add_dependency_project_package(sqlite 3500400)
269+
add_dependency_project_package(sqlite 3.51.3)
269270

270271
ExternalProject_Add(tinyxml
271272
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
@@ -474,14 +475,14 @@ add_dependency_project_package(zstd 1.5.7)
474475
ExternalProject_Add(python
475476
DEPENDS bzip2 openssl sqlite zlib expat libffi xz zstd
476477
GIT_REPOSITORY https://github.com/thexai/cpython
477-
GIT_TAG 88fc9e4fbd3e90b1437cae04234d2deb039a8414
478+
GIT_TAG c56bbd87e3922bad47ad12330644c1573bb95682
478479
GIT_SHALLOW ON
479480
CMAKE_ARGS
480481
${ADDITIONAL_ARGS}
481482
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
482483
-DCMAKE_PREFIX_PATH:PATH=${PREFIX}%3B%3B${PREFIX}/bzip2%3B%3B${PREFIX}/openssl%3B%3B${PREFIX}/sqlite%3B%3B${PREFIX}/zlib%3B%3B${PREFIX}/libffi%3B%3B${PREFIX}/xz%3B%3B${PREFIX}/expat%3B%3B${PREFIX}/zstd
483484
)
484-
add_dependency_project_package(python 3.14.3)
485+
add_dependency_project_package(python 3.14.4)
485486

486487
ExternalProject_Add(libjpeg-turbo
487488
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
@@ -503,14 +504,14 @@ add_dependency_project_package(libjpeg-turbo 3.1.4)
503504
ExternalProject_Add(pillow
504505
DEPENDS freetype libjpeg-turbo python zlib
505506
GIT_REPOSITORY https://github.com/thexai/Pillow
506-
GIT_TAG e1cfac60729fc5600e4ef7f0076b539959caa5b6
507+
GIT_TAG 09c9a0bbaa992154f2d1f72dc9e924525576b411
507508
GIT_SHALLOW ON
508509
CMAKE_ARGS
509510
${ADDITIONAL_ARGS}
510511
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
511512
-DCMAKE_PREFIX_PATH:PATH=${PREFIX}%3B%3B${PREFIX}/freetype%3B%3B${PREFIX}/libjpeg-turbo%3B%3B${PREFIX}/python%3B%3B${PREFIX}/zlib
512513
)
513-
add_dependency_project_package(pillow 12.1.1)
514+
add_dependency_project_package(pillow 12.2.0)
514515

515516
ExternalProject_Add(pycryptodome
516517
DEPENDS python

patches/openssl.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ index 0000000000..937a38db86
66
@@ -0,0 +1,106 @@
77
+cmake_minimum_required(VERSION 3.15)
88
+
9-
+project(openssl VERSION 3.0.19 LANGUAGES C)
9+
+project(openssl VERSION 3.0.20 LANGUAGES C)
1010
+
1111
+include(CheckSymbolExists)
1212
+check_symbol_exists(_X86_ "Windows.h" _X86_)

patches/sqlite.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@@ -0,0 +1,84 @@
44
+cmake_minimum_required(VERSION 3.2)
55
+
6-
+project(sqlite3 VERSION 3.50.4 LANGUAGES C)
6+
+project(sqlite3 VERSION 3.51.3 LANGUAGES C)
77
+
88
+if(MSVC)
99
+ set(CMAKE_DEBUG_POSTFIX "d")

patches/zlib.diff

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index e103c40..ac8b126 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -260,6 +260,17 @@ if(ZLIB_INSTALL)
6+
FILE ZLIB-static.cmake
7+
NAMESPACE ZLIB::
8+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib)
9+
+
10+
+ if(MSVC)
11+
+ install(
12+
+ FILES ${PROJECT_BINARY_DIR}/RelWithDebInfo/zs.pdb
13+
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}"
14+
+ CONFIGURATIONS RelWithDebInfo)
15+
+ install(
16+
+ FILES ${PROJECT_BINARY_DIR}/Debug/zsd.pdb
17+
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}"
18+
+ CONFIGURATIONS Debug)
19+
+ endif(MSVC)
20+
endif(ZLIB_BUILD_STATIC)
21+
22+
configure_package_config_file(

0 commit comments

Comments
 (0)