dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unconditionally enable Vulkan, remove specific variants

Browse source
This commit is contained in:
BtbN 2021-04-05 09:40:16 +02:00
parent 44aea690d1
commit 4de20f345b
6 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
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 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3]
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 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

2
.github/workflows/pr.yml vendored
View file

@ -12,7 +12,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 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

1
README.md
View file

@ -41,5 +41,4 @@ 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.3`, to build from the 4.3 release branch instead of master.
`vulkan` to add support for (and a hard runtime dependency on) Vulkan.
`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.

1
addins/vulkan.sh
View file

@ -1 +0,0 @@
#!/bin/bash

1
scripts.d/45-vulkan.sh
View file

@ -4,7 +4,6 @@ LOADER_REPO="https://github.com/KhronosGroup/Vulkan-Loader.git"
LOADER_COMMIT="7ea01c139ffc7c33cd12bd258c1bc8bf530c6d2d" LOADER_COMMIT="7ea01c139ffc7c33cd12bd258c1bc8bf530c6d2d"
ffbuild_enabled() { ffbuild_enabled() {
[[ $ADDINS_STR != *vulkan* ]] && return -1
return 0 return 0
} }

1
scripts.d/50-glslang.sh
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 != *vulkan* ]] && return -1
return 0 return 0
} }