Skip to content

Commit

Permalink
build: add license file to archives
Browse files Browse the repository at this point in the history
  • Loading branch information
bastimeyer authored and BtbN committed Aug 28, 2021
1 parent 3716c20 commit 353ee9e
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions util/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions variants/defaults-gpl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ FF_CFLAGS=""
FF_CXXFLAGS=""
FF_LDFLAGS=""
GIT_BRANCH="master"
LICENSE_FILE="COPYING.GPLv3"
1 change: 1 addition & 0 deletions variants/defaults-lgpl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ FF_CFLAGS=""
FF_CXXFLAGS=""
FF_LDFLAGS=""
GIT_BRANCH="master"
LICENSE_FILE="COPYING.LGPLv3"
1 change: 1 addition & 0 deletions variants/linux64-nonfree.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
source "$(dirname "$BASH_SOURCE")"/linux64-gpl.sh
FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
LICENSE_FILE=""
1 change: 1 addition & 0 deletions variants/win32-nonfree.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
source "$(dirname "$BASH_SOURCE")"/win32-gpl.sh
FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
LICENSE_FILE=""
1 change: 1 addition & 0 deletions variants/win64-nonfree.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh
FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
LICENSE_FILE=""

0 comments on commit 353ee9e

Please sign in to comment.