diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3d7a2a..8a961ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,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-4.3-shared,lgpl-4.3-shared] + 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] steps: - name: Checkout uses: actions/checkout@v2 @@ -89,7 +89,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-4.3-shared,lgpl-4.3-shared] + 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] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/addins/4.3.sh b/addins/4.3.sh new file mode 100644 index 0000000..8f3bcc0 --- /dev/null +++ b/addins/4.3.sh @@ -0,0 +1,2 @@ +#!/bin/bash +GIT_BRANCH="release/4.3" diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 26ae08f..4e181ef 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -5,7 +5,7 @@ SVTAV1_COMMIT="0dc2297715861b78577b3790e361af74b6c4bfef" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 - [[ $VARIANT == *4.3* ]] && return -1 + [[ $ADDINS_STR == *4.3* ]] && return -1 return 0 } @@ -34,6 +34,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $VARIANT == *4.3* ]] && return 0 + [[ $ADDINS_STR == *4.3* ]] && return 0 echo --disable-libsvtav1 } diff --git a/variants/win32-gpl-4.3-shared.sh b/variants/win32-gpl-4.3-shared.sh deleted file mode 100644 index f3a2fa7..0000000 --- a/variants/win32-gpl-4.3-shared.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win32-gpl-shared.sh -GIT_BRANCH="release/4.3" diff --git a/variants/win32-gpl-4.3.sh b/variants/win32-gpl-4.3.sh deleted file mode 100644 index 24cec1f..0000000 --- a/variants/win32-gpl-4.3.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win32-gpl.sh -GIT_BRANCH="release/4.3" diff --git a/variants/win32-lgpl-4.3-shared.sh b/variants/win32-lgpl-4.3-shared.sh deleted file mode 100644 index 92e9bac..0000000 --- a/variants/win32-lgpl-4.3-shared.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win32-lgpl-shared.sh -GIT_BRANCH="release/4.3" diff --git a/variants/win32-lgpl-4.3.sh b/variants/win32-lgpl-4.3.sh deleted file mode 100644 index 9db06f8..0000000 --- a/variants/win32-lgpl-4.3.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win32-lgpl.sh -GIT_BRANCH="release/4.3" diff --git a/variants/win64-gpl-4.3-shared.sh b/variants/win64-gpl-4.3-shared.sh deleted file mode 100644 index 448d55f..0000000 --- a/variants/win64-gpl-4.3-shared.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh -GIT_BRANCH="release/4.3" diff --git a/variants/win64-gpl-4.3.sh b/variants/win64-gpl-4.3.sh deleted file mode 100644 index 96a4dff..0000000 --- a/variants/win64-gpl-4.3.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh -GIT_BRANCH="release/4.3" diff --git a/variants/win64-lgpl-4.3-shared.sh b/variants/win64-lgpl-4.3-shared.sh deleted file mode 100644 index 778f005..0000000 --- a/variants/win64-lgpl-4.3-shared.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh -GIT_BRANCH="release/4.3" diff --git a/variants/win64-lgpl-4.3.sh b/variants/win64-lgpl-4.3.sh deleted file mode 100644 index 3818d83..0000000 --- a/variants/win64-lgpl-4.3.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh -GIT_BRANCH="release/4.3"