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

Clean up variant system

Browse source
This commit is contained in:
BtbN 2020-09-08 02:09:14 +02:00
parent 8eeff4a85d
commit 6d69575f50
14 changed files with 22 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.sh
View file

@ -15,7 +15,6 @@ get_output() {
) )
} }
source "variants/${VARIANT}.sh"
source "variants/${TARGET}-${VARIANT}.sh" source "variants/${TARGET}-${VARIANT}.sh"
export FFBUILD_PREFIX="$(docker run --rm "$IMAGE" bash -c 'echo $FFBUILD_PREFIX')" export FFBUILD_PREFIX="$(docker run --rm "$IMAGE" bash -c 'echo $FFBUILD_PREFIX')"

12
variants/default-install.sh Normal file
View file

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

0
variants/gpl-vulkan.sh → variants/defaults-gpl.sh
View file

0
variants/lgpl-vulkan.sh → variants/defaults-lgpl.sh
View file

5
variants/gpl-4.3.sh
View file

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

5
variants/gpl.sh
View file

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

5
variants/lgpl-4.3.sh
View file

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

5
variants/lgpl.sh
View file

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

3
variants/win64-gpl-4.3.sh
View file

@ -1,2 +1,3 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh
GIT_BRANCH="release/4.3"

2
variants/win64-gpl-vulkan.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh

13
variants/win64-gpl.sh
View file

@ -1,12 +1,3 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$BASH_SOURCE")"/default-install.sh
package_variant() { source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
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
}

3
variants/win64-lgpl-4.3.sh
View file

@ -1,2 +1,3 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh
GIT_BRANCH="release/4.3"

2
variants/win64-lgpl-vulkan.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh

3
variants/win64-lgpl.sh
View file

@ -1,2 +1,3 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$BASH_SOURCE")/win64-gpl.sh" source "$(dirname "$BASH_SOURCE")"/default-install.sh
source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh