Skip to content

Commit

Permalink
Roll release/4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
nanake authored and BtbN committed Apr 9, 2021
1 parent bc49c2c commit 75db193
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
fail-fast: false
matrix:
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:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
fail-fast: false
matrix:
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:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
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:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ The two available targets are `win64` and `win32`.
Available in `gpl`, `lgpl`, `gpl-shared` and `lgpl-shared` variants.

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.
2 changes: 0 additions & 2 deletions addins/4.3.sh

This file was deleted.

2 changes: 2 additions & 0 deletions addins/4.4.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
GIT_BRANCH="release/4.4"
1 change: 0 additions & 1 deletion scripts.d/50-glslang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git"
GLSLANG_COMMIT="5878bcb17e43bf22cecaf6095900a33ff7f53445"

ffbuild_enabled() {
[[ $ADDINS_STR == *4.3* ]] && return -1
return 0
}

Expand Down
1 change: 0 additions & 1 deletion scripts.d/50-rav1e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@ ffbuild_configure() {
}

ffbuild_unconfigure() {
[[ $VARIANT == *4.2* ]] && return 0
echo --disable-librav1e
}
2 changes: 0 additions & 2 deletions scripts.d/50-svtav1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ SVTAV1_COMMIT="0a253a1cec457d50a3a441cec4d553c817bb7231"

ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
[[ $ADDINS_STR == *4.3* ]] && return -1
return 0
}

Expand All @@ -26,6 +25,5 @@ ffbuild_configure() {
}

ffbuild_unconfigure() {
[[ $ADDINS_STR == *4.3* ]] && return 0
echo --disable-libsvtav1
}
2 changes: 0 additions & 2 deletions scripts.d/50-uavs3d.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -27,6 +26,5 @@ ffbuild_configure() {
}

ffbuild_unconfigure() {
[[ $ADDINS_STR == *4.3* ]] && return 0
echo --disable-libuavs3d
}

0 comments on commit 75db193

Please sign in to comment.