[5.1] Add a tone-mapping mode RGB in CUDA & OpenCL

builder/scripts.d/10-mingw.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="0f2264e7b8fedbe225921367e82aeb97ddfed46b"
+SCRIPT_COMMIT="eff726c461e09f35eeaed125a3570fa5f807f02b"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1

builder/scripts.d/20-libiconv.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="c593e206b2d4bc689950c742a0fb00b8013756a0"
+SCRIPT_COMMIT="v1.17"
+SCRIPT_TAGFILTER="v?.*"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/20-libxml2.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
-SCRIPT_COMMIT="b1319c902f6e44d08f8cb33f1fc28847f2bc8aeb"
+SCRIPT_COMMIT="d7d0bc6581e332f49c9ff628f548eced03c65189"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/25-freetype.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="4f0a55d15ed1c9af267ed8223cc2f04307a3d656"
+SCRIPT_COMMIT="6d7b8b22c4f4ca6cde1998997ae4ea2aa6e57d26"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/35-fontconfig.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="04546f18768e1ce57c24743035118b3eabbd4181"
+SCRIPT_COMMIT="c2666a6d9a6ed18b1bfcef8176e25f62993e24db"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/45-harfbuzz.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="79233a149209e3da199bb4e2f74271668502c574"
+SCRIPT_COMMIT="04a47932a3844f7e73e3af8b05fb98c8b54fb779"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/45-opencl.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="e3e85862d6905eba9f4b5ed02c52effe673721d3"
+SCRIPT_COMMIT="8c4f0111ccf2350a51655d8bbe862c7405f2c0db"
 
 SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
 SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718"

builder/scripts.d/45-x11/10-xcbproto.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="15d140d7867e8e654ce917b8d6d1dbd45b3de3b8"
+SCRIPT_COMMIT="74c03b4edfe61ff5f30cc0b61f7d2deff025c6a3"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/45-x11/10-xproto.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="cf35a91fe57d4721a173d2bc428dd07dcc4674f9"
+SCRIPT_COMMIT="fca42f2e5a5da961b231dbbc10f87bb95588d5b1"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/45-x11/20-libxau.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="c52f54e9533046a52edf84bcc02abedc2dbcb1a7"
+SCRIPT_COMMIT="df1bf4fe528a5a9eef420f78efb225e4696ac467"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="18e109d755c5ce18157fdabb6de8ee6845b348ff"
+SCRIPT_COMMIT="8935793f1f3751a6aa9d78955c7d6236177986de"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/45-x11/40-libx11.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="ca99e338a9b8aad300933b1336f9e3c091392213"
+SCRIPT_COMMIT="eb166af8f9f4184108fe8e0611a09af03d12059e"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/45-x11/60-libxcursor.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-SCRIPT_COMMIT="81dc4a481b64499ab7c355ee43c91e4fe0767545"
+SCRIPT_COMMIT="a353f02a7ac4504ad5edb5407278c7a03c507aef"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/50-dav1d.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="16c943484e63da7ed8a8a8d85af88995369f23cd"
+SCRIPT_COMMIT="922bd82b4e0b4df1e23d8d4325417be812dfa23a"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/50-libass.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="218dacece7d24b45e4637ced4dc56564de29919d"
+SCRIPT_COMMIT="9b3c0d5b350e13eb69dc87b52751ec0ad44280af"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/50-libvpx.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="6788c75055899796c13787ed44cc6f1cc45e09d7"
+SCRIPT_COMMIT="0f42bd3fb81cd79dfaef5c6aef26c643c48be909"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/50-libwebp.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="0825faa4c10d622f2747c5b2752e7b6a6848bf3f"
+SCRIPT_COMMIT="349f4353dd638f2f85e7dd2d9df9a68f54d9919c"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/50-openmpt.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
+SCRIPT_REV="18952"
+
+ffbuild_enabled() {
+    return 0
+}
+
+ffbuild_dockerbuild() {
+    retry-tool sh -c "rm -rf openmpt && svn checkout '${SCRIPT_REPO}@${SCRIPT}' openmpt"
+    cd openmpt
+
+    local myconf=(
+        PREFIX="$FFBUILD_PREFIX"
+        CXXSTDLIB_PCLIBSPRIVATE="-lstdc++"
+        VERBOSE=2
+        STATIC_LIB=1
+        SHARED_LIB=0
+        DYNLINK=0
+        EXAMPLES=0
+        OPENMPT123=0
+        IN_OPENMPT=0
+        XMP_OPENMPT=0
+        DEBUG=0
+        OPTIMIZE=1
+        TEST=0
+        MODERN=1
+        FORCE_DEPS=1
+        NO_MINIMP3=0
+        NO_ZLIB=0
+        NO_OGG=0
+        NO_VORBIS=0
+        NO_VORBISFILE=0
+        NO_MPG123=1
+        NO_SDL2=1
+        NO_PULSEAUDIO=1
+        NO_SNDFILE=1
+        NO_PORTAUDIO=1
+        NO_PORTAUDIOCPP=1
+        NO_FLAC=1
+    )
+
+    if [[ $TARGET == win* ]]; then
+        myconf+=(
+            CONFIG=mingw64-"$TARGET"
+        )
+        export CPPFLAGS="$CPPFLAGS -DMPT_WITH_MINGWSTDTHREADS"
+    elif [[ $TARGET == linux* ]]; then
+        myconf+=(
+            CONFIG=gcc
+            TOOLCHAIN_PREFIX="$FFBUILD_CROSS_PREFIX"
+        )
+    else
+        echo "Unknown target"
+        return -1
+    fi
+
+    make -j$(nproc) "${myconf[@]}" all install
+    rm -r "$FFBUILD_PREFIX"/share/doc/libopenmpt
+}
+
+ffbuild_configure() {
+    echo --enable-libopenmpt
+}
+
+ffbuild_unconfigure() {
+    echo --disable-libopenmpt
+}

