From 8f03c80c6eaaaae92586bc357286c940e441a61b Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 30 Sep 2023 23:40:32 +0800 Subject: [PATCH 1/3] Drop kinetic and add mantic in workflow Signed-off-by: nyanmisaka --- .github/workflows/build.yaml | 2 +- .github/workflows/publish.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 18257486c2c..b42b0372060 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,7 +32,7 @@ jobs: uses: ./.github/workflows/_meta.yaml with: distro: 'ubuntu' - codenames: '["bionic", "focal", "jammy", "kinetic", "lunar"]' + codenames: '["bionic", "focal", "jammy", "lunar", "mantic"]' architectures: '["amd64", "arm64", "armhf"]' release: false diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 9232bfd3f22..f262df998b5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -22,7 +22,7 @@ jobs: uses: ./.github/workflows/_meta.yaml with: distro: 'ubuntu' - codenames: '["bionic", "focal", "jammy", "kinetic", "lunar"]' + codenames: '["bionic", "focal", "jammy", "lunar", "mantic"]' architectures: '["amd64", "arm64", "armhf"]' release: true secrets: @@ -69,8 +69,8 @@ jobs: {distro: 'ubuntu', codename: 'bionic'}, {distro: 'ubuntu', codename: 'focal'}, {distro: 'ubuntu', codename: 'jammy'}, - {distro: 'ubuntu', codename: 'kinetic'}, - {distro: 'ubuntu', codename: 'lunar'} + {distro: 'ubuntu', codename: 'lunar'}, + {distro: 'ubuntu', codename: 'mantic'} ] steps: - name: Sync mirrors and update symlinks From 35d92c5cc421ac25e989ab23cb091df85371292a Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Mon, 16 Oct 2023 20:04:30 +0800 Subject: [PATCH 2/3] Update dependencies Signed-off-by: nyanmisaka --- Dockerfile.win64.make | 2 +- builder/images/base-linux64/ct-ng-config | 51 ++++++++++++------- builder/images/base-linuxarm64/ct-ng-config | 51 ++++++++++++------- builder/images/base-win64/ct-ng-config | 45 ++++++++-------- builder/images/base/Dockerfile | 2 +- builder/scripts.d/10-mingw.sh | 2 +- builder/scripts.d/20-libiconv.sh | 6 +++ builder/scripts.d/20-libxml2.sh | 2 +- builder/scripts.d/20-zlib.sh | 2 +- builder/scripts.d/25-freetype.sh | 2 +- builder/scripts.d/25-openssl.sh | 32 +++++++++--- builder/scripts.d/25-xz.sh | 2 +- builder/scripts.d/35-fontconfig.sh | 2 +- builder/scripts.d/45-harfbuzz.sh | 2 +- builder/scripts.d/45-x11/10-xcbproto.sh | 2 +- builder/scripts.d/45-x11/10-xproto.sh | 2 +- builder/scripts.d/45-x11/10-xtrans.sh | 2 +- builder/scripts.d/45-x11/20-libxau.sh | 2 +- builder/scripts.d/45-x11/30-libxcb.sh | 2 +- builder/scripts.d/45-x11/40-libx11.sh | 2 +- builder/scripts.d/45-x11/50-libxext.sh | 2 +- builder/scripts.d/45-x11/50-libxi.sh | 2 +- builder/scripts.d/45-x11/50-libxrender.sh | 2 +- builder/scripts.d/45-x11/60-libglvnd.sh | 2 +- builder/scripts.d/45-x11/60-libxcursor.sh | 2 +- builder/scripts.d/45-x11/60-libxrandr.sh | 2 +- builder/scripts.d/50-dav1d.sh | 2 +- builder/scripts.d/50-libass.sh | 2 +- builder/scripts.d/50-libopus.sh | 2 +- builder/scripts.d/50-libvpx.sh | 2 +- builder/scripts.d/50-libwebp.sh | 2 +- builder/scripts.d/50-openmpt.sh | 2 +- builder/scripts.d/50-srt.sh | 2 +- builder/scripts.d/50-svtav1.sh | 2 +- builder/scripts.d/50-vaapi/30-libpciaccess.sh | 2 +- builder/scripts.d/50-vaapi/40-libdrm.sh | 2 +- builder/scripts.d/50-vaapi/50-libva.sh | 2 +- builder/scripts.d/50-vulkan/45-vulkan.sh | 2 +- builder/scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- builder/scripts.d/50-x265.sh | 2 +- docker-build-win64.sh | 8 +-- docker-build.sh | 18 ++++--- 42 files changed, 168 insertions(+), 113 deletions(-) diff --git a/Dockerfile.win64.make b/Dockerfile.win64.make index 3d7382b331b..cc5922f9b1e 100644 --- a/Dockerfile.win64.make +++ b/Dockerfile.win64.make @@ -1,5 +1,5 @@ #!/usr/bin/make -DISTRO=ubuntu:lunar +DISTRO=ubuntu:mantic .PHONY: Dockerfile Dockerfile: Dockerfile.win64.in sed 's/DISTRO/$(DISTRO)/' $< > $@ || rm -f $@ diff --git a/builder/images/base-linux64/ct-ng-config b/builder/images/base-linux64/ct-ng-config index df45b9a9361..5ac75e36195 100644 --- a/builder/images/base-linux64/ct-ng-config +++ b/builder/images/base-linux64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.152_89671bf Configuration +# crosstool-NG 1.25.0.232_c175b21 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_meson=y -CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_rsync=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_71_or_newer=y -CT_CONFIGURE_has_autoreconf_2_71_or_newer=y -CT_CONFIGURE_has_automake_1_16_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.152_89671bf" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -269,6 +267,9 @@ CT_LINUX_PATCH_GLOBAL=y # CT_LINUX_PATCH_LOCAL_BUNDLED is not set # CT_LINUX_PATCH_NONE is not set CT_LINUX_PATCH_ORDER="global" +# CT_LINUX_V_6_4 is not set +# CT_LINUX_V_6_3 is not set +# CT_LINUX_V_6_2 is not set # CT_LINUX_V_6_1 is not set # CT_LINUX_V_6_0 is not set # CT_LINUX_V_5_19 is not set @@ -452,6 +453,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set @@ -475,6 +477,10 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_GLIBC_SIGNATURE_FORMAT="packed/.sig" +CT_GLIBC_2_38_or_older=y +CT_GLIBC_older_than_2_38=y +CT_GLIBC_2_37_or_older=y +CT_GLIBC_older_than_2_37=y CT_GLIBC_2_36_or_older=y CT_GLIBC_older_than_2_36=y CT_GLIBC_2_34_or_older=y @@ -579,7 +585,8 @@ CT_GCC_PATCH_GLOBAL=y # CT_GCC_PATCH_LOCAL_BUNDLED is not set # CT_GCC_PATCH_NONE is not set CT_GCC_PATCH_ORDER="global" -CT_GCC_V_12=y +CT_GCC_V_13=y +# CT_GCC_V_12 is not set # CT_GCC_V_11 is not set # CT_GCC_V_10 is not set # CT_GCC_V_9 is not set @@ -588,12 +595,14 @@ CT_GCC_V_12=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="12.2.0" +CT_GCC_VERSION="13.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_later_than_13=y +CT_GCC_13_or_later=y CT_GCC_later_than_12=y CT_GCC_12_or_later=y CT_GCC_later_than_11=y @@ -766,7 +775,8 @@ CT_ISL_PATCH_GLOBAL=y # CT_ISL_PATCH_LOCAL_BUNDLED is not set # CT_ISL_PATCH_NONE is not set CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_25=y +CT_ISL_V_0_26=y +# CT_ISL_V_0_25 is not set # CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set @@ -778,7 +788,7 @@ CT_ISL_V_0_25=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_V_0_11 is not set -CT_ISL_VERSION="0.25" +CT_ISL_VERSION="0.26" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -829,7 +839,7 @@ CT_MPC_V_1_2=y # CT_MPC_V_1_1 is not set # CT_MPC_V_1_0 is not set CT_MPC_VERSION="1.2.1" -CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_FORMATS=".tar.gz" @@ -850,11 +860,12 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_LOCAL_BUNDLED is not set # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" -CT_MPFR_V_4_1=y +CT_MPFR_V_4_2=y +# CT_MPFR_V_4_1 is not set # CT_MPFR_V_4_0 is not set # CT_MPFR_V_3_1 is not set -CT_MPFR_VERSION="4.1.0" -CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" @@ -875,10 +886,11 @@ CT_NCURSES_PATCH_GLOBAL=y # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set # CT_NCURSES_PATCH_NONE is not set CT_NCURSES_PATCH_ORDER="global" -CT_NCURSES_V_6_2=y +CT_NCURSES_V_6_4=y +# CT_NCURSES_V_6_2 is not set # CT_NCURSES_V_6_1 is not set # CT_NCURSES_V_6_0 is not set -CT_NCURSES_VERSION="6.2" +CT_NCURSES_VERSION="6.4" CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)" CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -927,8 +939,9 @@ CT_ZSTD_PATCH_GLOBAL=y # CT_ZSTD_PATCH_LOCAL_BUNDLED is not set # CT_ZSTD_PATCH_NONE is not set CT_ZSTD_PATCH_ORDER="global" -CT_ZSTD_V_1_5_2=y -CT_ZSTD_VERSION="1.5.2" +CT_ZSTD_V_1_5_5=y +# CT_ZSTD_V_1_5_2 is not set +CT_ZSTD_VERSION="1.5.5" CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/" CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/builder/images/base-linuxarm64/ct-ng-config b/builder/images/base-linuxarm64/ct-ng-config index a070e17b3b2..939ed8c69e7 100644 --- a/builder/images/base-linuxarm64/ct-ng-config +++ b/builder/images/base-linuxarm64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.152_89671bf Configuration +# crosstool-NG 1.25.0.232_c175b21 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_meson=y -CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_rsync=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_71_or_newer=y -CT_CONFIGURE_has_autoreconf_2_71_or_newer=y -CT_CONFIGURE_has_automake_1_16_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.152_89671bf" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -276,6 +274,9 @@ CT_LINUX_PATCH_GLOBAL=y # CT_LINUX_PATCH_LOCAL_BUNDLED is not set # CT_LINUX_PATCH_NONE is not set CT_LINUX_PATCH_ORDER="global" +# CT_LINUX_V_6_4 is not set +# CT_LINUX_V_6_3 is not set +# CT_LINUX_V_6_2 is not set # CT_LINUX_V_6_1 is not set # CT_LINUX_V_6_0 is not set # CT_LINUX_V_5_19 is not set @@ -458,6 +459,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set @@ -481,6 +483,10 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_GLIBC_SIGNATURE_FORMAT="packed/.sig" +CT_GLIBC_2_38_or_older=y +CT_GLIBC_older_than_2_38=y +CT_GLIBC_2_37_or_older=y +CT_GLIBC_older_than_2_37=y CT_GLIBC_2_36_or_older=y CT_GLIBC_older_than_2_36=y CT_GLIBC_2_34_or_older=y @@ -591,7 +597,8 @@ CT_GCC_PATCH_GLOBAL=y # CT_GCC_PATCH_LOCAL_BUNDLED is not set # CT_GCC_PATCH_NONE is not set CT_GCC_PATCH_ORDER="global" -CT_GCC_V_12=y +CT_GCC_V_13=y +# CT_GCC_V_12 is not set # CT_GCC_V_11 is not set # CT_GCC_V_10 is not set # CT_GCC_V_9 is not set @@ -600,12 +607,14 @@ CT_GCC_V_12=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="12.2.0" +CT_GCC_VERSION="13.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_later_than_13=y +CT_GCC_13_or_later=y CT_GCC_later_than_12=y CT_GCC_12_or_later=y CT_GCC_later_than_11=y @@ -778,7 +787,8 @@ CT_ISL_PATCH_GLOBAL=y # CT_ISL_PATCH_LOCAL_BUNDLED is not set # CT_ISL_PATCH_NONE is not set CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_25=y +CT_ISL_V_0_26=y +# CT_ISL_V_0_25 is not set # CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set @@ -790,7 +800,7 @@ CT_ISL_V_0_25=y # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set # CT_ISL_V_0_11 is not set -CT_ISL_VERSION="0.25" +CT_ISL_VERSION="0.26" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -841,7 +851,7 @@ CT_MPC_V_1_2=y # CT_MPC_V_1_1 is not set # CT_MPC_V_1_0 is not set CT_MPC_VERSION="1.2.1" -CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_FORMATS=".tar.gz" @@ -862,11 +872,12 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_LOCAL_BUNDLED is not set # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" -CT_MPFR_V_4_1=y +CT_MPFR_V_4_2=y +# CT_MPFR_V_4_1 is not set # CT_MPFR_V_4_0 is not set # CT_MPFR_V_3_1 is not set -CT_MPFR_VERSION="4.1.0" -CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" @@ -887,10 +898,11 @@ CT_NCURSES_PATCH_GLOBAL=y # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set # CT_NCURSES_PATCH_NONE is not set CT_NCURSES_PATCH_ORDER="global" -CT_NCURSES_V_6_2=y +CT_NCURSES_V_6_4=y +# CT_NCURSES_V_6_2 is not set # CT_NCURSES_V_6_1 is not set # CT_NCURSES_V_6_0 is not set -CT_NCURSES_VERSION="6.2" +CT_NCURSES_VERSION="6.4" CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)" CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -939,8 +951,9 @@ CT_ZSTD_PATCH_GLOBAL=y # CT_ZSTD_PATCH_LOCAL_BUNDLED is not set # CT_ZSTD_PATCH_NONE is not set CT_ZSTD_PATCH_ORDER="global" -CT_ZSTD_V_1_5_2=y -CT_ZSTD_VERSION="1.5.2" +CT_ZSTD_V_1_5_5=y +# CT_ZSTD_V_1_5_2 is not set +CT_ZSTD_VERSION="1.5.5" CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/" CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/builder/images/base-win64/ct-ng-config b/builder/images/base-win64/ct-ng-config index 90c00bf1ec9..d388a1d54c5 100644 --- a/builder/images/base-win64/ct-ng-config +++ b/builder/images/base-win64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.152_89671bf Configuration +# crosstool-NG 1.25.0.232_c175b21 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_meson=y -CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_rsync=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_71_or_newer=y -CT_CONFIGURE_has_autoreconf_2_71_or_newer=y -CT_CONFIGURE_has_automake_1_16_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.152_89671bf" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -382,6 +380,10 @@ CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MINGW_W64_ARCHIVE_FORMATS=".tar.bz2 .zip" CT_MINGW_W64_SIGNATURE_FORMAT="packed/.sig" CT_MINGW_SECURE_API=y +# CT_MINGW_DEFAULT_MSVCRT_DEFAULT is not set +# CT_MINGW_DEFAULT_MSVCRT_MSVCRT is not set +CT_MINGW_DEFAULT_MSVCRT_UCRT=y +# CT_MINGW_DEFAULT_MSVCRT_CUSTOM is not set CT_MINGW_DIRECTX=y CT_MINGW_DDK=y CT_MINGW_TOOLS=y @@ -437,7 +439,8 @@ CT_GCC_PATCH_GLOBAL=y # CT_GCC_PATCH_LOCAL_BUNDLED is not set # CT_GCC_PATCH_NONE is not set CT_GCC_PATCH_ORDER="global" -CT_GCC_V_12=y +CT_GCC_V_13=y +# CT_GCC_V_12 is not set # CT_GCC_V_11 is not set # CT_GCC_V_10 is not set # CT_GCC_V_9 is not set @@ -446,12 +449,14 @@ CT_GCC_V_12=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="12.2.0" +CT_GCC_VERSION="13.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_GCC_SIGNATURE_FORMAT="" +CT_GCC_later_than_13=y +CT_GCC_13_or_later=y CT_GCC_later_than_12=y CT_GCC_12_or_later=y CT_GCC_later_than_11=y @@ -621,7 +626,8 @@ CT_ISL_PATCH_GLOBAL=y # CT_ISL_PATCH_LOCAL_BUNDLED is not set # CT_ISL_PATCH_NONE is not set CT_ISL_PATCH_ORDER="global" -CT_ISL_V_0_25=y +CT_ISL_V_0_26=y +# CT_ISL_V_0_25 is not set # CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set @@ -632,7 +638,7 @@ CT_ISL_V_0_25=y # CT_ISL_V_0_17 is not set # CT_ISL_V_0_16 is not set # CT_ISL_V_0_15 is not set -CT_ISL_VERSION="0.25" +CT_ISL_VERSION="0.26" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -659,10 +665,8 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" CT_MPC_V_1_2=y -# CT_MPC_V_1_1 is not set -# CT_MPC_V_1_0 is not set CT_MPC_VERSION="1.2.1" -CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_FORMATS=".tar.gz" @@ -683,11 +687,9 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_LOCAL_BUNDLED is not set # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" -CT_MPFR_V_4_1=y -# CT_MPFR_V_4_0 is not set -# CT_MPFR_V_3_1 is not set -CT_MPFR_VERSION="4.1.0" -CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_V_4_2=y +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" @@ -730,8 +732,9 @@ CT_ZSTD_PATCH_GLOBAL=y # CT_ZSTD_PATCH_LOCAL_BUNDLED is not set # CT_ZSTD_PATCH_NONE is not set CT_ZSTD_PATCH_ORDER="global" -CT_ZSTD_V_1_5_2=y -CT_ZSTD_VERSION="1.5.2" +CT_ZSTD_V_1_5_5=y +# CT_ZSTD_V_1_5_2 is not set +CT_ZSTD_VERSION="1.5.5" CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/" CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" diff --git a/builder/images/base/Dockerfile b/builder/images/base/Dockerfile index e250ee32f11..776642262d3 100644 --- a/builder/images/base/Dockerfile +++ b/builder/images/base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:kinetic +FROM ubuntu:mantic ENV DEBIAN_FRONTEND noninteractive RUN \ diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index d6f8759f4f6..51f068d2e32 100755 --- a/builder/scripts.d/10-mingw.sh +++ b/builder/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="c3e587c067a00a561899d49d3e63a659e38802ec" +SCRIPT_COMMIT="ffe883434d7f2e405f4a992b37c03deede0bf98e" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/builder/scripts.d/20-libiconv.sh b/builder/scripts.d/20-libiconv.sh index 6b933c1d7d4..2532b374bbb 100755 --- a/builder/scripts.d/20-libiconv.sh +++ b/builder/scripts.d/20-libiconv.sh @@ -12,6 +12,12 @@ ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" iconv cd iconv + cat < ./.gitmodules +[subcheckout "gnulib"] + url = https://git.savannah.gnu.org/git/gnulib.git + path = gnulib +EOF + ./gitsub.sh pull ./autogen.sh diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh index 21cb049591d..139b74002de 100755 --- a/builder/scripts.d/20-libxml2.sh +++ b/builder/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="d39f78069dff496ec865c73aa44d7110e429bce9" +SCRIPT_COMMIT="4f132bcdb300850e94a723a4117cf0847a66d9a7" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/20-zlib.sh b/builder/scripts.d/20-zlib.sh index 56b699e9829..d8a8e33c2db 100755 --- a/builder/scripts.d/20-zlib.sh +++ b/builder/scripts.d/20-zlib.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/madler/zlib.git" -SCRIPT_COMMIT="79a0e447a0dfa32979420cb21cfb96d684b2c9d5" +SCRIPT_COMMIT="ac8f12c97d1afd9bafa9c710f827d40a407d3266" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index 148f1b8131c..ef5df033694 100755 --- a/builder/scripts.d/25-freetype.sh +++ b/builder/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="d42679b93d5e77fe769591cd1d04522225940556" +SCRIPT_COMMIT="749b8f9d344105357b82766f8c555586a4b84e7c" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-openssl.sh b/builder/scripts.d/25-openssl.sh index 435c5346a83..af2505cb156 100755 --- a/builder/scripts.d/25-openssl.sh +++ b/builder/scripts.d/25-openssl.sh @@ -1,8 +1,8 @@ #!/bin/bash SCRIPT_REPO="https://github.com/openssl/openssl.git" -SCRIPT_COMMIT="OpenSSL_1_1_1v" -SCRIPT_TAGFILTER="OpenSSL_1_1_1*" +SCRIPT_COMMIT="openssl-3.1.3" +SCRIPT_TAGFILTER="openssl-3.1.*" ffbuild_enabled() { return 0 @@ -11,15 +11,22 @@ ffbuild_enabled() { ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl cd openssl + git submodule update --init --recursive --depth=1 local myconf=( threads zlib no-shared + no-tests + no-apps + no-legacy + no-ssl2 + no-ssl3 enable-camellia enable-ec enable-srp --prefix="$FFBUILD_PREFIX" + --libdir=lib ) if [[ $TARGET == win64 ]]; then @@ -47,16 +54,27 @@ ffbuild_dockerbuild() { return -1 fi + export CFLAGS="$CFLAGS -fno-strict-aliasing" + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + # OpenSSL build system prepends the cross prefix itself - export CC="gcc" - export CXX="g++" - export AR="gcc-ar" - export RANLIB="gcc-ranlib" + export CC="${CC/${FFBUILD_CROSS_PREFIX}/}" + export CXX="${CXX/${FFBUILD_CROSS_PREFIX}/}" + export AR="${AR/${FFBUILD_CROSS_PREFIX}/}" + export RANLIB="${RANLIB/${FFBUILD_CROSS_PREFIX}/}" + + # Actually allow Configure to disable apps + sed -i '/^my @disablables =/ s/$/"apps",/' Configure ./Configure "${myconf[@]}" sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile - make -j$(nproc) + make -j$(nproc) build_sw make install_sw } + +ffbuild_configure() { + [[ $TARGET == win* ]] && return 0 + echo --enable-openssl +} diff --git a/builder/scripts.d/25-xz.sh b/builder/scripts.d/25-xz.sh index 496f79884cc..e51cf0556fb 100755 --- a/builder/scripts.d/25-xz.sh +++ b/builder/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xz-mirror/xz.git" -SCRIPT_COMMIT="16068f6c30b888cdb873f6285af941d00f95741d" +SCRIPT_COMMIT="74c3449d8b816a724b12ebce7417e00fb597309a" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh index 2d00bff66ac..ff207da222d 100755 --- a/builder/scripts.d/35-fontconfig.sh +++ b/builder/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="e0eb855462791cbe217adc368d156733b2b2c13a" +SCRIPT_COMMIT="a264a2c0ca0be120c0fd2325f0d67ca4d5e81bd0" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index 54a7795e059..6ac9177d634 100755 --- a/builder/scripts.d/45-harfbuzz.sh +++ b/builder/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="f380a32825a1b2c51bbe21dc7acb9b3cc0921f69" +SCRIPT_COMMIT="1f395cbaf91be284f443c27b8b35be0edd788c34" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-x11/10-xcbproto.sh b/builder/scripts.d/45-x11/10-xcbproto.sh index 07f602e106e..b9a57d47a9d 100755 --- a/builder/scripts.d/45-x11/10-xcbproto.sh +++ b/builder/scripts.d/45-x11/10-xcbproto.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" -SCRIPT_COMMIT="98eeebfc2d7db5377b85437418fb942ea30ffc0d" +SCRIPT_COMMIT="1388374c7149114888a6a5cd6e9bf6ad4b42adf8" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/10-xproto.sh b/builder/scripts.d/45-x11/10-xproto.sh index ca041b5bf5f..91049ebfd31 100755 --- a/builder/scripts.d/45-x11/10-xproto.sh +++ b/builder/scripts.d/45-x11/10-xproto.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git" -SCRIPT_COMMIT="704a75eecdf177a8b18ad7e35813f2f979b0c277" +SCRIPT_COMMIT="1c8128d72df22843a2022576850bc5ab5e3a46ea" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/10-xtrans.sh b/builder/scripts.d/45-x11/10-xtrans.sh index 6ee311a7435..8f041be8a02 100755 --- a/builder/scripts.d/45-x11/10-xtrans.sh +++ b/builder/scripts.d/45-x11/10-xtrans.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git" -SCRIPT_COMMIT="3b3a3bd75d86aec78f6ef893b198c3efc378bc64" +SCRIPT_COMMIT="806f04c6e4529358f160e53135baf105e4ecf3b8" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/20-libxau.sh b/builder/scripts.d/45-x11/20-libxau.sh index 0595018b256..3d6ebab5d42 100755 --- a/builder/scripts.d/45-x11/20-libxau.sh +++ b/builder/scripts.d/45-x11/20-libxau.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git" -SCRIPT_COMMIT="aec9d7266777e0b9243ef0f112fe0e07256bd446" +SCRIPT_COMMIT="f4fc44202b554e68093828b556f8c7fd9644ddb0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/30-libxcb.sh b/builder/scripts.d/45-x11/30-libxcb.sh index f75c72eeec2..d1eab1107f0 100755 --- a/builder/scripts.d/45-x11/30-libxcb.sh +++ b/builder/scripts.d/45-x11/30-libxcb.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" -SCRIPT_COMMIT="453115f7eeb694de9f41ea842a29bbb31b90c8dd" +SCRIPT_COMMIT="02a7bbed391859c79864b9aacf040d84f103d38a" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/40-libx11.sh b/builder/scripts.d/45-x11/40-libx11.sh index 0648eefbcd2..f1143a99480 100755 --- a/builder/scripts.d/45-x11/40-libx11.sh +++ b/builder/scripts.d/45-x11/40-libx11.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git" -SCRIPT_COMMIT="44f908d9283710ffc75b22d2ae7a8948119b3e61" +SCRIPT_COMMIT="c745719e23af44a4b40ab4508447637b35d91a1e" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/50-libxext.sh b/builder/scripts.d/45-x11/50-libxext.sh index c482aa33c81..d50ef5e8bdf 100755 --- a/builder/scripts.d/45-x11/50-libxext.sh +++ b/builder/scripts.d/45-x11/50-libxext.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git" -SCRIPT_COMMIT="de2ebd62c1eb8fe16c11aceac4a6981bda124cf4" +SCRIPT_COMMIT="e8db0fc7c047ccdd6c11381681b184bbe9ea8270" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/50-libxi.sh b/builder/scripts.d/45-x11/50-libxi.sh index 7d93206558d..bdd8b351d1b 100755 --- a/builder/scripts.d/45-x11/50-libxi.sh +++ b/builder/scripts.d/45-x11/50-libxi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git" -SCRIPT_COMMIT="09f3eb570fe79bfc0c430b6059d7b4acaf371c24" +SCRIPT_COMMIT="a340bc0424a73d9fc4badbb7aee5284877635ca9" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/50-libxrender.sh b/builder/scripts.d/45-x11/50-libxrender.sh index 826ba7d99ea..cfab41bb319 100755 --- a/builder/scripts.d/45-x11/50-libxrender.sh +++ b/builder/scripts.d/45-x11/50-libxrender.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git" -SCRIPT_COMMIT="07efd80468f6b595e6432edd28b8560ca7695ba0" +SCRIPT_COMMIT="01e754610df2195536c5b31c1e8df756480599d1" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/60-libglvnd.sh b/builder/scripts.d/45-x11/60-libglvnd.sh index 94efdff427d..392c24835d9 100755 --- a/builder/scripts.d/45-x11/60-libglvnd.sh +++ b/builder/scripts.d/45-x11/60-libglvnd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git" -SCRIPT_COMMIT="179d7278d7485ceea2d440807be9d677d32aedc4" +SCRIPT_COMMIT="62176c235ceca2c20f30777f5bc4195bd70391c4" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/60-libxcursor.sh b/builder/scripts.d/45-x11/60-libxcursor.sh index bf5543515a7..65bd54e3905 100755 --- a/builder/scripts.d/45-x11/60-libxcursor.sh +++ b/builder/scripts.d/45-x11/60-libxcursor.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git" -SCRIPT_COMMIT="9c1b50ed98d354488329c99bc8bf77d1c6df657c" +SCRIPT_COMMIT="5e0f8347cebef2b3a9f5d75ca254aabaa0bca259" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/60-libxrandr.sh b/builder/scripts.d/45-x11/60-libxrandr.sh index 42273fdf6fe..04bd1411b54 100755 --- a/builder/scripts.d/45-x11/60-libxrandr.sh +++ b/builder/scripts.d/45-x11/60-libxrandr.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git" -SCRIPT_COMMIT="5b96863cf2a34ee9e72ffc4ec6415bc59b6121fc" +SCRIPT_COMMIT="512bf0b15b5597c721ff8c61083616ca9040fa72" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index 41f9cbc4ca4..af1e63db75d 100755 --- a/builder/scripts.d/50-dav1d.sh +++ b/builder/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="97becd73726c3d4c4bb8793d2215f846da8795af" +SCRIPT_COMMIT="47107e384bd1dc25674acf04d000a8cdc6195234" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh index 7f3fc1c38e4..354f74a8931 100755 --- a/builder/scripts.d/50-libass.sh +++ b/builder/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="5c15c883a4783641f7e71a6a1f440209965eb64f" +SCRIPT_COMMIT="358770835248e26241e4796f38f02073a3bae252" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libopus.sh b/builder/scripts.d/50-libopus.sh index 9cc7ec7feaf..7da881c674e 100755 --- a/builder/scripts.d/50-libopus.sh +++ b/builder/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/opus.git" -SCRIPT_COMMIT="9fc8fc4cf432640f284113ba502ee027268b0d9f" +SCRIPT_COMMIT="101a71e03bbf860aaafb7090a0e440675cb27660" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index 4936517ed8f..ff64966ab81 100755 --- a/builder/scripts.d/50-libvpx.sh +++ b/builder/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="e052ada7801c458f9fc0c2818f1be814f86e94a4" +SCRIPT_COMMIT="9c377eafbedd3911e83ee80793b4fba80710d4e0" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index bd9fbc21c53..042086004df 100755 --- a/builder/scripts.d/50-libwebp.sh +++ b/builder/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="943b932a7ec6ac71737e1ea0af907c5439ca6ef0" +SCRIPT_COMMIT="deadc339d59dfe64a00b51decce2f6d9337ddeec" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh index f9fcca5d90e..750ab6228ea 100755 --- a/builder/scripts.d/50-openmpt.sh +++ b/builder/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="19588" +SCRIPT_REV="19865" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index 88eba5e9ebc..faea591c3c6 100755 --- a/builder/scripts.d/50-srt.sh +++ b/builder/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="51e3d0d50ba281ce985a1712785b5cb34f447b92" +SCRIPT_COMMIT="eb80f92cec5359b61a5849355ec8dcf16c820cef" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index c43dab23096..2fd967f098d 100755 --- a/builder/scripts.d/50-svtav1.sh +++ b/builder/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="6d5f2b4e1f04db677cdd4ab2b0d6831ab06a849c" +SCRIPT_COMMIT="a6f0981c2b82aea05205b96bfebb1e6cd53790de" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/30-libpciaccess.sh b/builder/scripts.d/50-vaapi/30-libpciaccess.sh index 21014c3acae..69aa19f5340 100755 --- a/builder/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/builder/scripts.d/50-vaapi/30-libpciaccess.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git" -SCRIPT_COMMIT="03d0b467804bf033c2be259be3f091231f74cff9" +SCRIPT_COMMIT="6cd5a4afbb70868c7746de8d50dea59e02e9acf2" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/40-libdrm.sh b/builder/scripts.d/50-vaapi/40-libdrm.sh index 2ff108da9d6..67219af5ea0 100755 --- a/builder/scripts.d/50-vaapi/40-libdrm.sh +++ b/builder/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="7bdb135f0c8e6ae2c0ed6d4bd6a8423eb1df5c26" +SCRIPT_COMMIT="8d8357dc6482c771d2f9501257c29abe8b06ba9c" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/50-libva.sh b/builder/scripts.d/50-vaapi/50-libva.sh index f614fb6cd96..7c00868b1ec 100755 --- a/builder/scripts.d/50-vaapi/50-libva.sh +++ b/builder/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="b4870fdfe2d41b579036dae280dfc7a5e732127f" +SCRIPT_COMMIT="45afd79ae4b887ad06cfca7316ada5c2688513f9" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-vulkan/45-vulkan.sh b/builder/scripts.d/50-vulkan/45-vulkan.sh index 87c70f13c41..327e9c6720a 100755 --- a/builder/scripts.d/50-vulkan/45-vulkan.sh +++ b/builder/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.261" +SCRIPT_COMMIT="v1.3.268" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/builder/scripts.d/50-vulkan/55-spirv-cross.sh b/builder/scripts.d/50-vulkan/55-spirv-cross.sh index aa954a5150d..6d813e6c085 100755 --- a/builder/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/builder/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="acf51c1b9f9f872b741ab369cb047898c9cc300b" +SCRIPT_COMMIT="2de1265fca722929785d9acdec4ab728c47a0254" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh index 97cd67f8fc4..68936e12bf6 100755 --- a/builder/scripts.d/50-x265.sh +++ b/builder/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="59ff5e7b4840b3aac91fbc514a4c86a8722ce5e1" +SCRIPT_COMMIT="8ee01d45b05cdbc9da89b884815257807a514bc8" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/docker-build-win64.sh b/docker-build-win64.sh index ba7d57dace7..f75ccbd3676 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -159,7 +159,7 @@ popd popd # LZMA -git clone -b v5.4.4 --depth=1 https://github.com/xz-mirror/xz.git +git clone -b v5.4.4 --depth=1 https://github.com/tukaani-project/xz.git pushd xz ./autogen.sh --no-po4a --no-doxygen ./configure \ @@ -322,7 +322,7 @@ popd # OPENMPT mkdir mpt pushd mpt -mpt_ver="0.7.2" +mpt_ver="0.7.3" mpt_link="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${mpt_ver}+release.autotools.tar.gz" wget ${mpt_link} -O mpt.tar.gz tar xaf mpt.tar.gz @@ -339,7 +339,7 @@ popd popd # LIBWEBP -git clone -b v1.3.1 --depth=1 https://chromium.googlesource.com/webm/libwebp +git clone -b v1.3.2 --depth=1 https://chromium.googlesource.com/webm/libwebp pushd libwebp ./autogen.sh ./configure \ @@ -473,7 +473,7 @@ popd popd # DAV1D -git clone -b 1.2.1 --depth=1 https://code.videolan.org/videolan/dav1d.git +git clone -b 1.3.0 --depth=1 https://code.videolan.org/videolan/dav1d.git pushd dav1d mkdir build pushd build diff --git a/docker-build.sh b/docker-build.sh index ec9dc5c9e0b..6c72e8c33ec 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -91,7 +91,7 @@ prepare_extra_common() { # DAV1D pushd ${SOURCE_DIR} - git clone -b 1.2.1 --depth=1 https://code.videolan.org/videolan/dav1d.git + git clone -b 1.3.0 --depth=1 https://code.videolan.org/videolan/dav1d.git if [ "${ARCH}" = "amd64" ]; then nasmver="$(nasm -v | cut -d ' ' -f3)" nasmminver="2.14.0" @@ -201,7 +201,7 @@ prepare_extra_amd64() { # LIBVA pushd ${SOURCE_DIR} - git clone -b 2.19.0 --depth=1 https://github.com/intel/libva.git + git clone -b 2.20.0 --depth=1 https://github.com/intel/libva.git pushd libva sed -i 's|secure_getenv("LIBVA_DRIVERS_PATH")|"/usr/lib/jellyfin-ffmpeg/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/dri:/usr/local/lib/dri"|g' va/va.c sed -i 's|secure_getenv("LIBVA_DRIVER_NAME")|secure_getenv("LIBVA_DRIVER_NAME_JELLYFIN")|g' va/va.c @@ -218,7 +218,7 @@ prepare_extra_amd64() { # LIBVA-UTILS pushd ${SOURCE_DIR} - git clone -b 2.19.0 --depth=1 https://github.com/intel/libva-utils.git + git clone -b 2.20.0 --depth=1 https://github.com/intel/libva-utils.git pushd libva-utils ./autogen.sh ./configure --prefix=${TARGET_DIR} @@ -242,7 +242,7 @@ prepare_extra_amd64() { # GMMLIB pushd ${SOURCE_DIR} - git clone -b intel-gmmlib-22.3.10 --depth=1 https://github.com/intel/gmmlib.git + git clone -b intel-gmmlib-22.3.12 --depth=1 https://github.com/intel/gmmlib.git pushd gmmlib mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -258,6 +258,8 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} git clone -b intel-mediasdk-23.2.2 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK.git pushd MediaSDK + # fix build for gcc 13 + wget -q -O - https://github.com/Intel-Media-SDK/MediaSDK/commit/8fb9f5f.patch | git apply sed -i 's|MFX_PLUGINS_CONF_DIR "/plugins.cfg"|"/usr/lib/jellyfin-ffmpeg/lib/mfx/plugins.cfg"|g' api/mfx_dispatch/linux/mfxloader.cpp mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -276,7 +278,7 @@ prepare_extra_amd64() { # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer # Both MSDK and VPL runtime can be loaded by MFX dispatcher (libmfx.so.1) pushd ${SOURCE_DIR} - git clone -b intel-onevpl-23.3.2 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git + git clone -b intel-onevpl-23.3.4 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git pushd oneVPL-intel-gpu mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -296,7 +298,7 @@ prepare_extra_amd64() { # Full Feature Build: ENABLE_KERNELS=ON(Default) ENABLE_NONFREE_KERNELS=ON(Default) # Free Kernel Build: ENABLE_KERNELS=ON ENABLE_NONFREE_KERNELS=OFF pushd ${SOURCE_DIR} - git clone -b intel-media-23.3.2 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-23.3.4 --depth=1 https://github.com/intel/media-driver.git pushd media-driver mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -315,7 +317,7 @@ prepare_extra_amd64() { # Vulkan Headers pushd ${SOURCE_DIR} - vk_ver="v1.3.261" + vk_ver="v1.3.268" if [[ $( lsb_release -c -s ) == "bionic" ]]; then vk_ver="v1.3.240" fi @@ -332,7 +334,7 @@ prepare_extra_amd64() { # Vulkan ICD Loader pushd ${SOURCE_DIR} - vk_ver="v1.3.261" + vk_ver="v1.3.268" if [[ $( lsb_release -c -s ) == "bionic" ]]; then vk_ver="v1.3.240" fi From b6109397e75da43813473cb11b78e138c7e292e8 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Mon, 9 Oct 2023 22:03:47 +0800 Subject: [PATCH 3/3] Bump version to 5.1.3-6 Signed-off-by: nyanmisaka --- build | 12 ++++++------ build.yaml | 8 ++++---- debian/changelog | 8 ++++++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/build b/build index 3660de2c41f..da65b2c1faf 100755 --- a/build +++ b/build @@ -10,8 +10,8 @@ usage() { echo -e " * bionic" echo -e " * focal" echo -e " * jammy" - echo -e " * kinetic" echo -e " * lunar" + echo -e " * mantic" } if [[ -z ${1} ]]; then @@ -51,16 +51,16 @@ case ${cli_release} in gcc_version="11" llvm_version="15" ;; - 'kinetic') - release="ubuntu:kinetic" - gcc_version="12" - llvm_version="15" - ;; 'lunar') release="ubuntu:lunar" gcc_version="12" llvm_version="15" ;; + 'mantic') + release="ubuntu:mantic" + gcc_version="13" + llvm_version="17" + ;; *) echo "Invalid release." usage diff --git a/build.yaml b/build.yaml index 17034daaff8..adee4bb958f 100644 --- a/build.yaml +++ b/build.yaml @@ -1,7 +1,7 @@ --- # We just wrap `build` so this is really it name: "jellyfin-ffmpeg" -version: "5.1.3-5" +version: "5.1.3-6" packages: - buster-amd64 - buster-armhf @@ -21,9 +21,9 @@ packages: - jammy-amd64 - jammy-armhf - jammy-arm64 - - kinetic-amd64 - - kinetic-armhf - - kinetic-arm64 - lunar-amd64 - lunar-armhf - lunar-arm64 + - mantic-amd64 + - mantic-armhf + - mantic-arm64 diff --git a/debian/changelog b/debian/changelog index cd010f20124..3361983a63c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +jellyfin-ffmpeg (5.1.3-6) unstable; urgency=medium + + * Update dependencies + * Add suport for Ubuntu 23.10 (Mantic) + * Drop the EOL Ubuntu 22.10 (Kinetic) + + -- nyanmisaka Fri, 29 Sep 2023 23:44:51 +0800 + jellyfin-ffmpeg (5.1.3-5) unstable; urgency=medium * Sync intel D3D11VA textures before mapping to OpenCL