diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa80200..69227e6 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] + variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared] 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] + variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7f7d32b..66ebd24 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: target: [win64] - variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3] + variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/variants/default-install-shared.sh b/variants/default-install-shared.sh new file mode 100644 index 0000000..65ae546 --- /dev/null +++ b/variants/default-install-shared.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +package_variant() { + IN="$1" + OUT="$2" + + mkdir -p "$OUT"/bin + cp "$IN"/bin/* "$OUT"/bin + + mkdir -p "$OUT/doc" + cp -r "$IN"/share/doc/ffmpeg/* "$OUT"/doc +} diff --git a/variants/defaults-gpl-shared.sh b/variants/defaults-gpl-shared.sh new file mode 100644 index 0000000..439ebae --- /dev/null +++ b/variants/defaults-gpl-shared.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh +FF_CONFIGURE+=" --enable-shared --disable-static" diff --git a/variants/defaults-lgpl-shared.sh b/variants/defaults-lgpl-shared.sh new file mode 100644 index 0000000..f9f44ad --- /dev/null +++ b/variants/defaults-lgpl-shared.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh +FF_CONFIGURE+=" --enable-shared --disable-static" diff --git a/variants/win64-gpl-4.3-shared.sh b/variants/win64-gpl-4.3-shared.sh new file mode 100644 index 0000000..448d55f --- /dev/null +++ b/variants/win64-gpl-4.3-shared.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh +GIT_BRANCH="release/4.3" diff --git a/variants/win64-gpl-shared.sh b/variants/win64-gpl-shared.sh new file mode 100644 index 0000000..ea245b3 --- /dev/null +++ b/variants/win64-gpl-shared.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/default-install-shared.sh +source "$(dirname "$BASH_SOURCE")"/defaults-gpl-shared.sh diff --git a/variants/win64-gpl-vulkan-shared.sh b/variants/win64-gpl-vulkan-shared.sh new file mode 100644 index 0000000..606f182 --- /dev/null +++ b/variants/win64-gpl-vulkan-shared.sh @@ -0,0 +1,2 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh diff --git a/variants/win64-lgpl-4.3-shared.sh b/variants/win64-lgpl-4.3-shared.sh new file mode 100644 index 0000000..778f005 --- /dev/null +++ b/variants/win64-lgpl-4.3-shared.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh +GIT_BRANCH="release/4.3" diff --git a/variants/win64-lgpl-shared.sh b/variants/win64-lgpl-shared.sh new file mode 100644 index 0000000..d2c3ae4 --- /dev/null +++ b/variants/win64-lgpl-shared.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/default-install-shared.sh +source "$(dirname "$BASH_SOURCE")"/defaults-lgpl-shared.sh diff --git a/variants/win64-lgpl-vulkan-shared.sh b/variants/win64-lgpl-vulkan-shared.sh new file mode 100644 index 0000000..7bf8f63 --- /dev/null +++ b/variants/win64-lgpl-vulkan-shared.sh @@ -0,0 +1,2 @@ +#!/bin/bash +source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh