diff --git a/build.sh b/build.sh index 28c48b2..b269595 100755 --- a/build.sh +++ b/build.sh @@ -15,7 +15,6 @@ get_output() { ) } -source "variants/${VARIANT}.sh" source "variants/${TARGET}-${VARIANT}.sh" export FFBUILD_PREFIX="$(docker run --rm "$IMAGE" bash -c 'echo $FFBUILD_PREFIX')" diff --git a/variants/default-install.sh b/variants/default-install.sh new file mode 100644 index 0000000..65ae546 --- /dev/null +++ b/variants/default-install.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/gpl-vulkan.sh b/variants/defaults-gpl.sh similarity index 100% rename from variants/gpl-vulkan.sh rename to variants/defaults-gpl.sh diff --git a/variants/lgpl-vulkan.sh b/variants/defaults-lgpl.sh similarity index 100% rename from variants/lgpl-vulkan.sh rename to variants/defaults-lgpl.sh diff --git a/variants/gpl-4.3.sh b/variants/gpl-4.3.sh deleted file mode 100644 index 8dd57d1..0000000 --- a/variants/gpl-4.3.sh +++ /dev/null @@ -1,5 +0,0 @@ -FF_CONFIGURE="--enable-gpl --enable-version3" -FF_CFLAGS="" -FF_CXXFLAGS="" -FF_LDFLAGS="" -GIT_BRANCH="release/4.3" diff --git a/variants/gpl.sh b/variants/gpl.sh deleted file mode 100644 index f672c41..0000000 --- a/variants/gpl.sh +++ /dev/null @@ -1,5 +0,0 @@ -FF_CONFIGURE="--enable-gpl --enable-version3" -FF_CFLAGS="" -FF_CXXFLAGS="" -FF_LDFLAGS="" -GIT_BRANCH="master" diff --git a/variants/lgpl-4.3.sh b/variants/lgpl-4.3.sh deleted file mode 100644 index 1741906..0000000 --- a/variants/lgpl-4.3.sh +++ /dev/null @@ -1,5 +0,0 @@ -FF_CONFIGURE="--enable-version3" -FF_CFLAGS="" -FF_CXXFLAGS="" -FF_LDFLAGS="" -GIT_BRANCH="release/4.3" diff --git a/variants/lgpl.sh b/variants/lgpl.sh deleted file mode 100644 index 0d119cc..0000000 --- a/variants/lgpl.sh +++ /dev/null @@ -1,5 +0,0 @@ -FF_CONFIGURE="--enable-version3" -FF_CFLAGS="" -FF_CXXFLAGS="" -FF_LDFLAGS="" -GIT_BRANCH="master" diff --git a/variants/win64-gpl-4.3.sh b/variants/win64-gpl-4.3.sh index 30dd180..96a4dff 100644 --- a/variants/win64-gpl-4.3.sh +++ b/variants/win64-gpl-4.3.sh @@ -1,2 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" +source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh +GIT_BRANCH="release/4.3" diff --git a/variants/win64-gpl-vulkan.sh b/variants/win64-gpl-vulkan.sh index 30dd180..62390a8 100644 --- a/variants/win64-gpl-vulkan.sh +++ b/variants/win64-gpl-vulkan.sh @@ -1,2 +1,2 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" +source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh diff --git a/variants/win64-gpl.sh b/variants/win64-gpl.sh index 65ae546..b3003a4 100644 --- a/variants/win64-gpl.sh +++ b/variants/win64-gpl.sh @@ -1,12 +1,3 @@ #!/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 -} +source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh diff --git a/variants/win64-lgpl-4.3.sh b/variants/win64-lgpl-4.3.sh index 30dd180..3818d83 100644 --- a/variants/win64-lgpl-4.3.sh +++ b/variants/win64-lgpl-4.3.sh @@ -1,2 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" +source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh +GIT_BRANCH="release/4.3" diff --git a/variants/win64-lgpl-vulkan.sh b/variants/win64-lgpl-vulkan.sh index 30dd180..ec75252 100644 --- a/variants/win64-lgpl-vulkan.sh +++ b/variants/win64-lgpl-vulkan.sh @@ -1,2 +1,2 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" +source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh diff --git a/variants/win64-lgpl.sh b/variants/win64-lgpl.sh index 30dd180..f000a33 100644 --- a/variants/win64-lgpl.sh +++ b/variants/win64-lgpl.sh @@ -1,2 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" +source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh