Merge branch 'main' into zlib-ng

This commit is contained in:
Andrew Murray 2024-10-26 11:53:47 +11:00 committed by GitHub
commit c07e089fd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -129,8 +129,7 @@ V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])
# dependencies, listed in order of compilation # dependencies, listed in order of compilation
DEPS: dict[str, dict[str, Any]] = { DEPS: dict[str, dict[str, Any]] = {
"libjpeg": { "libjpeg": {
"url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/" "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/FILENAME/download",
f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz/download",
"filename": f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz", "filename": f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz",
"dir": f"libjpeg-turbo-{V['JPEGTURBO']}", "dir": f"libjpeg-turbo-{V['JPEGTURBO']}",
"license": ["README.ijg", "LICENSE.md"], "license": ["README.ijg", "LICENSE.md"],
@ -178,7 +177,7 @@ DEPS: dict[str, dict[str, Any]] = {
"libs": [r"zlib.lib"], "libs": [r"zlib.lib"],
}, },
"xz": { "xz": {
"url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/xz-{V['XZ']}.tar.gz", "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/FILENAME",
"filename": f"xz-{V['XZ']}.tar.gz", "filename": f"xz-{V['XZ']}.tar.gz",
"dir": f"xz-{V['XZ']}", "dir": f"xz-{V['XZ']}",
"license": "COPYING", "license": "COPYING",
@ -191,7 +190,7 @@ DEPS: dict[str, dict[str, Any]] = {
"libs": [r"lzma.lib"], "libs": [r"lzma.lib"],
}, },
"libwebp": { "libwebp": {
"url": f"http://downloads.webmproject.org/releases/webp/libwebp-{V['LIBWEBP']}.tar.gz", "url": "http://downloads.webmproject.org/releases/webp/FILENAME",
"filename": f"libwebp-{V['LIBWEBP']}.tar.gz", "filename": f"libwebp-{V['LIBWEBP']}.tar.gz",
"dir": f"libwebp-{V['LIBWEBP']}", "dir": f"libwebp-{V['LIBWEBP']}",
"license": "COPYING", "license": "COPYING",
@ -213,7 +212,7 @@ DEPS: dict[str, dict[str, Any]] = {
"libs": [r"libsharpyuv.lib", r"libwebp*.lib"], "libs": [r"libsharpyuv.lib", r"libwebp*.lib"],
}, },
"libtiff": { "libtiff": {
"url": f"https://download.osgeo.org/libtiff/tiff-{V['TIFF']}.tar.gz", "url": "https://download.osgeo.org/libtiff/FILENAME",
"filename": f"tiff-{V['TIFF']}.tar.gz", "filename": f"tiff-{V['TIFF']}.tar.gz",
"dir": f"tiff-{V['TIFF']}", "dir": f"tiff-{V['TIFF']}",
"license": "LICENSE.md", "license": "LICENSE.md",
@ -271,7 +270,7 @@ DEPS: dict[str, dict[str, Any]] = {
"libs": ["*.lib"], "libs": ["*.lib"],
}, },
"freetype": { "freetype": {
"url": f"https://download.savannah.gnu.org/releases/freetype/freetype-{V['FREETYPE']}.tar.gz", "url": "https://download.savannah.gnu.org/releases/freetype/FILENAME",
"filename": f"freetype-{V['FREETYPE']}.tar.gz", "filename": f"freetype-{V['FREETYPE']}.tar.gz",
"dir": f"freetype-{V['FREETYPE']}", "dir": f"freetype-{V['FREETYPE']}",
"license": ["LICENSE.TXT", r"docs\FTL.TXT", r"docs\GPLv2.TXT"], "license": ["LICENSE.TXT", r"docs\FTL.TXT", r"docs\GPLv2.TXT"],
@ -306,7 +305,7 @@ DEPS: dict[str, dict[str, Any]] = {
"libs": [r"objs\{msbuild_arch}\Release Static\freetype.lib"], "libs": [r"objs\{msbuild_arch}\Release Static\freetype.lib"],
}, },
"lcms2": { "lcms2": {
"url": f"{SF_PROJECTS}/lcms/files/lcms/{V['LCMS2']}/lcms2-{V['LCMS2']}.tar.gz/download", # noqa: E501 "url": f"{SF_PROJECTS}/lcms/files/lcms/{V['LCMS2']}/FILENAME/download",
"filename": f"lcms2-{V['LCMS2']}.tar.gz", "filename": f"lcms2-{V['LCMS2']}.tar.gz",
"dir": f"lcms2-{V['LCMS2']}", "dir": f"lcms2-{V['LCMS2']}",
"license": "LICENSE", "license": "LICENSE",
@ -500,7 +499,7 @@ def extract_dep(url: str, filename: str, prefs: dict[str, str]) -> None:
except RuntimeError as exc: except RuntimeError as exc:
# Otherwise try upstream # Otherwise try upstream
print(exc) print(exc)
download_dep(url, file) download_dep(url.replace("FILENAME", filename), file)
print("Extracting " + filename) print("Extracting " + filename)
sources_dir_abs = os.path.abspath(sources_dir) sources_dir_abs = os.path.abspath(sources_dir)