Clean up variant system

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')"

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
+}

variants/gpl-4.3.sh

@@ -1,5 +0,0 @@
-FF_CONFIGURE="--enable-gpl --enable-version3"
-FF_CFLAGS=""
-FF_CXXFLAGS=""
-FF_LDFLAGS=""
-GIT_BRANCH="release/4.3"

variants/gpl.sh

@@ -1,5 +0,0 @@
-FF_CONFIGURE="--enable-gpl --enable-version3"
-FF_CFLAGS=""
-FF_CXXFLAGS=""
-FF_LDFLAGS=""
-GIT_BRANCH="master"

variants/lgpl-4.3.sh

@@ -1,5 +0,0 @@
-FF_CONFIGURE="--enable-version3"
-FF_CFLAGS=""
-FF_CXXFLAGS=""
-FF_LDFLAGS=""
-GIT_BRANCH="release/4.3"

variants/lgpl.sh

@@ -1,5 +0,0 @@
-FF_CONFIGURE="--enable-version3"
-FF_CFLAGS=""
-FF_CXXFLAGS=""
-FF_LDFLAGS=""
-GIT_BRANCH="master"

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"

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

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

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"

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

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