diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7bc9b14d86c..d685244a550 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,12 +8,14 @@ on: push: branches: - jellyfin + - jellyfin-7.0 paths-ignore: - '**/*.md' pull_request: branches: - jellyfin + - jellyfin-7.0 paths-ignore: - '**/*.md' diff --git a/builder/images/base-linux64/ct-ng-config b/builder/images/base-linux64/ct-ng-config index 146c8062951..9cc804127eb 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.26.0.93_a87bf7f Configuration +# crosstool-NG 1.26.0.106_ed12fa6 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -29,7 +29,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.26.0.93_a87bf7f" +CT_VERSION="1.26.0.106_ed12fa6" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -268,6 +268,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_10 is not set # CT_LINUX_V_6_9 is not set # CT_LINUX_V_6_8 is not set # CT_LINUX_V_6_7 is not set @@ -462,6 +463,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_40 is not set # CT_GLIBC_V_2_39 is not set # CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set @@ -614,7 +616,7 @@ CT_GCC_V_14=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="14.1.0" +CT_GCC_VERSION="14.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}" diff --git a/builder/images/base-linuxarm64/ct-ng-config b/builder/images/base-linuxarm64/ct-ng-config index 2cd50855541..70d2a6fd089 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.26.0.93_a87bf7f Configuration +# crosstool-NG 1.26.0.106_ed12fa6 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -29,7 +29,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.26.0.93_a87bf7f" +CT_VERSION="1.26.0.106_ed12fa6" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -275,6 +275,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_10 is not set # CT_LINUX_V_6_9 is not set # CT_LINUX_V_6_8 is not set # CT_LINUX_V_6_7 is not set @@ -468,6 +469,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_40 is not set # CT_GLIBC_V_2_39 is not set # CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set @@ -619,7 +621,7 @@ CT_GCC_V_14=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="14.1.0" +CT_GCC_VERSION="14.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}" diff --git a/builder/images/base-win64/Dockerfile b/builder/images/base-win64/Dockerfile index 7f3c3c8a369..e2078848741 100644 --- a/builder/images/base-win64/Dockerfile +++ b/builder/images/base-win64/Dockerfile @@ -3,7 +3,6 @@ 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 && \ - curl "https://github.com/gcc-mirror/gcc/commit/747c4b58573ea00419f64293a61537eb69f43307.patch" > packages/gcc/14.1.0/9999-fix-inline.patch && \ ./bootstrap && \ ./configure --enable-local && \ make -j$(nproc) && \ diff --git a/builder/images/base-win64/ct-ng-config b/builder/images/base-win64/ct-ng-config index 5fa1ecfb181..67c99f1d4f1 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.26.0.93_a87bf7f Configuration +# crosstool-NG 1.26.0.106_ed12fa6 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -29,7 +29,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.26.0.93_a87bf7f" +CT_VERSION="1.26.0.106_ed12fa6" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -458,7 +458,7 @@ CT_GCC_V_14=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="14.1.0" +CT_GCC_VERSION="14.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}" diff --git a/builder/scripts.d/50-libvpl.sh b/builder/scripts.d/50-libvpl.sh index 241f6bcc641..37ebed14581 100755 --- a/builder/scripts.d/50-libvpl.sh +++ b/builder/scripts.d/50-libvpl.sh @@ -17,8 +17,8 @@ ffbuild_dockerbuild() { cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ -DCMAKE_INSTALL_BINDIR="$FFBUILD_PREFIX"/bin -DCMAKE_INSTALL_LIBDIR="$FFBUILD_PREFIX"/lib \ - -DBUILD_DISPATCHER=ON -DBUILD_DEV=ON \ - -DBUILD_PREVIEW=OFF -DBUILD_TOOLS=OFF -DBUILD_TOOLS_ONEVPL_EXPERIMENTAL=OFF -DINSTALL_EXAMPLE_CODE=OFF \ + -DINSTALL_DEV=ON -DINSTALL_LIB=ON \ + -DBUILD_EXAMPLES=OFF -DBUILD_EXPERIMENTAL=OFF \ -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF .. ninja -j$(nproc) diff --git a/debian/patches/0007-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch b/debian/patches/0007-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch index a26592e461f..736e988878d 100644 --- a/debian/patches/0007-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch +++ b/debian/patches/0007-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch @@ -1405,7 +1405,7 @@ Index: FFmpeg/libavfilter/vf_tonemap_opencl.c + if (max_compute_units >= 40) + ctx->tradeoff = 0; + if (device_name = check_opencl_device_str(ctx->ocf.hwctx->device_id, CL_DEVICE_NAME)) { -+ const char *excluded_devices[4] = { "Iris", "Xe", "770", "750" }; ++ const char *excluded_devices[5] = { "Arc", "Iris", "Xe", "770", "750" }; + for (i = 0; i < FF_ARRAY_ELEMS(excluded_devices); i++) { + if (strstr(device_name, excluded_devices[i])) { + ctx->tradeoff = 0; diff --git a/docker-build-win64.sh b/docker-build-win64.sh index 58953b5706f..ea260451c18 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -565,10 +565,8 @@ cmake \ -DCMAKE_INSTALL_LIBDIR=${FF_DEPS_PREFIX}/lib \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_{DISPATCHER,DEV}=ON \ - -DBUILD_{PREVIEW,TESTS}=OFF \ - -DBUILD_TOOLS{,_ONEVPL_EXPERIMENTAL}=OFF \ - -DINSTALL_EXAMPLE_CODE=OFF \ + -DINSTALL_{DEV,LIB}=ON \ + -DBUILD_{TESTS,EXAMPLES,EXPERIMENTAL}=OFF \ .. make -j$(nproc) make install diff --git a/docker-build.sh b/docker-build.sh index 319ab9a8b84..58a3bbf87ee 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -382,7 +382,7 @@ prepare_extra_amd64() { # GMMLIB pushd ${SOURCE_DIR} - git clone -b intel-gmmlib-22.4.1 --depth=1 https://github.com/intel/gmmlib.git + git clone -b intel-gmmlib-22.5.0 --depth=1 https://github.com/intel/gmmlib.git pushd gmmlib mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -399,6 +399,8 @@ prepare_extra_amd64() { pushd MediaSDK # fix build in gcc 13 wget -q -O - https://github.com/Intel-Media-SDK/MediaSDK/commit/8fb9f5f.patch | git apply + # fix ADI issue with VPL patch + wget -q -O - https://github.com/intel/vpl-gpu-rt/commit/e025c82.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} \ @@ -425,10 +427,8 @@ prepare_extra_amd64() { -DCMAKE_INSTALL_LIBDIR=${TARGET_DIR}/lib \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_{DISPATCHER,DEV}=ON \ - -DBUILD_{PREVIEW,TESTS}=OFF \ - -DBUILD_TOOLS{,_ONEVPL_EXPERIMENTAL}=OFF \ - -DINSTALL_EXAMPLE_CODE=OFF \ + -DINSTALL_{DEV,LIB}=ON \ + -DBUILD_{TESTS,EXAMPLES,EXPERIMENTAL}=OFF \ .. make -j$(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/intel echo "intel${TARGET_DIR}/lib/libvpl.so* usr/lib/jellyfin-ffmpeg/lib" >> ${DPKG_INSTALL_LIST} @@ -439,7 +439,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-24.2.5 --depth=1 https://github.com/intel/vpl-gpu-rt.git + git clone -b intel-onevpl-24.3.1 --depth=1 https://github.com/intel/vpl-gpu-rt.git pushd vpl-gpu-rt mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -459,7 +459,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-24.2.5 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-24.3.1 --depth=1 https://github.com/intel/media-driver.git pushd media-driver mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ diff --git a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD index 6a8ef382e37..d688e415c05 100644 --- a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD @@ -65,10 +65,8 @@ build() { -DCMAKE_INSTALL_PREFIX="${FF_MINGW_PREFIX}" \ "${extra_config[@]}" \ -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_{DISPATCHER,DEV}=ON \ - -DBUILD_{PREVIEW,TESTS}=OFF \ - -DBUILD_TOOLS{,_ONEVPL_EXPERIMENTAL}=OFF \ - -DINSTALL_EXAMPLE_CODE=OFF \ + -DINSTALL_{DEV,LIB}=ON \ + -DBUILD_{TESTS,EXAMPLES,EXPERIMENTAL}=OFF \ ../libvpl-${pkgver} "${MINGW_TOOLCHAIN_PREFIX}"/bin/cmake.exe --build .