Merge pull request #360 from nyanmisaka/next

[6.0] Sync several fixes from ffmpeg-rockchip
jellyfin · Mar 16, 2024 · 351756a · 351756a
2 parents d0ffeb9 + 3bcc91d
commit 351756a
Show file tree

Hide file tree

Showing 24 changed files with 445 additions and 304 deletions.
diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git"
-SCRIPT_COMMIT="a5369d5cbf03048e20a1188832e49b7c879c8c8d"
+SCRIPT_COMMIT="dbfdf802580c0d6b90b91995dab019f2a7787a8e"
 
 ffbuild_enabled() {
  [[ $TARGET == win* ]] || return -1

diff --git 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="723b4de04015c5acccd3cda5dd60db7d00702064"
+SCRIPT_COMMIT="186562a182d2e27f90631d1a1f63ad5079fe62fb"
 
 ffbuild_enabled() {
  return 0

diff --git a/builder/scripts.d/20-zlib.sh b/builder/scripts.d/20-zlib.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/madler/zlib.git"
-SCRIPT_COMMIT="5c42a230b7b468dff011f444161c0145b5efae59"
+SCRIPT_COMMIT="99b229487c2997b4b22eaef90fedfbff4d8826cc"
 
 ffbuild_enabled() {
  return 0

diff --git 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="660a7017faba70e6806a01447c32d37568ac5ee4"
+SCRIPT_COMMIT="f42ce25563b73fed0123d18a2556b9ba01d2c76b"
 
 ffbuild_enabled() {
  return 0

diff --git 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="5b9a242cbbb0cf27d20da9941667abfc63808c19"
+SCRIPT_COMMIT="3002ffea02581b514d70c56d972af12082c4e70c"
 
 ffbuild_enabled() {
  return 0

diff --git 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="c573497f327a222e5f1daf28b7545d0d7d2a4771"
+SCRIPT_COMMIT="c6849aca73c60c3fcba5c6e4e2cb2d7b59050dd2"
 
 ffbuild_enabled() {
  return 0

diff --git 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="06749fa481c02ced563ea20685ac7697ea933dfe"
+SCRIPT_COMMIT="cfbb6a68722361dc7a1a5ea016921930552bbec7"
 
 ffbuild_enabled() {
  return 0

diff --git a/builder/scripts.d/45-x11/30-libxcb.sh b/builder/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="c671b9b30aecada4e43cb48e0dee46d19fb5cb9c"
+SCRIPT_COMMIT="86a478032ba93f30adbc0ce96eecd3420fdf7ed1"
 
 ffbuild_enabled() {
  [[ $TARGET != linux* ]] && return -1

diff --git 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="85eea8d43511967dcf98f063d3d3efa573536ae3"
+SCRIPT_COMMIT="5b32766b801434be61350c292127a9ac022b1268"
 
 ffbuild_enabled() {
  [[ $TARGET == mac* ]] && return -1

diff --git 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="932b323c3e5bbedf2c535618dbc5ad04fea2aa6e"
+SCRIPT_COMMIT="872e470ebf3e65b0b956f3a70329e885a2df1c2a"
 
 ffbuild_enabled() {
  return 0

diff --git 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="c1f0f54018bf1f6f86710be1517313fb7b49556c"
+SCRIPT_COMMIT="95dbea83486b90256785aa3c75dd2827f591a34c"
 
 ffbuild_enabled() {
  return 0

diff --git 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="1f066bf77cdf6bb96b66471d250404b2c91f9cb3"
+SCRIPT_COMMIT="7fb8ceccf92c35cd5131b05c0502916715ebc76b"
 
 ffbuild_enabled() {
  return 0

diff --git 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="661c1b6641f32a951c3045bf5253166ee94f93ac"
+SCRIPT_COMMIT="eba03acb05383c4cd8ff9a3d18a213fbdcda865d"
 
 ffbuild_enabled() {
  return 0

diff --git 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="20257"
+SCRIPT_REV="20347"
 
 ffbuild_enabled() {
  return 0

diff --git 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="7f490242e4dad2c4247e3cf173703e05bc9b6606"
+SCRIPT_COMMIT="aa69c3db0daa221b0a9b4e86fee2efd80c6e6f2b"
 
 ffbuild_enabled() {
  return 0

diff --git 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="3e8def740947ff9e873daf71ab4d904df1ed5552"
+SCRIPT_COMMIT="2aeeb4f1a1d495b84bf5c21dbb60ae10e991fada"
 
 ffbuild_enabled() {
  [[ $TARGET == win32 ]] && return -1

diff --git 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="62e2f4d72c0a3a7cba01174283b313622936ad20"
+SCRIPT_COMMIT="0b01aed44ef1a6ad660261284ff266fa812829ef"
 
 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
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.279"
+SCRIPT_COMMIT="v1.3.280"
 SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {

diff --git a/builder/scripts.d/50-x264.sh b/builder/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/x264.git"
-SCRIPT_COMMIT="be4f0200ed007c466fd96185c39cde2a2d60ef50"
+SCRIPT_COMMIT="585e01997f0c7e6d72c8ca466406d955c07de912"
 
 ffbuild_enabled() {
  [[ $VARIANT == lgpl* ]] && return -1