Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: nyanmisaka <[email protected]>
  • Loading branch information
nyanmisaka committed Jul 29, 2023
1 parent 07c56ab commit c01f11d
Show file tree
Hide file tree
Showing 31 changed files with 53 additions and 47 deletions.
2 changes: 1 addition & 1 deletion builder/scripts.d/10-mingw-std-threads.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/meganz/mingw-std-threads.git"
SCRIPT_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6"
SCRIPT_COMMIT="c931bac289dd431f1dd30fc4a5d1a7be36668073"

ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/20-libxml2.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
SCRIPT_COMMIT="884474477284474e0151280aaa275a18e3d7a036"
SCRIPT_COMMIT="75693281389aab047b424d46df944b35ab4a3263"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-fftw3f.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a"
SCRIPT_COMMIT="69f6c1a6ebd7ac5af33e7074134fb79fbc729c3d"

ffbuild_enabled() {
# Dependency of GPL-Only librubberband
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-freetype.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
SCRIPT_COMMIT="e4586d960f339cf75e2e0b34aee30a0ed8353c0d"
SCRIPT_COMMIT="9e3c5d7e183c1a8d5ed8868d7d28ef18d3ec9ec8"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-xz.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
SCRIPT_COMMIT="dbb3a536ed9873ffa0870321f6873e564c6a9da8"
SCRIPT_COMMIT="43845fa70fc751736c44c18f4cee42d49bfd1392"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/35-fontconfig.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
SCRIPT_COMMIT="7e2a1b2577e8d90ea5be3f14091e809ac7742438"
SCRIPT_COMMIT="f07d7c67e4de05c25ee391e99ee9368f1136317d"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-harfbuzz.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
SCRIPT_COMMIT="d4bbe3f48663944385f25f608438e1eb678fc4b7"
SCRIPT_COMMIT="b36b100ef1c94012456c807167b2ac07443380ce"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/10-xcbproto.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
SCRIPT_COMMIT="cfcc51836c1f2c174b67073cc8bed92e7e9c9569"
SCRIPT_COMMIT="b016df100111b56d7c1a2c63ea6791b2287a83e4"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/10-xproto.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
SCRIPT_COMMIT="766967322209f2dcb72e6a8edea0c651f586201d"
SCRIPT_COMMIT="704a75eecdf177a8b18ad7e35813f2f979b0c277"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/20-libxau.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
SCRIPT_COMMIT="df1bf4fe528a5a9eef420f78efb225e4696ac467"
SCRIPT_COMMIT="68e74d37b99f56bbd1a5f2fb8cb4ad6116f27bd3"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/30-libxcb.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
SCRIPT_COMMIT="8935793f1f3751a6aa9d78955c7d6236177986de"
SCRIPT_COMMIT="038636786ad1914f3daf3503ae9611f40dffbb8f"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/40-libx11.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
SCRIPT_COMMIT="ab0442d3fa835ce16559b29532ac7f674f8557f4"
SCRIPT_COMMIT="b2c3fb7b4dd4c4c7b9d28c7af7776cccc8e0a98b"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/60-libxcursor.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
SCRIPT_COMMIT="a353f02a7ac4504ad5edb5407278c7a03c507aef"
SCRIPT_COMMIT="9c1b50ed98d354488329c99bc8bf77d1c6df657c"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-amf.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
SCRIPT_COMMIT="bd5db31d3d8ea1fae7002dd903898599bdb7d97a"
SCRIPT_COMMIT="68f2396f1a55a5b12767f5433411bb4093ea65ed"

ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-dav1d.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
SCRIPT_COMMIT="2373fda303d46489c1ec269dc66369a31663cb25"
SCRIPT_COMMIT="e58afe4dd9057591882a01c31382c203e8a61c92"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libass.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/libass/libass.git"
SCRIPT_COMMIT="1a599b1db748dfc07df98cd37d8603edb87da2fd"
SCRIPT_COMMIT="d1f0f20bfa98864cd2aaf931f144909d319545aa"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libvpx.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
SCRIPT_COMMIT="14e52008edbf2e91386423fdd53310fe49654991"
SCRIPT_COMMIT="d62edaf41f8ffb3f1bc3e7f7b449c63258666d9c"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libwebp.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
SCRIPT_COMMIT="08d60d60066eb30ab8e0e3ccfa0cd0b68f8cccc6"
SCRIPT_COMMIT="1432ebbadb83afcae114d93cc242135c224927de"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-onevpl.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
SCRIPT_COMMIT="e12ace9761bb52786409e830f619916b86e87fc5"
SCRIPT_COMMIT="ca5bbbb057a6e84b103aca807612afb693ad046c"

ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-openmpt.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
SCRIPT_REV="19439"
SCRIPT_REV="19560"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-srt.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/Haivision/srt.git"
SCRIPT_COMMIT="9448e26fcd7602098b4bf9cd7fe535136e89e10b"
SCRIPT_COMMIT="9f4e9b67433f6480e681ac962dbd4f0160aa0f95"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-svtav1.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
SCRIPT_COMMIT="08c18ba0768ed3dbbff0903adc326fb3a7549bd9"
SCRIPT_COMMIT="628bc15e5ef896a6c6267eca18b6b6177f0440e2"

ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vaapi/30-libpciaccess.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
SCRIPT_COMMIT="8980a39004b10298a7db1f1b0b711a19e8b73aee"
SCRIPT_COMMIT="03d0b467804bf033c2be259be3f091231f74cff9"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vaapi/40-libdrm.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
SCRIPT_COMMIT="98e1db501173303e58ef6a1def94ab7a2d84afc1"
SCRIPT_COMMIT="4de32c86096c09b0ad8aa18d6fd4536159d2c0cd"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vaapi/50-libva.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/intel/libva.git"
SCRIPT_COMMIT="1c58941b93ba5013c68e8370a408efd630275c9c"
SCRIPT_COMMIT="23f7a41dfa29cdf8b4b5216ec5760a5444e7369f"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vulkan/50-shaderc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/google/shaderc.git"
SCRIPT_COMMIT="e31c4c2e41544d63d90be28c46e4a4793a624240"
SCRIPT_COMMIT="4d98dac61ee4857ea0691a2b9a48aee44eb409db"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vulkan/55-spirv-cross.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
SCRIPT_COMMIT="2d3a152081ca6e6bea7093940d0f81088fe4d01c"
SCRIPT_COMMIT="bccaa94db814af33d8ef05c153e7c34d8bd4d685"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-x265.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
SCRIPT_COMMIT="34532bda12a3a3141880582aa186a59cd4538ae6"
SCRIPT_COMMIT="8f18e3ad32684eee95e885e718655f93951128c3"

ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-zimg.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
SCRIPT_COMMIT="939a78cae6a8207ef778375dfcaa75511162a186"
SCRIPT_COMMIT="71431815950664f1e11b9ee4e5d4ba23d6d997f1"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion docker-build-win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ popd
popd

# LIBWEBP
git clone -b v1.3.0 --depth=1 https://chromium.googlesource.com/webm/libwebp
git clone -b v1.3.1 --depth=1 https://chromium.googlesource.com/webm/libwebp
pushd libwebp
./autogen.sh
./configure \
Expand Down
40 changes: 23 additions & 17 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ prepare_extra_amd64() {

# LIBVA
pushd ${SOURCE_DIR}
git clone -b 2.18.0 --depth=1 https://github.com/intel/libva.git
git clone -b 2.19.0 --depth=1 https://github.com/intel/libva.git
pushd libva
sed -i 's|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|getenv("LIBVA_DRIVER_NAME")|getenv("LIBVA_DRIVER_NAME_JELLYFIN")|g' va/va.c
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
./autogen.sh
./configure \
--prefix=${TARGET_DIR} \
Expand All @@ -218,7 +218,7 @@ prepare_extra_amd64() {

# LIBVA-UTILS
pushd ${SOURCE_DIR}
git clone -b 2.18.2 --depth=1 https://github.com/intel/libva-utils.git
git clone -b 2.19.0 --depth=1 https://github.com/intel/libva-utils.git
pushd libva-utils
./autogen.sh
./configure --prefix=${TARGET_DIR}
Expand All @@ -242,7 +242,7 @@ prepare_extra_amd64() {

# GMMLIB
pushd ${SOURCE_DIR}
git clone -b intel-gmmlib-22.3.7 --depth=1 https://github.com/intel/gmmlib.git
git clone -b intel-gmmlib-22.3.9 --depth=1 https://github.com/intel/gmmlib.git
pushd gmmlib
mkdir build && pushd build
cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} ..
Expand Down Expand Up @@ -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.2.3 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git
git clone -b intel-onevpl-23.3.0 --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} \
Expand All @@ -296,14 +296,8 @@ 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.2.3 --depth=1 https://github.com/intel/media-driver.git
git clone -b intel-media-23.3.0 --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/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
# Fix the slow VPP tone-mapping on ADL-S and ADL-N
wget -q -O - https://github.com/intel/media-driver/commit/1097e39b.patch | git apply
mkdir build && pushd build
cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \
-DENABLE_KERNELS=ON \
Expand All @@ -321,7 +315,11 @@ prepare_extra_amd64() {

# Vulkan Headers
pushd ${SOURCE_DIR}
git clone -b v1.3.240 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git
vk_ver="v1.3.259"
if [[ $( lsb_release -c -s ) == "bionic" ]]; then
vk_ver="v1.3.240"
fi
git clone -b ${vk_ver} --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git
pushd Vulkan-Headers
mkdir build && pushd build
cmake \
Expand All @@ -334,7 +332,11 @@ prepare_extra_amd64() {

# Vulkan ICD Loader
pushd ${SOURCE_DIR}
git clone -b v1.3.240 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git
vk_ver="v1.3.259"
if [[ $( lsb_release -c -s ) == "bionic" ]]; then
vk_ver="v1.3.240"
fi
git clone -b ${vk_ver} --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git
pushd Vulkan-Loader
mkdir build && pushd build
cmake \
Expand All @@ -355,7 +357,7 @@ prepare_extra_amd64() {

# SHADERC
pushd ${SOURCE_DIR}
git clone -b v2023.3 --depth=1 https://github.com/google/shaderc.git
git clone -b v2023.5 --depth=1 https://github.com/google/shaderc.git
pushd shaderc
./utils/git-sync-deps
mkdir build && pushd build
Expand Down Expand Up @@ -433,7 +435,11 @@ prepare_extra_amd64() {

# LIBPLACEBO
pushd ${SOURCE_DIR}
git clone -b v5.229.2 --recursive --depth=1 https://github.com/haasn/libplacebo.git
pl_ver="v5.264.1"
if [[ $( lsb_release -c -s ) == "bionic" ]]; then
pl_ver="v5.229.2"
fi
git clone -b ${pl_ver} --recursive --depth=1 https://github.com/haasn/libplacebo.git
sed -i 's|env: python_env,||g' libplacebo/src/vulkan/meson.build
meson setup libplacebo placebo_build \
--prefix=${TARGET_DIR} \
Expand Down

0 comments on commit c01f11d

Please sign in to comment.