From 8d97c1021b5d9065c7774ac0922636f7ede75ce2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 4 Mar 2025 06:50:24 +0530 Subject: [PATCH] Update onnxruntime to get it to build with Xcode 15.4 --- bypy/macos.conf | 3 ++- bypy/macos/__main__.py | 2 +- bypy/sources.json | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bypy/macos.conf b/bypy/macos.conf index 1eb132ef7f..3bb4b7dd38 100644 --- a/bypy/macos.conf +++ b/bypy/macos.conf @@ -6,5 +6,6 @@ root '/Users/Shared/calibre-build' python '/usr/bin/python3' rsync '/usr/local/bin/rsync' # see https://doc.qt.io/qt-6/macos.html -deploy_target '12.0' +# further, onnxruntime needs macOS 13.3 https://github.com/microsoft/onnxruntime/pull/23308 +deploy_target '13.3' universal 'true' diff --git a/bypy/macos/__main__.py b/bypy/macos/__main__.py index 5c22c1f6f5..c55c9760b0 100644 --- a/bypy/macos/__main__.py +++ b/bypy/macos/__main__.py @@ -47,7 +47,7 @@ APPNAME, VERSION = calibre_constants['appname'], calibre_constants['version'] basenames, main_modules, main_functions = calibre_constants['basenames'], calibre_constants['modules'], calibre_constants['functions'] ARCH_FLAGS = '-arch x86_64 -arch arm64'.split() EXPECTED_ARCHES = {'x86_64', 'arm64'} -MINIMUM_SYSTEM_VERSION = '13.0.0' +MINIMUM_SYSTEM_VERSION = '13.3.0' def compile_launcher_lib(contents_dir, base, pyver, inc_dir): diff --git a/bypy/sources.json b/bypy/sources.json index e129b040f0..cc8223d5d1 100644 --- a/bypy/sources.json +++ b/bypy/sources.json @@ -1197,9 +1197,9 @@ "name": "onnx", "comment": "This is newer than the version needed for the version of piper-phonemize to get it to build on macOS (see CMakeLists.txt in piper-phonemize)", "unix": { - "filename": "onnx-1.19.0.tar.gz", - "hash": "sha256:dd945b2fb8c2e7df7243e9d96c0293f45350058f0f713f66c519834a49a6c99d", - "urls": ["https://github.com/microsoft/onnxruntime/archive/refs/tags/v1.19.0.tar.gz"] + "filename": "onnx-1.20.2.tar.gz", + "hash": "sha256:6780b0b4f11d22f30a827dbbd3bd626e85e9c48e98719e9a535eda543446eab8", + "urls": ["https://github.com/microsoft/onnxruntime/archive/refs/tags/v1.20.2.tar.gz"] } }, {