Skip to content

Commit

Permalink
Merge branch 'BtbN:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
labac-p authored Feb 19, 2024
2 parents 43db44f + 84513f2 commit 22d845c
Show file tree
Hide file tree
Showing 42 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion scripts.d/10-mingw.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git"
SCRIPT_COMMIT="1415ff7f9b835e9ea39864c9625ec6fb72682918"
SCRIPT_COMMIT="57f796c80bfac3c75725e4e7a086afe43968b3ae"

ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="12ce9b5ffeba776ede786c075795a4dbae94bfa1"
SCRIPT_COMMIT="e314109ad1cf7286a1eac4bca22c0e1e7b926c04"

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

SCRIPT_REPO="https://github.com/madler/zlib.git"
SCRIPT_COMMIT="9f0f2d4f9f1f28be7e16d8bf3b4e9d4ada70aa9f"
SCRIPT_COMMIT="5c42a230b7b468dff011f444161c0145b5efae59"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion 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="57617782464411201ce7bbc93b086c1b4d7d84a5"
SCRIPT_COMMIT="47574f7ea445c8bb751da0fa716424c9c29a6807"

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

SCRIPT_REPO="https://github.com/openssl/openssl.git"
SCRIPT_COMMIT="openssl-3.0.12"
SCRIPT_COMMIT="openssl-3.0.13"
SCRIPT_TAGFILTER="openssl-3.0.*"

