From d33e8f0f94ca9ce21b0d6ca86be357ceb7ed8f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Thu, 26 Oct 2023 12:17:27 +0200 Subject: [PATCH] Update more dependencies to their latest versions --- patches/gmp.patch | 15 --------------- scripts/build-ffmpeg.py | 16 ++++++++-------- 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 patches/gmp.patch diff --git a/patches/gmp.patch b/patches/gmp.patch deleted file mode 100644 index 0719a8a..0000000 --- a/patches/gmp.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100 -+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200 -@@ -88,8 +88,11 @@ - - abs_csize = ABS (csize); - -+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8)) -+ return 0; /* Bit size overflows */ -+ - /* round up to a multiple of limbs */ -- abs_xsize = BITS_TO_LIMBS (abs_csize*8); -+ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8); - - if (abs_xsize != 0) - { diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py index 8da6f6c..d38e17e 100644 --- a/scripts/build-ffmpeg.py +++ b/scripts/build-ffmpeg.py @@ -86,7 +86,7 @@ # libraries Package( name="xz", - source_url="https://tukaani.org/xz/xz-5.2.5.tar.bz2", + source_url="https://tukaani.org/xz/xz-5.4.4.tar.bz2", build_arguments=[ "--disable-doc", "--disable-lzma-links", @@ -100,7 +100,7 @@ ), Package( name="gmp", - source_url="https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz", + source_url="https://gmplib.org/download/gmp/gmp-6.3.0.tar.xz", # out-of-tree builds fail on Windows build_dir=".", ), @@ -113,17 +113,17 @@ Package( name="xml2", requires=["xz"], - source_url="https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.13.tar.xz", + source_url="https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.5.tar.xz", build_arguments=["--without-python"], ), Package( name="unistring", - source_url="https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.gz", + source_url="https://ftp.gnu.org/gnu/libunistring/libunistring-1.1.tar.xz", ), Package( name="freetype", requires=["png"], - source_url="https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.gz", + source_url="https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz", # At this point we have not built our own harfbuzz and we do NOT want to # pick up the system's harfbuzz. build_arguments=["--with-harfbuzz=no"], @@ -131,17 +131,17 @@ Package( name="fontconfig", requires=["freetype", "xml2"], - source_url="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.1.tar.bz2", + source_url="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz", build_arguments=["--disable-nls", "--enable-libxml2"], ), Package( name="fribidi", - source_url="https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz", + source_url="https://github.com/fribidi/fribidi/releases/download/v1.0.13/fribidi-1.0.13.tar.xz", ), Package( name="harfbuzz", requires=["freetype"], - source_url="https://github.com/harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz", + source_url="https://github.com/harfbuzz/harfbuzz/releases/download/8.2.2/harfbuzz-8.2.2.tar.xz", build_arguments=[ "--with-cairo=no", "--with-chafa=no",