From 00a1dd0c1124911e58620161f917bc6fe280fb40 Mon Sep 17 00:00:00 2001 From: nanake Date: Tue, 23 Mar 2021 13:49:02 +0700 Subject: [PATCH] Roll release/4.4 Signed-off-by: nanake --- .github/workflows/build.yml | 4 ++-- addins/4.3.sh | 2 -- addins/4.4.sh | 2 ++ scripts.d/50-rav1e.sh | 2 -- scripts.d/50-svtav1.sh | 2 -- scripts.d/50-uavs3d.sh | 2 -- 6 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 addins/4.3.sh create mode 100644 addins/4.4.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 264dd3e..2b2ed8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: fail-fast: false matrix: target: [win64] - variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-shared 4.3,lgpl-shared 4.3] + variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-shared 4.4,lgpl-shared 4.4] steps: - name: Checkout uses: actions/checkout@v2 @@ -103,7 +103,7 @@ jobs: fail-fast: false matrix: target: [win64] - variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-shared 4.3,lgpl-shared 4.3] + variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-shared 4.4,lgpl-shared 4.4] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/addins/4.3.sh b/addins/4.3.sh deleted file mode 100644 index 8f3bcc0..0000000 --- a/addins/4.3.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -GIT_BRANCH="release/4.3" diff --git a/addins/4.4.sh b/addins/4.4.sh new file mode 100644 index 0000000..6eec695 --- /dev/null +++ b/addins/4.4.sh @@ -0,0 +1,2 @@ +#!/bin/bash +GIT_BRANCH="release/4.4" diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 12344b6..5ced7d9 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -4,7 +4,6 @@ RAV1E_SRC_PREFIX="https://github.com/xiph/rav1e/releases/download/p20210216" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 - [[ $VARIANT == *4.2* ]] && return -1 return 0 } @@ -42,6 +41,5 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $VARIANT == *4.2* ]] && return 0 echo --disable-librav1e } diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 8873fd3..e5ffb39 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -5,7 +5,6 @@ SVTAV1_COMMIT="6870e6cadc166235b8fb5aa286564e0fb5039e4f" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 - [[ $ADDINS_STR == *4.3* ]] && return -1 return 0 } @@ -34,6 +33,5 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.3* ]] && return 0 echo --disable-libsvtav1 } diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index e552fc7..7e323ae 100755 --- a/scripts.d/50-uavs3d.sh +++ b/scripts.d/50-uavs3d.sh @@ -4,7 +4,6 @@ UAVS3D_REPO="https://github.com/uavs3/uavs3d.git" UAVS3D_COMMIT="85a165fadca9e2d8bd0d25febc1fed96cdcf8351" ffbuild_enabled() { - [[ $ADDINS_STR == *4.3* ]] && return -1 [[ $TARGET == win32 ]] && return -1 return 0 } @@ -35,6 +34,5 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.3* ]] && return 0 echo --disable-libuavs3d }