builder/scripts.d/50-svtav1.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="72fd3d479b315fbf6bd1d7e80dec7afe42037819"
+SCRIPT_COMMIT="f338431ff69b258686b575ef9a0520fa857399fe"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1

builder/scripts.d/50-vaapi/30-libpciaccess.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="833c86ce15cee2a84a37ae71015f236fd32615d9"
+SCRIPT_COMMIT="8980a39004b10298a7db1f1b0b711a19e8b73aee"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/50-vaapi/40-libdrm.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="d1681af05471176215ad3d437249c38768dc959f"
+SCRIPT_COMMIT="28d9a3c4fb4c99aafc31b288b3f735e19e728d64"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/50-vaapi/50-libva.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="0fa448dd00c509f08cf53b9a95a55922ff09d5cf"
+SCRIPT_COMMIT="3aadcf0e8035e320b6be1fedb4d5fb5182b63377"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

builder/scripts.d/50-vulkan/50-shaderc.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="f1268e6d36cfdcd647d5c7032a6c61a0aad8487b"
+SCRIPT_COMMIT="4a8f5e537f20bbcfe4b11f1fe45314f1dcbfddf6"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/50-vulkan/55-spirv-cross.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="d26c233e1c2629fec1ae1b6fdf538958e5d52bff"
+SCRIPT_COMMIT="3327924addfcffe8f1a4119cb09c1ad353fe1190"
 
 ffbuild_enabled() {
     return 0

builder/scripts.d/50-x265.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="38cf1c379b5af08856bb2fdd65f65a1f99384886"
+SCRIPT_COMMIT="c07d076cf20ab41d8077a804dda70fdbc3b97386"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1

debian/changelog

@@ -1,7 +1,9 @@
 jellyfin-ffmpeg (5.1.3-1) unstable; urgency=medium
 
   * New upstream version 5.1.3
+  * Add a tone-mapping mode RGB in CUDA & OpenCL
   * Update dependencies
+  * Enable libopenmpt
 
  -- nyanmisaka <nst799610810@gmail.com>  Mon, 27 Mar 2023 22:41:38 +0800
 

debian/control

@@ -35,6 +35,8 @@ Build-Depends:
  libtheora-dev,
 # --enable-libvorbis
  libvorbis-dev,
+# --enable-libopenmpt
+ libopenmpt-dev,
 # --enable-libwebp
  libwebp-dev,
 # --enable-libvpx