diff --git a/build-win64 b/build-win64 index d88f0fe728f..dbf25ed53e0 100755 --- a/build-win64 +++ b/build-win64 @@ -10,7 +10,7 @@ done # Use the latest distro for toolchains distro="ubuntu:jammy" -ffrevison="1" +ffrevison="2" image_name="jellyfin-ffmpeg-build-windows-win64" package_temporary_dir="$( mktemp -d )" current_user="$( whoami )" diff --git a/build.yaml b/build.yaml index 4384244a71e..e4f5ad40fbf 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-1" +version: "5.1-2" packages: - buster-amd64 - buster-armhf diff --git a/debian/changelog b/debian/changelog index 02b8f58829e..6823ec56c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jellyfin-ffmpeg (5.1-2) unstable; urgency=medium + + * Revert Mesa to the last release + * Update dependencies + + -- nyanmisaka Mon, 15 Aug 2022 19:29:03 +0800 + jellyfin-ffmpeg (5.1-1) unstable; urgency=medium * New upstream version 5.1 diff --git a/docker-build.sh b/docker-build.sh index 4b779737343..5413e29ac59 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -230,7 +230,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-22.5.1 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK + git clone -b intel-mediasdk-22.5.2 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK 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 @@ -250,7 +250,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-22.5.1 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu + git clone -b intel-onevpl-22.5.2 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu pushd oneVPL-intel-gpu mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -264,7 +264,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-22.5.1 --depth=1 https://github.com/intel/media-driver + git clone -b intel-media-22.5.2 --depth=1 https://github.com/intel/media-driver pushd media-driver sed -i 's|find_package(X11)||g' media_softlet/media_top_cmake.cmake media_driver/media_top_cmake.cmake mkdir build && pushd build @@ -284,7 +284,7 @@ prepare_extra_amd64() { # Vulkan Headers pushd ${SOURCE_DIR} - git clone -b v1.3.222 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers + git clone -b v1.3.224 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers pushd Vulkan-Headers mkdir build && pushd build cmake \ @@ -297,7 +297,7 @@ prepare_extra_amd64() { # Vulkan ICD Loader pushd ${SOURCE_DIR} - git clone -b v1.3.222 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader + git clone -b v1.3.224 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader pushd Vulkan-Loader mkdir build && pushd build cmake \ @@ -318,7 +318,7 @@ prepare_extra_amd64() { # SHADERC pushd ${SOURCE_DIR} - git clone -b v2022.1 --depth=1 https://github.com/google/shaderc + git clone -b v2022.2 --depth=1 https://github.com/google/shaderc pushd shaderc ./utils/git-sync-deps mkdir build && pushd build @@ -348,7 +348,7 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} mkdir mesa pushd mesa - mesa_ver="22.1.4" + mesa_ver="22.0.5" mesa_link="https://mesa.freedesktop.org/archive/mesa-${mesa_ver}.tar.xz" wget ${mesa_link} -O mesa.tar.xz tar xaf mesa.tar.xz