Roll release/4.4

This commit is contained in:
nanake 2021-04-04 13:38:55 +07:00 committed by BtbN
parent bc49c2cc2e
commit 75db19361e
9 changed files with 6 additions and 12 deletions

View file

@ -71,7 +71,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: [win64] target: [win64]
variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3] variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -100,7 +100,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: [win64] target: [win64]
variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3] variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

View file

@ -15,7 +15,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: [win64] target: [win64]
variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3] variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

View file

@ -40,5 +40,5 @@ The two available targets are `win64` and `win32`.
Available in `gpl`, `lgpl`, `gpl-shared` and `lgpl-shared` variants. Available in `gpl`, `lgpl`, `gpl-shared` and `lgpl-shared` variants.
All of those can be optionally combined with any combination of addins. All of those can be optionally combined with any combination of addins.
Currently that's `4.3`, to build from the 4.3 release branch instead of master. Currently that's `4.4`, to build from the 4.4 release branch instead of master.
`debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB. `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB.

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 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git"
GLSLANG_COMMIT="5878bcb17e43bf22cecaf6095900a33ff7f53445" GLSLANG_COMMIT="5878bcb17e43bf22cecaf6095900a33ff7f53445"
ffbuild_enabled() { ffbuild_enabled() {
[[ $ADDINS_STR == *4.3* ]] && return -1
return 0 return 0
} }

View file

@ -25,6 +25,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="0a253a1cec457d50a3a441cec4d553c817bb7231"
ffbuild_enabled() { ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1 [[ $TARGET == win32 ]] && return -1
[[ $ADDINS_STR == *4.3* ]] && return -1
return 0 return 0
} }
@ -26,6 +25,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
} }
@ -27,6 +26,5 @@ ffbuild_configure() {
} }
ffbuild_unconfigure() { ffbuild_unconfigure() {
[[ $ADDINS_STR == *4.3* ]] && return 0
echo --disable-libuavs3d echo --disable-libuavs3d
} }