ffbuild_enabled() {
Expand Down
2 changes: 1 addition & 1 deletion 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="14d466b30a8ab4a9d789977ed94f2c30e7209267"
SCRIPT_COMMIT="a76b95105ca26c600279b2daf4bd43b37a918823"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion 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="aed309d1ec7fd47092154d8879f0975592443922"
SCRIPT_COMMIT="fb6d4d27d67e32084a50e3d8ad8b3743861ff24b"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion scripts.d/45-opencl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
SCRIPT_COMMIT="2368105c0531069fe927989505de7d125ec58c55"

SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067"
SCRIPT_COMMIT2="861b68b290e76d08e7241608479c16431f529945"

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

SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
SCRIPT_COMMIT="ed3d4f0837f670e5e5afb1afa5bcfc8ff05d3407"
SCRIPT_COMMIT="26ccd1167a6188fb28745f3f5c9940657f64343c"

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

SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
SCRIPT_COMMIT="c40e5f561f60f689a19dfe2f4d9a959b320e5922"
SCRIPT_COMMIT="6d77a020ee4af32c854b6029bd64922bef95f1f6"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion 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="1c8128d72df22843a2022576850bc5ab5e3a46ea"
SCRIPT_COMMIT="db56b508f25629ab1022038131758ce48e6daf82"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="f4fc44202b554e68093828b556f8c7fd9644ddb0"
SCRIPT_COMMIT="c7b0ac2c894bbeebc337867388a8b338692550b8"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="ae3eca18cec44a953789c7f77ffab888713ed132"
SCRIPT_COMMIT="041b5291f0956c5cda5054be2981c0d02b009a4c"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion scripts.d/45-x11/50-libxext.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/libxext.git"
SCRIPT_COMMIT="6cb21433d745abea3a161a6fc8e141f7e08b2c27"
SCRIPT_COMMIT="3826a58d190c2d8093d3586cb33867668cbb4553"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion scripts.d/45-x11/50-libxi.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/libxi.git"
SCRIPT_COMMIT="a340bc0424a73d9fc4badbb7aee5284877635ca9"
SCRIPT_COMMIT="57ce2e8ba4c1f1bc5792e14bc7082f3ebd0915be"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="8787d3ef5d938425d094170c1b2fec87762683b6"
SCRIPT_COMMIT="572b8d6ff5d7ec3b1777f32aa13b6da6d801720f"

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

SCRIPT_REPO="https://aomedia.googlesource.com/aom"
SCRIPT_COMMIT="8e0b26f4e830cfe39541195352119c6f86459f5e"
SCRIPT_COMMIT="32db540e95516e66a61dc98acf4829ffd5a745b5"

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

SCRIPT_REPO="https://github.com/glennrp/libpng.git"
SCRIPT_COMMIT="ba980b8f0cfbc270ba1c4a663455e2fe8bad91d2"
SCRIPT_COMMIT="0fa3c0f698c2ca618a0fa44e10a822678df85373"

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

SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
SCRIPT_COMMIT="9713ad1535ad95a614e960880f579d828131893d"
SCRIPT_COMMIT="85057371294405f745f5c51b7a39fa0e3fdde821"

ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="16ed8e8b99f2fcfffe016e929d3626e15267ad3e"
SCRIPT_COMMIT="0d69f6f9fd7a96ca14298c975974effde8e7062c"

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

SCRIPT_REPO="https://github.com/dyne/frei0r.git"
SCRIPT_COMMIT="a303b82f34feb39aa400bd1b67fd8158a179368e"
SCRIPT_COMMIT="e8595c6cd2c8010921777de6706158b5f70472ce"

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

SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
SCRIPT_COMMIT="bb898332030aad7e3656285f26e9632060d5b670"
SCRIPT_COMMIT="d8c96881a92258dad799db8ce5a60138f16b4898"

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

SCRIPT_REPO="https://github.com/google/brotli.git"
SCRIPT_COMMIT="200f37984a22be6ec56c2e8a16ab1a9822c891f6"
SCRIPT_COMMIT="c1362a7903dd6360228d27b703227e20723cf051"

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

SCRIPT_REPO="https://github.com/mm2/Little-CMS.git"
SCRIPT_COMMIT="c2a54017d73080f97c5cd34a78ff2fb51564aade"
SCRIPT_COMMIT="f6b092b36254487312fd47a30a81fa703f006152"

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

SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
SCRIPT_COMMIT="601f029f1eba98a00d49e29152c1d9208d1802c7"
SCRIPT_COMMIT="ef9a6fb4db5b3c6b71bae0c18faae0973a6c8340"

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

SCRIPT_REPO="https://github.com/xiph/opus.git"
SCRIPT_COMMIT="c85499757c148fede8604cffa12454206b6138ba"
SCRIPT_COMMIT="a97151d390978d93b4311ef8794bd3af23703355"

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

SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
SCRIPT_COMMIT="2c918aad6763754bdffb84796b410e21f24bb7ec"
SCRIPT_COMMIT="3e2bbbc96a81909c0949b89fb14361122248ff28"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion 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="2edd69749fddcb79af38b132aa565a7f99623be4"
SCRIPT_COMMIT="4340382bb0da7623ecd27c3bfc9e5bec576e9c46"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion 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="5efd6300dc3c4891a8ac928151c3484f9bc7d8fc"
SCRIPT_COMMIT="713982b883715c1e953834ebc5bad2295442ab94"

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

SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
SCRIPT_COMMIT="e8f8b16aee71fc6832e8f6c75b3771ea00582057"
SCRIPT_COMMIT="50c906f1318f0865fb6875ade35657ef6a2acc3f"

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

SCRIPT_REPO="https://github.com/cisco/openh264.git"
SCRIPT_COMMIT="4f01c15b2199daf16924caa53f77a52e8b559260"
SCRIPT_COMMIT="c59550a2147c255cc8e09451f6deb96de2526b6d"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion 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="20108"
SCRIPT_REV="20135"

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

SCRIPT_REPO="https://github.com/xiph/rav1e.git"
SCRIPT_COMMIT="f6f4969d548c8f2d07859da66c70266454e29314"
SCRIPT_COMMIT="1412bed6b9cd54a46096b8aaf33557e5b740e4f8"

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

SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
SCRIPT_COMMIT="1e06a3614f9e59e33855c4118246e6412162c618"
SCRIPT_COMMIT="df00a7dd4c3deb03839e799187a3c75fc4e8854b"
SCRIPT_BRANCH="SDL2"

ffbuild_enabled() {
Expand Down
2 changes: 1 addition & 1 deletion 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="3dba3f441890b430380fba25848e8ff4a4db4bf3"
SCRIPT_COMMIT="e0d4227ad3061d4cdc1dd8554648bc466c760780"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion 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="fd71fc49c2737ab390fa9d09b49b3a1c92f629e1"
SCRIPT_COMMIT="710084ee6e9316771b50584da4de383ec862393a"

ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="c74d0a4b630f115e797cbb159ac13e0dc78f31f5"
SCRIPT_COMMIT="04271a93ed65bfde82469509120214424eb918d0"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="75254bf2390c10644ffb35a90fc8f18f196f9f0c"
SCRIPT_COMMIT="01f91aa73d86e564678bbea439a1e2bdabbedb8d"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="b8c7eed68846a8b9cdf1040be414880a4e0924a8"
SCRIPT_COMMIT="eeebe59b36297b98f7e6550e1a6edd322e714d60"

ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* && $TARGET == win* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="9bd299b0f28ba53308567cc17d00fb1bfe93e2c3"
SCRIPT_COMMIT="65fa097f2f0aae1a9c233bcf7d03ca3dcd296c6e"

ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion 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="03b485dc47c6e84a15936601e8b121d84d8ddadf"
SCRIPT_COMMIT="b8fcf307f1f347089e3c46eb4451d27f32ebc8d3"

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

SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
SCRIPT_COMMIT="34e019bfedaa5a64f268d8f9263db352c0a8f67f"
SCRIPT_COMMIT="3ba18d5d84738c663e16d7699342102e30e2fbc5"

ffbuild_enabled() {
[[ $ADDINS_STR == *4.4* ]] && return -1
Expand Down

0 comments on commit 22d845c

Please sign in to comment.