From 46f0cfee890b57e8e81e40a2e1e9f9b3761e0964 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Wed, 24 May 2023 15:04:18 +0800 Subject: [PATCH 1/5] Update deprecated params for SVT-AV1 encoder Signed-off-by: nyanmisaka --- ...eprecated-params-for-svt-av1-encoder.patch | 42 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 debian/patches/0051-update-deprecated-params-for-svt-av1-encoder.patch diff --git a/debian/patches/0051-update-deprecated-params-for-svt-av1-encoder.patch b/debian/patches/0051-update-deprecated-params-for-svt-av1-encoder.patch new file mode 100644 index 00000000000..4967bc51320 --- /dev/null +++ b/debian/patches/0051-update-deprecated-params-for-svt-av1-encoder.patch @@ -0,0 +1,42 @@ +Index: jellyfin-ffmpeg/libavcodec/libsvtav1.c +=================================================================== +--- jellyfin-ffmpeg.orig/libavcodec/libsvtav1.c ++++ jellyfin-ffmpeg/libavcodec/libsvtav1.c +@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx + + static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc) + { +- const int pack_mode_10bit = +- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0; +- const size_t luma_size_8bit = +- config->source_width * config->source_height * (1 << pack_mode_10bit); +- const size_t luma_size_10bit = +- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0; ++ const size_t luma_size = config->source_width * config->source_height * ++ (config->encoder_bit_depth > 8 ? 2 : 1); + + EbSvtIOFormat *in_data; + +- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2; ++ svt_enc->raw_size = luma_size * 3 / 2; + + // allocate buffer for in and out + svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf)); +@@ -183,7 +179,7 @@ static int config_enc_params(EbSvtAv1Enc + param->min_qp_allowed = avctx->qmin; + } + param->max_bit_rate = avctx->rc_max_rate; +- param->vbv_bufsize = avctx->rc_buffer_size; ++ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; + + if (svt_enc->crf > 0) { + param->qp = svt_enc->crf; +@@ -300,7 +296,7 @@ static int config_enc_params(EbSvtAv1Enc + avctx->bit_rate = param->rate_control_mode > 0 ? + param->target_bit_rate : 0; + avctx->rc_max_rate = param->max_bit_rate; +- avctx->rc_buffer_size = param->vbv_bufsize; ++ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL; + + if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { + AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); diff --git a/debian/patches/series b/debian/patches/series index 868fa4607fa..7d8770da7c9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,3 +48,4 @@ 0048-add-fixes-for-the-incorrect-null-terminator-in-assenc.patch 0049-skip-loading-plugins-on-vpl-runtime.patch 0050-fix-the-empty-output-in-webvtt-transcoding.patch +0051-update-deprecated-params-for-svt-av1-encoder.patch From ad1e9b8377561cac921c3f56632251a8e5ce6775 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Wed, 24 May 2023 15:45:23 +0800 Subject: [PATCH 2/5] Set input region for overlay video to NULL Signed-off-by: nyanmisaka --- .../0016-add-pgs-support-to-vaapi-overlay.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/patches/0016-add-pgs-support-to-vaapi-overlay.patch b/debian/patches/0016-add-pgs-support-to-vaapi-overlay.patch index 54dfb460f04..3e2313a5daf 100644 --- a/debian/patches/0016-add-pgs-support-to-vaapi-overlay.patch +++ b/debian/patches/0016-add-pgs-support-to-vaapi-overlay.patch @@ -230,7 +230,7 @@ Index: jellyfin-ffmpeg/libavfilter/vf_overlay_vaapi.c output_region = (VARectangle) { .x = 0, .y = 0, -@@ -260,29 +308,42 @@ static int overlay_vaapi_blend(FFFrameSy +@@ -260,29 +308,43 @@ static int overlay_vaapi_blend(FFFrameSy .height = output->height, }; @@ -279,15 +279,16 @@ Index: jellyfin-ffmpeg/libavfilter/vf_overlay_vaapi.c + subpic_params.blend_state = &blend_state; - err = overlay_vaapi_render_picture(avctx, ¶ms, &subpic_params, output); -+ subpic_params.surface = (VASurfaceID)(uintptr_t)input_overlay->data[3]; -+ subpic_params.output_region = &overlay_region; ++ subpic_params.surface = (VASurfaceID)(uintptr_t)input_overlay->data[3]; ++ subpic_params.surface_region = NULL; ++ subpic_params.output_region = &overlay_region; + } + + err = overlay_vaapi_render_picture(avctx, ¶ms, input_overlay ? &subpic_params : NULL, output); if (err < 0) goto fail; -@@ -297,26 +358,69 @@ fail: +@@ -297,26 +359,69 @@ fail: return err; } @@ -370,7 +371,7 @@ Index: jellyfin-ffmpeg/libavfilter/vf_overlay_vaapi.c } static int overlay_vaapi_config_output(AVFilterLink *outlink) -@@ -326,10 +430,7 @@ static int overlay_vaapi_config_output(A +@@ -326,10 +431,7 @@ static int overlay_vaapi_config_output(A VAAPIVPPContext *vpp_ctx = avctx->priv; int err; @@ -382,7 +383,7 @@ Index: jellyfin-ffmpeg/libavfilter/vf_overlay_vaapi.c vpp_ctx->output_width = avctx->inputs[0]->w; vpp_ctx->output_height = avctx->inputs[0]->h; -@@ -337,10 +438,17 @@ static int overlay_vaapi_config_output(A +@@ -337,10 +439,17 @@ static int overlay_vaapi_config_output(A if (err < 0) return err; @@ -400,7 +401,7 @@ Index: jellyfin-ffmpeg/libavfilter/vf_overlay_vaapi.c return ff_framesync_configure(&ctx->fs); } -@@ -366,37 +474,40 @@ static av_cold void overlay_vaapi_uninit +@@ -366,37 +475,40 @@ static av_cold void overlay_vaapi_uninit OverlayVAAPIContext *ctx = avctx->priv; ff_framesync_uninit(&ctx->fs); @@ -455,7 +456,7 @@ Index: jellyfin-ffmpeg/libavfilter/vf_overlay_vaapi.c }, }; -@@ -416,8 +527,9 @@ const AVFilter ff_vf_overlay_vaapi = { +@@ -416,8 +528,9 @@ const AVFilter ff_vf_overlay_vaapi = { .init = &overlay_vaapi_init, .uninit = &overlay_vaapi_uninit, .activate = &overlay_vaapi_activate, From 8620492782722671d6787290077d005db5838d99 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Wed, 24 May 2023 16:13:25 +0800 Subject: [PATCH 3/5] Backport upstream qsvenc fixes Signed-off-by: nyanmisaka --- .../0052-backport-upstream-qsvenc-fixes.patch | 185 ++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 186 insertions(+) create mode 100644 debian/patches/0052-backport-upstream-qsvenc-fixes.patch diff --git a/debian/patches/0052-backport-upstream-qsvenc-fixes.patch b/debian/patches/0052-backport-upstream-qsvenc-fixes.patch new file mode 100644 index 00000000000..fece558017f --- /dev/null +++ b/debian/patches/0052-backport-upstream-qsvenc-fixes.patch @@ -0,0 +1,185 @@ +Index: jellyfin-ffmpeg/libavcodec/qsvenc.c +=================================================================== +--- jellyfin-ffmpeg.orig/libavcodec/qsvenc.c ++++ jellyfin-ffmpeg/libavcodec/qsvenc.c +@@ -963,7 +963,11 @@ static int init_video_param(AVCodecConte + q->extvsi.ColourDescriptionPresent = 1; + q->extvsi.ColourPrimaries = avctx->color_primaries; + q->extvsi.TransferCharacteristics = avctx->color_trc; +- q->extvsi.MatrixCoefficients = avctx->colorspace; ++ if (avctx->colorspace == AVCOL_SPC_RGB) ++ // RGB will be converted to YUV, so RGB colorspace is not supported ++ q->extvsi.MatrixCoefficients = AVCOL_SPC_UNSPECIFIED; ++ else ++ q->extvsi.MatrixCoefficients = avctx->colorspace; + } + + if (q->extvsi.VideoFullRange || q->extvsi.ColourDescriptionPresent) { +@@ -1473,6 +1477,120 @@ static int get_free_frame(QSVEncContext + return 0; + } + ++static int qsvenc_fill_padding_area(AVFrame *frame, int new_w, int new_h) ++{ ++ const AVPixFmtDescriptor *desc; ++ int max_step[4], filled[4] = { 0 }; ++ ++ desc = av_pix_fmt_desc_get(frame->format); ++ av_assert0(desc); ++ av_image_fill_max_pixsteps(max_step, NULL, desc); ++ ++ for (int i = 0; i < desc->nb_components; i++) { ++ const AVComponentDescriptor *comp = &desc->comp[i]; ++ int sheight, dheight, plane = comp->plane; ++ ptrdiff_t swidth = av_image_get_linesize(frame->format, ++ frame->width, ++ plane); ++ ptrdiff_t dwidth = av_image_get_linesize(frame->format, ++ new_w, ++ plane); ++ ++ if (swidth < 0 || dwidth < 0) { ++ av_log(NULL, AV_LOG_ERROR, "av_image_get_linesize failed\n"); ++ return AVERROR(EINVAL); ++ } ++ ++ if (filled[plane]) ++ continue; ++ ++ sheight = frame->height; ++ dheight = new_h; ++ ++ if (plane) { ++ sheight = AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h); ++ dheight = AV_CEIL_RSHIFT(new_h, desc->log2_chroma_h); ++ } ++ ++ // Fill right padding ++ if (new_w > frame->width) { ++ for (int j = 0; j < sheight; j++) { ++ void *line_ptr = frame->data[plane] + j * frame->linesize[plane] + swidth; ++ ++ av_memcpy_backptr(line_ptr, ++ max_step[plane], ++ new_w - frame->width); ++ } ++ } ++ ++ // Fill bottom padding ++ for (int j = sheight; j < dheight; j++) ++ memcpy(frame->data[plane] + j * frame->linesize[plane], ++ frame->data[plane] + (sheight - 1) * frame->linesize[plane], ++ dwidth); ++ ++ filled[plane] = 1; ++ } ++ ++ return 0; ++} ++ ++/* frame width / height have been aligned with the alignment */ ++static int qsvenc_get_continuous_buffer(AVFrame *frame) ++{ ++ int total_size; ++ ++ switch (frame->format) { ++ case AV_PIX_FMT_NV12: ++ frame->linesize[0] = frame->width; ++ frame->linesize[1] = frame->linesize[0]; ++ total_size = frame->linesize[0] * frame->height + frame->linesize[1] * frame->height / 2; ++ break; ++ ++ case AV_PIX_FMT_P010: ++ case AV_PIX_FMT_P012: ++ frame->linesize[0] = 2 * frame->width; ++ frame->linesize[1] = frame->linesize[0]; ++ total_size = frame->linesize[0] * frame->height + frame->linesize[1] * frame->height / 2; ++ break; ++ ++ case AV_PIX_FMT_YUYV422: ++ frame->linesize[0] = 2 * frame->width; ++ frame->linesize[1] = 0; ++ total_size = frame->linesize[0] * frame->height; ++ break; ++ ++ case AV_PIX_FMT_Y210: ++ case AV_PIX_FMT_0YUV: ++ case AV_PIX_FMT_Y410: ++ case AV_PIX_FMT_BGRA: ++ case AV_PIX_FMT_X2RGB10: ++ frame->linesize[0] = 4 * frame->width; ++ frame->linesize[1] = 0; ++ total_size = frame->linesize[0] * frame->height; ++ break; ++ ++ default: ++ // This should never be reached ++ av_assert0(0); ++ return AVERROR(EINVAL); ++ } ++ ++ frame->buf[0] = av_buffer_alloc(total_size); ++ if (!frame->buf[0]) ++ return AVERROR(ENOMEM); ++ ++ frame->data[0] = frame->buf[0]->data; ++ frame->extended_data = frame->data; ++ ++ if (frame->format == AV_PIX_FMT_NV12 || ++ frame->format == AV_PIX_FMT_P010 || ++ frame->format == AV_PIX_FMT_P012) ++ frame->data[1] = frame->data[0] + frame->linesize[0] * frame->height; ++ ++ return 0; ++} ++ + static int submit_frame(QSVEncContext *q, const AVFrame *frame, + QSVFrame **new_frame) + { +@@ -1508,15 +1626,17 @@ static int submit_frame(QSVEncContext *q + } else { + /* make a copy if the input is not padded as libmfx requires */ + /* and to make allocation continious for data[0]/data[1] */ +- if ((frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) || +- (frame->data[1] - frame->data[0] != frame->linesize[0] * FFALIGN(qf->frame->height, q->height_align))) { +- qf->frame->height = FFALIGN(frame->height, q->height_align); +- qf->frame->width = FFALIGN(frame->width, q->width_align); ++ if ((frame->height & (q->height_align - 1) || frame->linesize[0] & (q->width_align - 1)) || ++ ((frame->format == AV_PIX_FMT_NV12 || frame->format == AV_PIX_FMT_P010 || frame->format == AV_PIX_FMT_P012) && ++ (frame->data[1] - frame->data[0] != frame->linesize[0] * FFALIGN(qf->frame->height, q->height_align)))) { ++ int tmp_w, tmp_h; ++ qf->frame->height = tmp_h = FFALIGN(frame->height, q->height_align); ++ qf->frame->width = tmp_w = FFALIGN(frame->width, q->width_align); + + qf->frame->format = frame->format; + + if (!qf->frame->data[0]) { +- ret = av_frame_get_buffer(qf->frame, q->width_align); ++ ret = qsvenc_get_continuous_buffer(qf->frame); + if (ret < 0) + return ret; + } +@@ -1529,6 +1649,12 @@ static int submit_frame(QSVEncContext *q + av_frame_unref(qf->frame); + return ret; + } ++ ++ ret = qsvenc_fill_padding_area(qf->frame, tmp_w, tmp_h); ++ if (ret < 0) { ++ av_frame_unref(qf->frame); ++ return ret; ++ } + } else { + av_frame_unref(qf->frame); + ret = av_frame_ref(qf->frame, frame); +@@ -1770,8 +1896,8 @@ static int encode_frame(AVCodecContext * + pkt.bs->ExtParam = enc_buf; + } + +- if (q->set_encode_ctrl_cb) { +- q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); ++ if (q->set_encode_ctrl_cb && enc_ctrl) { ++ q->set_encode_ctrl_cb(avctx, frame, enc_ctrl); + } + + if ((avctx->codec_id == AV_CODEC_ID_H264 || diff --git a/debian/patches/series b/debian/patches/series index 7d8770da7c9..34631920b25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -49,3 +49,4 @@ 0049-skip-loading-plugins-on-vpl-runtime.patch 0050-fix-the-empty-output-in-webvtt-transcoding.patch 0051-update-deprecated-params-for-svt-av1-encoder.patch +0052-backport-upstream-qsvenc-fixes.patch From ddd096492396bdbd227cb91dacf603413ab96471 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 3 Jun 2023 16:06:55 +0800 Subject: [PATCH 4/5] Update dependencies and build scripts Signed-off-by: nyanmisaka --- builder/images/base-linux64/ct-ng-config | 59 +++++++++++++----- builder/images/base-linuxarm64/ct-ng-config | 59 +++++++++++++----- builder/images/base-win64/ct-ng-config | 62 ++++++++++++++----- builder/scripts.d/10-mingw.sh | 7 ++- builder/scripts.d/20-libxml2.sh | 2 +- builder/scripts.d/25-fftw3f.sh | 2 +- builder/scripts.d/25-freetype.sh | 2 +- builder/scripts.d/25-fribidi.sh | 2 +- builder/scripts.d/25-openssl.sh | 2 +- builder/scripts.d/35-fontconfig.sh | 2 +- builder/scripts.d/45-harfbuzz.sh | 2 +- builder/scripts.d/45-opencl.sh | 4 +- builder/scripts.d/45-x11/10-xproto.sh | 2 +- builder/scripts.d/45-x11/10-xtrans.sh | 2 +- builder/scripts.d/45-x11/40-libx11.sh | 2 +- builder/scripts.d/45-x11/50-libxi.sh | 2 +- builder/scripts.d/50-amf.sh | 2 +- builder/scripts.d/50-dav1d.sh | 2 +- builder/scripts.d/50-ffnvcodec.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-mfx.sh | 2 +- builder/scripts.d/50-onevpl.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/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/50-shaderc.sh | 2 +- builder/scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- builder/scripts.d/50-vulkan/60-libplacebo.sh | 2 +- builder/scripts.d/50-x265.sh | 2 +- builder/scripts.d/50-zimg.sh | 2 +- docker-build-win64.sh | 14 ++--- docker-build.sh | 20 +++--- 38 files changed, 190 insertions(+), 97 deletions(-) diff --git a/builder/images/base-linux64/ct-ng-config b/builder/images/base-linux64/ct-ng-config index 7cfd77683cb..df45b9a9361 100644 --- a/builder/images/base-linux64/ct-ng-config +++ b/builder/images/base-linux64/ct-ng-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.90_cf9beb1 Configuration +# crosstool-NG 1.25.0.152_89671bf Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -13,9 +13,9 @@ 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_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_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_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 +28,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.90_cf9beb1" +CT_VERSION="1.25.0.152_89671bf" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -46,6 +46,7 @@ CT_OBSOLETE=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y +# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set # CT_DEBUG_CT is not set # @@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y # CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y +# CT_TARBALL_RESULT is not set # # Downloading @@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}" CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" # CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set # CT_LOG_TO_FILE is not set # end of Paths and misc options @@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_ARC is not set # CT_ARCH_ARM is not set # CT_ARCH_AVR is not set +# CT_ARCH_BPF is not set # CT_ARCH_C6X is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -267,6 +269,7 @@ 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_1 is not set # CT_LINUX_V_6_0 is not set # CT_LINUX_V_5_19 is not set # CT_LINUX_V_5_18 is not set @@ -372,7 +375,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_39=y +CT_BINUTILS_V_2_40=y +# CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set # CT_BINUTILS_V_2_36 is not set @@ -386,14 +390,14 @@ CT_BINUTILS_V_2_39=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.39" +CT_BINUTILS_VERSION="2.40" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y -CT_BINUTILS_2_39_or_older=y CT_BINUTILS_later_than_2_30=y CT_BINUTILS_2_30_or_later=y CT_BINUTILS_later_than_2_27=y @@ -448,6 +452,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_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set # CT_GLIBC_V_2_34 is not set @@ -525,7 +530,7 @@ CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y # CT_GLIBC_KERNEL_VERSION_CHOSEN is not set CT_GLIBC_MIN_KERNEL="4.4.302" CT_GLIBC_ENABLE_COMMON_FLAG=y -CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" +CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y @@ -545,6 +550,7 @@ CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_D=y +CT_CC_SUPPORT_JIT=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y CT_CC_SUPPORT_GOLANG=y @@ -661,6 +667,7 @@ CT_ALL_CC_CHOICES="GCC" # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set +# CT_CC_LANG_JIT is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_D is not set # CT_CC_LANG_OBJC is not set @@ -759,7 +766,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_24=y +CT_ISL_V_0_25=y +# CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set # CT_ISL_V_0_21 is not set @@ -770,7 +778,7 @@ CT_ISL_V_0_24=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.24" +CT_ISL_VERSION="0.25" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -905,7 +913,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" -CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_COMP_LIBS_ZSTD=y +CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD" +CT_ZSTD_DIR_NAME="zstd" +CT_ZSTD_PKG_NAME="zstd" +CT_ZSTD_SRC_RELEASE=y +# CT_ZSTD_SRC_DEVEL is not set +# CT_ZSTD_SRC_CUSTOM is not set +CT_ZSTD_PATCH_GLOBAL=y +# CT_ZSTD_PATCH_BUNDLED is not set +# CT_ZSTD_PATCH_LOCAL is not set +# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set +# 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_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}" +CT_ZSTD_ARCHIVE_FORMATS=".tar.gz" +CT_ZSTD_SIGNATURE_FORMAT="packed/.sig" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD" CT_LIBICONV_NEEDED=y CT_GETTEXT_NEEDED=y CT_GMP_NEEDED=y @@ -914,6 +943,7 @@ CT_ISL_NEEDED=y CT_MPC_NEEDED=y CT_NCURSES_NEEDED=y CT_ZLIB_NEEDED=y +CT_ZSTD_NEEDED=y CT_LIBICONV=y CT_GETTEXT=y CT_GMP=y @@ -922,6 +952,7 @@ CT_ISL=y CT_MPC=y CT_NCURSES=y CT_ZLIB=y +CT_ZSTD=y # end of Companion libraries # diff --git a/builder/images/base-linuxarm64/ct-ng-config b/builder/images/base-linuxarm64/ct-ng-config index 39137ab3a7d..a070e17b3b2 100644 --- a/builder/images/base-linuxarm64/ct-ng-config +++ b/builder/images/base-linuxarm64/ct-ng-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.90_cf9beb1 Configuration +# crosstool-NG 1.25.0.152_89671bf Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -13,9 +13,9 @@ 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_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_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_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 +28,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.90_cf9beb1" +CT_VERSION="1.25.0.152_89671bf" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -46,6 +46,7 @@ CT_OBSOLETE=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y +# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set # CT_DEBUG_CT is not set # @@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y # CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y +# CT_TARBALL_RESULT is not set # # Downloading @@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}" CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" # CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set # CT_LOG_TO_FILE is not set # end of Paths and misc options @@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_ARC is not set CT_ARCH_ARM=y # CT_ARCH_AVR is not set +# CT_ARCH_BPF is not set # CT_ARCH_C6X is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set @@ -163,7 +165,7 @@ CT_ARCH_ARM_SHOW=y # Options for arm # CT_ARCH_ARM_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -274,6 +276,7 @@ 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_1 is not set # CT_LINUX_V_6_0 is not set # CT_LINUX_V_5_19 is not set # CT_LINUX_V_5_18 is not set @@ -378,7 +381,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_39=y +CT_BINUTILS_V_2_40=y +# CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set # CT_BINUTILS_V_2_36 is not set @@ -392,14 +396,14 @@ CT_BINUTILS_V_2_39=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.39" +CT_BINUTILS_VERSION="2.40" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y -CT_BINUTILS_2_39_or_older=y CT_BINUTILS_later_than_2_30=y CT_BINUTILS_2_30_or_later=y CT_BINUTILS_later_than_2_27=y @@ -454,6 +458,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_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set # CT_GLIBC_V_2_34 is not set @@ -537,7 +542,7 @@ CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_ALL is not set # CT_GLIBC_SSP_STRONG is not set CT_GLIBC_ENABLE_COMMON_FLAG=y -CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" +CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y @@ -557,6 +562,7 @@ CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_D=y +CT_CC_SUPPORT_JIT=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y CT_CC_SUPPORT_GOLANG=y @@ -673,6 +679,7 @@ CT_ALL_CC_CHOICES="GCC" # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set +# CT_CC_LANG_JIT is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_D is not set # CT_CC_LANG_OBJC is not set @@ -771,7 +778,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_24=y +CT_ISL_V_0_25=y +# CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set # CT_ISL_V_0_21 is not set @@ -782,7 +790,7 @@ CT_ISL_V_0_24=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.24" +CT_ISL_VERSION="0.25" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -917,7 +925,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" -CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_COMP_LIBS_ZSTD=y +CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD" +CT_ZSTD_DIR_NAME="zstd" +CT_ZSTD_PKG_NAME="zstd" +CT_ZSTD_SRC_RELEASE=y +# CT_ZSTD_SRC_DEVEL is not set +# CT_ZSTD_SRC_CUSTOM is not set +CT_ZSTD_PATCH_GLOBAL=y +# CT_ZSTD_PATCH_BUNDLED is not set +# CT_ZSTD_PATCH_LOCAL is not set +# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set +# 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_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}" +CT_ZSTD_ARCHIVE_FORMATS=".tar.gz" +CT_ZSTD_SIGNATURE_FORMAT="packed/.sig" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD" CT_LIBICONV_NEEDED=y CT_GETTEXT_NEEDED=y CT_GMP_NEEDED=y @@ -926,6 +955,7 @@ CT_ISL_NEEDED=y CT_MPC_NEEDED=y CT_NCURSES_NEEDED=y CT_ZLIB_NEEDED=y +CT_ZSTD_NEEDED=y CT_LIBICONV=y CT_GETTEXT=y CT_GMP=y @@ -934,6 +964,7 @@ CT_ISL=y CT_MPC=y CT_NCURSES=y CT_ZLIB=y +CT_ZSTD=y # end of Companion libraries # diff --git a/builder/images/base-win64/ct-ng-config b/builder/images/base-win64/ct-ng-config index 83b65cb661f..90c00bf1ec9 100644 --- a/builder/images/base-win64/ct-ng-config +++ b/builder/images/base-win64/ct-ng-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.90_cf9beb1 Configuration +# crosstool-NG 1.25.0.152_89671bf Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -13,9 +13,9 @@ 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_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_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_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 +28,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.90_cf9beb1" +CT_VERSION="1.25.0.152_89671bf" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -46,6 +46,7 @@ CT_MODULES=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y +# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set # CT_DEBUG_CT is not set # @@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y # CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y +# CT_TARBALL_RESULT is not set # # Downloading @@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}" CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" # CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set # CT_LOG_TO_FILE is not set # end of Paths and misc options @@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_ARC is not set # CT_ARCH_ARM is not set # CT_ARCH_AVR is not set +# CT_ARCH_BPF is not set # CT_ARCH_C6X is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -293,7 +295,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_39=y +CT_BINUTILS_V_2_40=y +# CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set # CT_BINUTILS_V_2_36 is not set @@ -307,14 +310,14 @@ CT_BINUTILS_V_2_39=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.39" +CT_BINUTILS_VERSION="2.40" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y -CT_BINUTILS_2_39_or_older=y CT_BINUTILS_later_than_2_30=y CT_BINUTILS_2_30_or_later=y CT_BINUTILS_later_than_2_27=y @@ -365,13 +368,14 @@ CT_MINGW_W64_PATCH_GLOBAL=y # CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set # CT_MINGW_W64_PATCH_NONE is not set CT_MINGW_W64_PATCH_ORDER="global" -CT_MINGW_W64_V_V9_0=y +CT_MINGW_W64_V_V10_0=y +# CT_MINGW_W64_V_V9_0 is not set # CT_MINGW_W64_V_V8_0 is not set # CT_MINGW_W64_V_V7_0 is not set # CT_MINGW_W64_V_V6_0 is not set # CT_MINGW_W64_V_V5_0 is not set # CT_MINGW_W64_V_V4_0 is not set -CT_MINGW_W64_VERSION="v9.0.0" +CT_MINGW_W64_VERSION="v10.0.0" CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/" CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -382,7 +386,7 @@ CT_MINGW_DIRECTX=y CT_MINGW_DDK=y CT_MINGW_TOOLS=y CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl" -CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" +CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y CT_LIBC_SUPPORT_THREADS_POSIX=y @@ -404,6 +408,7 @@ CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_D=y +CT_CC_SUPPORT_JIT=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y CT_CC_SUPPORT_GOLANG=y @@ -517,6 +522,7 @@ CT_ALL_CC_CHOICES="GCC" # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set +# CT_CC_LANG_JIT is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_D is not set # CT_CC_LANG_OBJC is not set @@ -615,7 +621,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_24=y +CT_ISL_V_0_25=y +# CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set # CT_ISL_V_0_21 is not set @@ -625,7 +632,7 @@ CT_ISL_V_0_24=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.24" +CT_ISL_VERSION="0.25" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -709,7 +716,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" -CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_COMP_LIBS_ZSTD=y +CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD" +CT_ZSTD_DIR_NAME="zstd" +CT_ZSTD_PKG_NAME="zstd" +CT_ZSTD_SRC_RELEASE=y +# CT_ZSTD_SRC_DEVEL is not set +# CT_ZSTD_SRC_CUSTOM is not set +CT_ZSTD_PATCH_GLOBAL=y +# CT_ZSTD_PATCH_BUNDLED is not set +# CT_ZSTD_PATCH_LOCAL is not set +# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set +# 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_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}" +CT_ZSTD_ARCHIVE_FORMATS=".tar.gz" +CT_ZSTD_SIGNATURE_FORMAT="packed/.sig" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD" # CT_LIBICONV_NEEDED is not set # CT_GETTEXT_NEEDED is not set CT_GMP_NEEDED=y @@ -717,11 +745,13 @@ CT_MPFR_NEEDED=y CT_ISL_NEEDED=y CT_MPC_NEEDED=y CT_ZLIB_NEEDED=y +CT_ZSTD_NEEDED=y CT_GMP=y CT_MPFR=y CT_ISL=y CT_MPC=y CT_ZLIB=y +CT_ZSTD=y # end of Companion libraries # diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index 71293ef3de1..a50413c6181 100755 --- a/builder/scripts.d/10-mingw.sh +++ b/builder/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash -SCRIPT_REPO="https://github.com/mirror/mingw-w64.git" -SCRIPT_COMMIT="eff726c461e09f35eeaed125a3570fa5f807f02b" +SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" +SCRIPT_COMMIT="d78ef3552df8cdbfd1a275296921787975573d54" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 @@ -18,8 +18,9 @@ ffbuild_dockerfinal() { } ffbuild_dockerbuild() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw + retry-tool sh -c "rm -rf mingw && git clone '$SCRIPT_REPO' mingw" cd mingw + git checkout "$SCRIPT_COMMIT" cd mingw-w64-headers diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh index 7e380d7926c..f72107a22be 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="547edbf1cbdccd46b2e8ff322a456eaa5931c5df" +SCRIPT_COMMIT="6273df6c6d84b6be8a62a62abf1d9b79cc2035f8" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-fftw3f.sh b/builder/scripts.d/25-fftw3f.sh index 36786030f29..e1751e87dc3 100755 --- a/builder/scripts.d/25-fftw3f.sh +++ b/builder/scripts.d/25-fftw3f.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFTW/fftw3.git" -SCRIPT_COMMIT="11d93a81143ecb6c5ac7f67d7059bf11bd93ef35" +SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a" ffbuild_enabled() { # Dependency of GPL-Only librubberband diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index 4919f581afa..13a3b2a9ddc 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="e78e2d29a95baf6053e30cc9422aa20319259803" +SCRIPT_COMMIT="7bed7a02f4bfbfe2a47efb4d06b9c02fdb83b758" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-fribidi.sh b/builder/scripts.d/25-fribidi.sh index 18b8a750960..92a1d5d20ea 100755 --- a/builder/scripts.d/25-fribidi.sh +++ b/builder/scripts.d/25-fribidi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/fribidi/fribidi.git" -SCRIPT_COMMIT="2c2a014bf7161d43ed9f0f23f383be176a4f9df3" +SCRIPT_COMMIT="b54871c339dabb7434718da3fed2fa63320997e5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-openssl.sh b/builder/scripts.d/25-openssl.sh index e3c09b9a92f..4e02ec113fc 100755 --- a/builder/scripts.d/25-openssl.sh +++ b/builder/scripts.d/25-openssl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/openssl/openssl.git" -SCRIPT_COMMIT="OpenSSL_1_1_1t" +SCRIPT_COMMIT="OpenSSL_1_1_1u" SCRIPT_TAGFILTER="OpenSSL_1_1_1*" ffbuild_enabled() { diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh index 780e58ba23a..efe25c57dd2 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="ec3e747d2fe874f265464bb83a5705df39e2003f" +SCRIPT_COMMIT="ff037052bc27ae1c0e97879fd7333d3afdf2566e" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index 17dac649b39..2f1ee27afc8 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="96ed20725c99275f286a9a9cf461548731b6828c" +SCRIPT_COMMIT="efefec13ccedc1461867544e2066e2042e86c66f" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-opencl.sh b/builder/scripts.d/45-opencl.sh index 0ff3fffc20b..2bee2d84a55 100755 --- a/builder/scripts.d/45-opencl.sh +++ b/builder/scripts.d/45-opencl.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -SCRIPT_COMMIT="4c82e9cfaaad18c340f48af3cf5d09ff33e8c1b7" +SCRIPT_COMMIT="4fdcfb0ae675f2f63a9add9552e0af62c2b4ed30" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -SCRIPT_COMMIT2="2cde5d09953a041786d1cfdcb1c08704a82cb904" +SCRIPT_COMMIT2="b1bce7c3c580a8345205cf65fc1a5f55ba9cdb01" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-x11/10-xproto.sh b/builder/scripts.d/45-x11/10-xproto.sh index b7360dd1678..5447eeef401 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="fca42f2e5a5da961b231dbbc10f87bb95588d5b1" +SCRIPT_COMMIT="6b1012c29c2eee95c6ea2ef63b0e5dc628a6cb7f" 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 f8ba5e3eac1..6ee311a7435 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="9d77996f9f972da63c06099fd8c0f0529159b98f" +SCRIPT_COMMIT="3b3a3bd75d86aec78f6ef893b198c3efc378bc64" 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 0c822d6ce58..a0a05685cb8 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="96cbac89a02220eb21e13ca5fa7c8c5adf77028a" +SCRIPT_COMMIT="71b08b8af20474bb704a11affaa8ea39b06d5ddf" 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 3f6e8e7565b..aa7a8daa5d4 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="826215af0cc46b19555063b8894de6781d4c5993" +SCRIPT_COMMIT="3a7503ec7703f10de17c622ea22b7bff736cea74" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-amf.sh b/builder/scripts.d/50-amf.sh index d89813f818a..c8dd46f8069 100755 --- a/builder/scripts.d/50-amf.sh +++ b/builder/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="daee84bf3cde928dc1cd0b502c1b6a50cbff2495" +SCRIPT_COMMIT="bd5db31d3d8ea1fae7002dd903898599bdb7d97a" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index 5007045f246..ab454f93726 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="76e71ddf42b693a5b0502aefc786aa48b677e671" +SCRIPT_COMMIT="8b419c16bf1e37bc98044089da58f06824462cb9" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-ffnvcodec.sh b/builder/scripts.d/50-ffnvcodec.sh index c4b17734b67..d8a8783fa76 100755 --- a/builder/scripts.d/50-ffnvcodec.sh +++ b/builder/scripts.d/50-ffnvcodec.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="f8ae7a49bfef2f99d2c931a791dc3863fda67bf3" +SCRIPT_COMMIT="4fd7be29a431441ca31b8db0155875ae2ff4ed47" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh index 798bb98cfe9..07b278b7955 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="9b3c0d5b350e13eb69dc87b52751ec0ad44280af" +SCRIPT_COMMIT="1a599b1db748dfc07df98cd37d8603edb87da2fd" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libopus.sh b/builder/scripts.d/50-libopus.sh index f81dee0f3d3..5b6ab88a0ec 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="8cf872a186b96085b1bb3a547afd598354ebeb87" +SCRIPT_COMMIT="5023249b5c935545fb02dbfe845cae996ecfc8bb" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index 7d2745f447e..b3e3f73601c 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="31b6d12892cebc57adccc62994f29ebbca828fa0" +SCRIPT_COMMIT="575bd73f6118a88c5a0cf1d27a8ec9b5bda8c278" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index 6a5258e7ba6..fb21cdb2a37 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="50ac4f7c97ae29ebf16e3364c057bdc46782a47d" +SCRIPT_COMMIT="46bc4fc9d981b1760def26dd64b9c80ccbad9f6f" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-mfx.sh b/builder/scripts.d/50-mfx.sh index cc900ade931..e6ba283ccf1 100755 --- a/builder/scripts.d/50-mfx.sh +++ b/builder/scripts.d/50-mfx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git" -SCRIPT_COMMIT="5a3f178be7f406cec920b9f52f46c1ae29f29bb2" +SCRIPT_COMMIT="f6aac4576826ed821c81231fdfb0d24047158e7d" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/builder/scripts.d/50-onevpl.sh b/builder/scripts.d/50-onevpl.sh index 115caefd01f..afe6ec1f88a 100755 --- a/builder/scripts.d/50-onevpl.sh +++ b/builder/scripts.d/50-onevpl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git" -SCRIPT_COMMIT="208c0d4e8c6fac9d2058e6a169a4322f94f5306a" +SCRIPT_COMMIT="e12ace9761bb52786409e830f619916b86e87fc5" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh index 80f02049e0f..d8fbbf38860 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="19009" +SCRIPT_REV="19366" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index 1403a2afdbc..7807899c0bc 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="b010763bdb6f5dc8c7c43ed34440465be9c735cf" +SCRIPT_COMMIT="3cefedefe91fca543083d260d1ed32efd2e7cba5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index 61bae80409f..b2b86c57bfb 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="21f84cffd13eac92ac73c3c40853e1d1309fb0e9" +SCRIPT_COMMIT="6f3651c76d30c7564f9cbd2db8523a5bbaf2cee1" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/40-libdrm.sh b/builder/scripts.d/50-vaapi/40-libdrm.sh index 49bea6ef318..200aed91ed3 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="28d9a3c4fb4c99aafc31b288b3f735e19e728d64" +SCRIPT_COMMIT="98e1db501173303e58ef6a1def94ab7a2d84afc1" 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 56691e33582..e44719ed950 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="d46b38374a2c07ea3773fb96d4a8b1146173c27f" +SCRIPT_COMMIT="f4c4c0370df2b756bd201f25b1ed7942475d44e0" 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 1ef7d963fba..a4bfbc52f83 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.240" +SCRIPT_COMMIT="v1.3.250" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/builder/scripts.d/50-vulkan/50-shaderc.sh b/builder/scripts.d/50-vulkan/50-shaderc.sh index 2e1a27eaed6..1ebda3597ba 100755 --- a/builder/scripts.d/50-vulkan/50-shaderc.sh +++ b/builder/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="4a8f5e537f20bbcfe4b11f1fe45314f1dcbfddf6" +SCRIPT_COMMIT="4dc596ddc2702092c670e828745dc3e0338d83c1" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-vulkan/55-spirv-cross.sh b/builder/scripts.d/50-vulkan/55-spirv-cross.sh index 405ca5c6b07..f4c9de87442 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="3327924addfcffe8f1a4119cb09c1ad353fe1190" +SCRIPT_COMMIT="12542fc6fc05000e04742daf93892a0b10edbe80" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-vulkan/60-libplacebo.sh b/builder/scripts.d/50-vulkan/60-libplacebo.sh index 808e740f3a2..a7c85d17ea7 100755 --- a/builder/scripts.d/50-vulkan/60-libplacebo.sh +++ b/builder/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="2394aea167a5995860387a2511f8972143cd5b82" +SCRIPT_COMMIT="ed29e541a55acf28022738440b2a925386292551" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh index 460db949692..a5e4b2e4cc9 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="753305affb093ae15d5e4b333125267b16258c21" +SCRIPT_COMMIT="34532bda12a3a3141880582aa186a59cd4538ae6" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/builder/scripts.d/50-zimg.sh b/builder/scripts.d/50-zimg.sh index 50b4aac1d33..6bcfbc07000 100755 --- a/builder/scripts.d/50-zimg.sh +++ b/builder/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git" -SCRIPT_COMMIT="71394bd10d833ac48faa255f085c3e702a42921d" +SCRIPT_COMMIT="939a78cae6a8207ef778375dfcaa75511162a186" ffbuild_enabled() { return 0 diff --git a/docker-build-win64.sh b/docker-build-win64.sh index 9c816338c83..b0de0fcef98 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -6,7 +6,7 @@ set -o errexit set -o xtrace # Update mingw-w64 headers -git clone --depth=1 https://github.com/mirror/mingw-w64.git +git clone --depth=1 https://git.code.sf.net/p/mingw-w64/mingw-w64.git pushd mingw-w64/mingw-w64-headers ./configure \ --prefix=/usr/${FF_TOOLCHAIN} \ @@ -322,7 +322,7 @@ popd # OPENMPT mkdir mpt pushd mpt -mpt_ver="0.6.9" +mpt_ver="0.7.1" 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.2.3 --depth=1 https://chromium.googlesource.com/webm/libwebp +git clone -b v1.3.0 --depth=1 https://chromium.googlesource.com/webm/libwebp pushd libwebp ./autogen.sh ./configure \ @@ -456,7 +456,7 @@ popd popd # SVT-AV1 -git clone -b v1.3.0 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git +git clone -b v1.5.0 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git pushd SVT-AV1 mkdir build pushd build @@ -473,7 +473,7 @@ popd popd # DAV1D -git clone -b 1.1.0 --depth=1 https://code.videolan.org/videolan/dav1d.git +git clone -b 1.2.1 --depth=1 https://code.videolan.org/videolan/dav1d.git pushd dav1d mkdir build pushd build @@ -506,14 +506,14 @@ make install popd # OpenCL headers -git clone -b v2023.02.06 --depth=1 https://github.com/KhronosGroup/OpenCL-Headers.git +git clone -b v2023.04.17 --depth=1 https://github.com/KhronosGroup/OpenCL-Headers.git pushd OpenCL-Headers/CL mkdir -p ${FF_DEPS_PREFIX}/include/CL mv * ${FF_DEPS_PREFIX}/include/CL popd # OpenCL ICD loader -git clone -b v2023.02.06 --depth=1 https://github.com/KhronosGroup/OpenCL-ICD-Loader.git +git clone -b v2023.04.17 --depth=1 https://github.com/KhronosGroup/OpenCL-ICD-Loader.git pushd OpenCL-ICD-Loader mkdir build pushd build diff --git a/docker-build.sh b/docker-build.sh index 4e0ca0b0a44..c33c162db61 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -91,7 +91,7 @@ prepare_extra_common() { # DAV1D pushd ${SOURCE_DIR} - git clone -b 1.1.0 --depth=1 https://code.videolan.org/videolan/dav1d.git + git clone -b 1.2.1 --depth=1 https://code.videolan.org/videolan/dav1d.git if [ "${ARCH}" = "amd64" ]; then nasmver="$(nasm -v | cut -d ' ' -f3)" nasmminver="2.14.0" @@ -141,7 +141,7 @@ prepare_extra_amd64() { NASM_PATH=/usr/lib/nasm-mozilla/bin/nasm fi pushd ${SOURCE_DIR} - git clone -b v1.3.0 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git + git clone -b v1.5.0 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git pushd SVT-AV1 mkdir build pushd build @@ -218,7 +218,7 @@ prepare_extra_amd64() { # LIBVA-UTILS pushd ${SOURCE_DIR} - git clone -b 2.18.0 --depth=1 https://github.com/intel/libva-utils.git + git clone -b 2.18.2 --depth=1 https://github.com/intel/libva-utils.git pushd libva-utils ./autogen.sh ./configure --prefix=${TARGET_DIR} @@ -256,7 +256,7 @@ prepare_extra_amd64() { # Provides MSDK runtime (libmfxhw64.so.1) for 11th Gen Rocket Lake and older # Provides MFX dispatcher (libmfx.so.1) for FFmpeg pushd ${SOURCE_DIR} - git clone -b intel-mediasdk-23.1.6 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK.git + git clone -b intel-mediasdk-23.2.2 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK.git pushd MediaSDK 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 @@ -276,7 +276,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.1.5 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git + git clone -b intel-onevpl-23.2.2 --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,12 +296,12 @@ 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.1.6 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-23.2.3 --depth=1 https://github.com/intel/media-driver.git pushd media-driver # Possible fix for TGLx timeout caused by 'HCP Scalability Decode' under heavy load - wget -q -O - https://github.com/intel/media-driver/commit/284750bf.patch | git apply - # Fix for the HEVC encoder ICQ rate control capability on DG2 - wget -q -O - https://github.com/intel/media-driver/commit/580f8738.patch | git apply + wget -q -O - https://github.com/intel/media-driver/commit/cbbd676f.patch | git apply + # Correct AV1 supported tx mode caps for the AV1 VA-API encoder + wget -q -O - https://github.com/intel/media-driver/commit/89201eaa.patch | git apply mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ -DENABLE_KERNELS=ON \ @@ -382,7 +382,7 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} git clone https://gitlab.freedesktop.org/mesa/mesa.git pushd mesa - git reset --hard "4b182dbc" + git reset --hard "cf323446" popd # disable the broken hevc packed header MESA_VA_PIC="mesa/src/gallium/frontends/va/picture.c" From d058bea5b6bd1d4e29e23275c74aac43ad432daa Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 3 Jun 2023 16:07:07 +0800 Subject: [PATCH 5/5] Bump version to 5.1.3-2 Signed-off-by: nyanmisaka --- build.yaml | 2 +- debian/changelog | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/build.yaml b/build.yaml index 8d03daed332..a03e56f88ed 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-1" +version: "5.1.3-2" packages: - buster-amd64 - buster-armhf diff --git a/debian/changelog b/debian/changelog index 841c767780f..2e76e77edf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +jellyfin-ffmpeg (5.1.3-2) unstable; urgency=medium + + * Update deprecated params for SVT-AV1 encoder + * Backport upstream qsvenc fixes + * Fix the slow VPP tone-mapping on DG2 + * Update dependencies and build scripts + + -- nyanmisaka Thu, 29 Apr 2023 22:46:11 +0800 + jellyfin-ffmpeg (5.1.3-1) unstable; urgency=medium * New upstream version 5.1.3