Roll release/4.4

Signed-off-by: nanake <nanake@users.noreply.github.com>
This commit is contained in:
nanake 2021-03-23 13:49:02 +07:00
parent 4a69eb83e4
commit 00a1dd0c11
No known key found for this signature in database
GPG key ID: 6182985B1BDCDCA8
6 changed files with 4 additions and 10 deletions

View file

@ -72,7 +72,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: [win64] 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: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -103,7 +103,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: [win64] 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: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

View file

@ -1,2 +0,0 @@
#!/bin/bash
GIT_BRANCH="release/4.3"

2
addins/4.4.sh Normal file
View file

@ -0,0 +1,2 @@
#!/bin/bash
GIT_BRANCH="release/4.4"

View file

@ -4,7 +4,6 @@ RAV1E_SRC_PREFIX="https://github.com/xiph/rav1e/releases/download/p20210216"
ffbuild_enabled() { ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1 [[ $TARGET == win32 ]] && return -1
[[ $VARIANT == *4.2* ]] && return -1
return 0 return 0
} }
@ -42,6 +41,5 @@ ffbuild_configure() {
} }
ffbuild_unconfigure() { ffbuild_unconfigure() {
[[ $VARIANT == *4.2* ]] && return 0
echo --disable-librav1e echo --disable-librav1e
} }

View file

@ -5,7 +5,6 @@ SVTAV1_COMMIT="6870e6cadc166235b8fb5aa286564e0fb5039e4f"
ffbuild_enabled() { ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1 [[ $TARGET == win32 ]] && return -1
[[ $ADDINS_STR == *4.3* ]] && return -1
return 0 return 0
} }
@ -34,6 +33,5 @@ ffbuild_configure() {
} }
ffbuild_unconfigure() { ffbuild_unconfigure() {
[[ $ADDINS_STR == *4.3* ]] && return 0
echo --disable-libsvtav1 echo --disable-libsvtav1
} }

View file

@ -4,7 +4,6 @@ UAVS3D_REPO="https://github.com/uavs3/uavs3d.git"
UAVS3D_COMMIT="85a165fadca9e2d8bd0d25febc1fed96cdcf8351" UAVS3D_COMMIT="85a165fadca9e2d8bd0d25febc1fed96cdcf8351"
ffbuild_enabled() { ffbuild_enabled() {
[[ $ADDINS_STR == *4.3* ]] && return -1
[[ $TARGET == win32 ]] && return -1 [[ $TARGET == win32 ]] && return -1
return 0 return 0
} }
@ -35,6 +34,5 @@ ffbuild_configure() {
} }
ffbuild_unconfigure() { ffbuild_unconfigure() {
[[ $ADDINS_STR == *4.3* ]] && return 0
echo --disable-libuavs3d echo --disable-libuavs3d
} }