From 353ee9e29ca836c9e729a4fcfb57e29a28491e9f Mon Sep 17 00:00:00 2001 From: bastimeyer Date: Thu, 26 Aug 2021 08:31:30 +0200 Subject: [PATCH] build: add license file to archives --- build.sh | 2 ++ util/vars.sh | 2 ++ variants/defaults-gpl.sh | 1 + variants/defaults-lgpl.sh | 1 + variants/linux64-nonfree.sh | 1 + variants/win32-nonfree.sh | 1 + variants/win64-nonfree.sh | 1 + 7 files changed, 9 insertions(+) diff --git a/build.sh b/build.sh index 2d5d8b2..802a609 100755 --- a/build.sh +++ b/build.sh @@ -81,6 +81,8 @@ BUILD_NAME="ffmpeg-$(./ffbuild/ffmpeg/ffbuild/version.sh ffbuild/ffmpeg)-${TARGE mkdir -p "ffbuild/pkgroot/$BUILD_NAME" package_variant ffbuild/prefix "ffbuild/pkgroot/$BUILD_NAME" +[[ -n "$LICENSE_FILE" ]] && cp "ffbuild/ffmpeg/$LICENSE_FILE" "ffbuild/pkgroot/$BUILD_NAME/LICENSE.txt" + cd ffbuild/pkgroot if [[ "${TARGET}" == win* ]]; then OUTPUT_FNAME="${BUILD_NAME}.zip" diff --git a/util/vars.sh b/util/vars.sh index 84c134d..f3002a2 100644 --- a/util/vars.sh +++ b/util/vars.sh @@ -14,6 +14,8 @@ if ! [[ -f "variants/${TARGET}-${VARIANT}.sh" ]]; then exit -1 fi +LICENSE_FILE="COPYING.LGPLv2.1" + ADDINS=() ADDINS_STR="" while [[ "$#" -gt 0 ]]; do diff --git a/variants/defaults-gpl.sh b/variants/defaults-gpl.sh index 5338377..5070764 100644 --- a/variants/defaults-gpl.sh +++ b/variants/defaults-gpl.sh @@ -3,3 +3,4 @@ FF_CFLAGS="" FF_CXXFLAGS="" FF_LDFLAGS="" GIT_BRANCH="master" +LICENSE_FILE="COPYING.GPLv3" diff --git a/variants/defaults-lgpl.sh b/variants/defaults-lgpl.sh index 75920ec..71fb515 100644 --- a/variants/defaults-lgpl.sh +++ b/variants/defaults-lgpl.sh @@ -3,3 +3,4 @@ FF_CFLAGS="" FF_CXXFLAGS="" FF_LDFLAGS="" GIT_BRANCH="master" +LICENSE_FILE="COPYING.LGPLv3" diff --git a/variants/linux64-nonfree.sh b/variants/linux64-nonfree.sh index 25e6c9a..230c6e4 100644 --- a/variants/linux64-nonfree.sh +++ b/variants/linux64-nonfree.sh @@ -1,3 +1,4 @@ #!/bin/bash source "$(dirname "$BASH_SOURCE")"/linux64-gpl.sh FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE" +LICENSE_FILE="" diff --git a/variants/win32-nonfree.sh b/variants/win32-nonfree.sh index f83f90f..c61cd9c 100644 --- a/variants/win32-nonfree.sh +++ b/variants/win32-nonfree.sh @@ -1,3 +1,4 @@ #!/bin/bash source "$(dirname "$BASH_SOURCE")"/win32-gpl.sh FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE" +LICENSE_FILE="" diff --git a/variants/win64-nonfree.sh b/variants/win64-nonfree.sh index c4f9649..176e4d2 100644 --- a/variants/win64-nonfree.sh +++ b/variants/win64-nonfree.sh @@ -1,3 +1,4 @@ #!/bin/bash source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE" +LICENSE_FILE=""