From 6d44178f7e62be70d27bea2cd243988e1ee8bc46 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 4 Jul 2026 14:56:26 +0800 Subject: [PATCH] Update build script and dependencies Signed-off-by: nyanmisaka --- builder/images/base-linux64/Dockerfile | 1 + builder/images/base-linux64/ct-ng-config | 4 ++-- builder/images/base-linuxarm64/Dockerfile | 1 + builder/images/base-linuxarm64/ct-ng-config | 4 ++-- builder/scripts.d/25-openssl.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-libxfixes.sh | 2 +- builder/scripts.d/45-x11/50-libxi.sh | 2 +- builder/scripts.d/45-x11/50-libxinerama.sh | 2 +- builder/scripts.d/45-x11/50-libxrender.sh | 2 +- builder/scripts.d/45-x11/50-libxscrnsaver.sh | 2 +- builder/scripts.d/45-x11/50-libxxf86vm.sh | 2 +- builder/scripts.d/45-x11/60-libxcursor.sh | 2 +- builder/scripts.d/45-x11/60-libxrandr.sh | 2 +- builder/scripts.d/45-x11/60-libxv.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 | 4 ++-- docker-build.sh | 6 +++--- msys2/PKGBUILD/50-mingw-w64-shaderc/PKGBUILD | 14 +++++++++----- 23 files changed, 37 insertions(+), 29 deletions(-) diff --git a/builder/images/base-linux64/Dockerfile b/builder/images/base-linux64/Dockerfile index cf78c899e..0af1d29e5 100644 --- a/builder/images/base-linux64/Dockerfile +++ b/builder/images/base-linux64/Dockerfile @@ -3,6 +3,7 @@ FROM $GH_REPO/base:latest RUN --mount=src=ct-ng-config,dst=/.config \ git clone --filter=blob:none https://github.com/crosstool-ng/crosstool-ng.git /ct-ng && cd /ct-ng && \ + rm -rf packages/linux/*/chksum && \ ./bootstrap && \ ./configure --enable-local && \ make -j$(nproc) && \ diff --git a/builder/images/base-linux64/ct-ng-config b/builder/images/base-linux64/ct-ng-config index fe76cf997..1c8d7b5d2 100644 --- a/builder/images/base-linux64/ct-ng-config +++ b/builder/images/base-linux64/ct-ng-config @@ -76,7 +76,7 @@ CT_DOWNLOAD_AGENT_WGET=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set -CT_CONNECT_TIMEOUT=10 +CT_CONNECT_TIMEOUT=60 CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set @@ -333,7 +333,7 @@ CT_LINUX_V_4_18=y # CT_LINUX_V_3_4 is not set # CT_LINUX_V_3_2 is not set CT_LINUX_VERSION="4.18.20" -CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})" +CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION}) https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/snapshot" CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/builder/images/base-linuxarm64/Dockerfile b/builder/images/base-linuxarm64/Dockerfile index 473193e02..f31149544 100644 --- a/builder/images/base-linuxarm64/Dockerfile +++ b/builder/images/base-linuxarm64/Dockerfile @@ -3,6 +3,7 @@ FROM $GH_REPO/base:latest RUN --mount=src=ct-ng-config,dst=/.config \ git clone --filter=blob:none https://github.com/crosstool-ng/crosstool-ng.git /ct-ng && cd /ct-ng && \ + rm -rf packages/linux/*/chksum && \ ./bootstrap && \ ./configure --enable-local && \ make -j$(nproc) && \ diff --git a/builder/images/base-linuxarm64/ct-ng-config b/builder/images/base-linuxarm64/ct-ng-config index 51b2135cb..64bca1e56 100644 --- a/builder/images/base-linuxarm64/ct-ng-config +++ b/builder/images/base-linuxarm64/ct-ng-config @@ -76,7 +76,7 @@ CT_DOWNLOAD_AGENT_WGET=y # CT_DOWNLOAD_AGENT_NONE is not set # CT_FORBID_DOWNLOAD is not set # CT_FORCE_DOWNLOAD is not set -CT_CONNECT_TIMEOUT=10 +CT_CONNECT_TIMEOUT=60 CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary" # CT_ONLY_DOWNLOAD is not set # CT_USE_MIRROR is not set @@ -339,7 +339,7 @@ CT_LINUX_V_4_18=y # CT_LINUX_V_3_12 is not set # CT_LINUX_V_3_10 is not set CT_LINUX_VERSION="4.18.20" -CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})" +CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION}) https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/snapshot" CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/builder/scripts.d/25-openssl.sh b/builder/scripts.d/25-openssl.sh index 315f0d2f0..829fe4c6e 100755 --- a/builder/scripts.d/25-openssl.sh +++ b/builder/scripts.d/25-openssl.sh @@ -40,11 +40,13 @@ ffbuild_dockerbuild() { ) elif [[ $TARGET == linux64 ]]; then myconf+=( + --openssldir=/etc/ssl --cross-compile-prefix="$FFBUILD_CROSS_PREFIX" linux-x86_64 ) elif [[ $TARGET == linuxarm64 ]]; then myconf+=( + --openssldir=/etc/ssl --cross-compile-prefix="$FFBUILD_CROSS_PREFIX" linux-aarch64 ) diff --git a/builder/scripts.d/45-x11/20-libxau.sh b/builder/scripts.d/45-x11/20-libxau.sh index fd82a896d..6b53bd7ff 100755 --- a/builder/scripts.d/45-x11/20-libxau.sh +++ b/builder/scripts.d/45-x11/20-libxau.sh @@ -31,7 +31,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/30-libxcb.sh b/builder/scripts.d/45-x11/30-libxcb.sh index 6b42b7448..1e7003a56 100755 --- a/builder/scripts.d/45-x11/30-libxcb.sh +++ b/builder/scripts.d/45-x11/30-libxcb.sh @@ -32,7 +32,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/40-libx11.sh b/builder/scripts.d/45-x11/40-libx11.sh index 4cbc32f9e..61b83fed9 100755 --- a/builder/scripts.d/45-x11/40-libx11.sh +++ b/builder/scripts.d/45-x11/40-libx11.sh @@ -43,7 +43,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/50-libxext.sh b/builder/scripts.d/45-x11/50-libxext.sh index 6582a42b7..03bf766fa 100755 --- a/builder/scripts.d/45-x11/50-libxext.sh +++ b/builder/scripts.d/45-x11/50-libxext.sh @@ -41,7 +41,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS -D_GNU_SOURCE" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/50-libxfixes.sh b/builder/scripts.d/45-x11/50-libxfixes.sh index f59b7a16a..13ba15963 100755 --- a/builder/scripts.d/45-x11/50-libxfixes.sh +++ b/builder/scripts.d/45-x11/50-libxfixes.sh @@ -31,7 +31,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/50-libxi.sh b/builder/scripts.d/45-x11/50-libxi.sh index 351d12050..ddee37a7b 100755 --- a/builder/scripts.d/45-x11/50-libxi.sh +++ b/builder/scripts.d/45-x11/50-libxi.sh @@ -37,7 +37,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/50-libxinerama.sh b/builder/scripts.d/45-x11/50-libxinerama.sh index 6f1f9f131..983758100 100755 --- a/builder/scripts.d/45-x11/50-libxinerama.sh +++ b/builder/scripts.d/45-x11/50-libxinerama.sh @@ -37,7 +37,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/50-libxrender.sh b/builder/scripts.d/45-x11/50-libxrender.sh index a49009788..44d9d274d 100755 --- a/builder/scripts.d/45-x11/50-libxrender.sh +++ b/builder/scripts.d/45-x11/50-libxrender.sh @@ -37,7 +37,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/50-libxscrnsaver.sh b/builder/scripts.d/45-x11/50-libxscrnsaver.sh index 4894277e1..a9dbad533 100755 --- a/builder/scripts.d/45-x11/50-libxscrnsaver.sh +++ b/builder/scripts.d/45-x11/50-libxscrnsaver.sh @@ -37,7 +37,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/50-libxxf86vm.sh b/builder/scripts.d/45-x11/50-libxxf86vm.sh index a31f32514..31f50c449 100755 --- a/builder/scripts.d/45-x11/50-libxxf86vm.sh +++ b/builder/scripts.d/45-x11/50-libxxf86vm.sh @@ -37,7 +37,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/60-libxcursor.sh b/builder/scripts.d/45-x11/60-libxcursor.sh index 531ab6b61..df15dcd2d 100755 --- a/builder/scripts.d/45-x11/60-libxcursor.sh +++ b/builder/scripts.d/45-x11/60-libxcursor.sh @@ -31,7 +31,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/60-libxrandr.sh b/builder/scripts.d/45-x11/60-libxrandr.sh index 28e1beb26..eb0a61057 100755 --- a/builder/scripts.d/45-x11/60-libxrandr.sh +++ b/builder/scripts.d/45-x11/60-libxrandr.sh @@ -37,7 +37,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/45-x11/60-libxv.sh b/builder/scripts.d/45-x11/60-libxv.sh index f53f248b7..6272c88bd 100755 --- a/builder/scripts.d/45-x11/60-libxv.sh +++ b/builder/scripts.d/45-x11/60-libxv.sh @@ -38,7 +38,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" ./configure "${myconf[@]}" make -j$(nproc) diff --git a/builder/scripts.d/50-vaapi/30-libpciaccess.sh b/builder/scripts.d/50-vaapi/30-libpciaccess.sh index 97dd51fee..31262c0d3 100755 --- a/builder/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/builder/scripts.d/50-vaapi/30-libpciaccess.sh @@ -31,7 +31,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" meson setup "${myconf[@]}" .. ninja -j$(nproc) diff --git a/builder/scripts.d/50-vaapi/40-libdrm.sh b/builder/scripts.d/50-vaapi/40-libdrm.sh index a6f909f9a..4984979bc 100755 --- a/builder/scripts.d/50-vaapi/40-libdrm.sh +++ b/builder/scripts.d/50-vaapi/40-libdrm.sh @@ -40,7 +40,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" meson "${myconf[@]}" .. ninja -j$(nproc) diff --git a/builder/scripts.d/50-vaapi/50-libva.sh b/builder/scripts.d/50-vaapi/50-libva.sh index 89090483f..ed363c09b 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="dbf83dc3b1ce6bad46e1628aaf2da5ef731157b8" +SCRIPT_COMMIT="add80723247b8031fb8de14d8f599923d3759242" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 @@ -57,7 +57,7 @@ ffbuild_dockerbuild() { fi export CFLAGS="$RAW_CFLAGS" - export LDFLAFS="$RAW_LDFLAGS" + export LDFLAGS="$RAW_LDFLAGS" meson setup "${myconf[@]}" .. ninja -j$(nproc) diff --git a/docker-build.sh b/docker-build.sh index bca2b6fb2..38148b0b9 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -352,7 +352,7 @@ prepare_extra_amd64() { # LIBVA pushd ${SOURCE_DIR} - git clone -b 2.23.0 --depth=1 https://github.com/intel/libva.git + git clone -b 2.24.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 @@ -454,7 +454,7 @@ prepare_extra_amd64() { # VPL-GPU-RT (RT only) # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer pushd ${SOURCE_DIR} - git clone -b intel-onevpl-26.2.3 --depth=1 https://github.com/intel/vpl-gpu-rt.git + git clone -b intel-onevpl-26.2.4 --depth=1 https://github.com/intel/vpl-gpu-rt.git pushd vpl-gpu-rt # Fix missing entries in PicStruct validation wget -q -O - https://github.com/intel/vpl-gpu-rt/commit/c7eb030.patch | git apply @@ -476,7 +476,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-26.2.3 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-26.2.4 --depth=1 https://github.com/intel/media-driver.git pushd media-driver # Enable VC1 decode on DG2 (note that MTL+ is not supported) wget -q -O - https://github.com/intel/media-driver/commit/e47702f.patch | git apply diff --git a/msys2/PKGBUILD/50-mingw-w64-shaderc/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-shaderc/PKGBUILD index ffe0e40ce..b40203f72 100644 --- a/msys2/PKGBUILD/50-mingw-w64-shaderc/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-shaderc/PKGBUILD @@ -20,14 +20,18 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-python") -source=("https://github.com/google/shaderc/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") +source=("${_realname}"::"git+https://github.com/google/${_realname}.git#tag=v${pkgver}") sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/${_realname}" + + # Fixup "IS NOT TOP-LEVEL GIT DIRECTORY" on Windows + sed -i 's/def is_git_toplevel(git, directory):/&\n return True/' utils/git-sync-deps + ./utils/git-sync-deps || return 1 } @@ -44,7 +48,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake.exe \ -GNinja \ - -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX="${FF_MINGW_PREFIX}" \ "${_extra_config[@]}" \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_GLSLANG_BINARIES=ON \ @@ -54,7 +58,7 @@ build() { -DSHADERC_SKIP_COPYRIGHT_CHECK=ON \ -DSHADERC_ENABLE_WERROR_COMPILE=OFF \ -DPython_EXECUTABLE="${MINGW_TOOLCHAIN_PREFIX}/bin/python.exe" \ - ../${_realname}-${pkgver} + "../${_realname}" ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake.exe --build ./ } @@ -76,6 +80,6 @@ package() { cp shaderc_combined.pc shaderc.pc popd - install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" \ + install -Dm644 "${srcdir}/${_realname}/LICENSE" \ "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" }