From 64585b76979df0f0283b0cb43db3e64c89b76be6 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Sat, 1 Oct 2022 22:41:57 +0100 Subject: [PATCH] reorganise license files --- LICENSE.LGPLv3 => LICENSE | 0 android.sh | 4 ++-- scripts/function-apple.sh | 16 ++++++++-------- scripts/function-linux.sh | 4 ++-- LICENSE.GPLv3 => tools/license/LICENSE.GPLv3 | 0 5 files changed, 12 insertions(+), 12 deletions(-) rename LICENSE.LGPLv3 => LICENSE (100%) rename LICENSE.GPLv3 => tools/license/LICENSE.GPLv3 (100%) diff --git a/LICENSE.LGPLv3 b/LICENSE similarity index 100% rename from LICENSE.LGPLv3 rename to LICENSE diff --git a/android.sh b/android.sh index 3658367..4d4e023 100755 --- a/android.sh +++ b/android.sh @@ -331,9 +331,9 @@ if [[ -n ${ANDROID_ARCHITECTURES} ]]; then # COPY LIBRARY LICENSES if [[ ${GPL_ENABLED} == "yes" ]]; then - cp "${BASEDIR}"/LICENSE.GPLv3 "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/tools/license/LICENSE.GPLv3 "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 else - cp "${BASEDIR}"/LICENSE.LGPLv3 "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/LICENSE "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 fi echo -e "DEBUG: Copied the ffmpeg-kit license successfully\n" 1>>"${BASEDIR}"/build.log 2>&1 diff --git a/scripts/function-apple.sh b/scripts/function-apple.sh index c47a01b..bef5351 100755 --- a/scripts/function-apple.sh +++ b/scripts/function-apple.sh @@ -234,9 +234,9 @@ create_ffmpeg_universal_library() { # COPY UNIVERSAL LIBRARY LICENSES if [[ ${GPL_ENABLED} == "yes" ]]; then - cp "${BASEDIR}"/LICENSE.GPLv3 "${FFMPEG_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/tools/license/LICENSE.GPLv3 "${FFMPEG_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 else - cp "${BASEDIR}"/LICENSE.LGPLv3 "${FFMPEG_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/LICENSE "${FFMPEG_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 fi for library in {0..49}; do if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then @@ -321,9 +321,9 @@ create_ffmpeg_kit_universal_library() { # COPY UNIVERSAL LIBRARY LICENSES if [[ ${GPL_ENABLED} == "yes" ]]; then - cp "${BASEDIR}"/LICENSE.GPLv3 "${FFMPEG_KIT_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/tools/license/LICENSE.GPLv3 "${FFMPEG_KIT_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 else - cp "${BASEDIR}"/LICENSE.LGPLv3 "${FFMPEG_KIT_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/LICENSE "${FFMPEG_KIT_UNIVERSAL_LIBRARY_DIRECTORY}"/LICENSE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 fi cp "${BASEDIR}"/tools/source/SOURCE "${FFMPEG_KIT_UNIVERSAL_LIBRARY_DIRECTORY}"/SOURCE 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 @@ -396,9 +396,9 @@ create_ffmpeg_framework() { # COPY FRAMEWORK LICENSES if [[ "${GPL_ENABLED}" == "yes" ]]; then - cp "${BASEDIR}/LICENSE.GPLv3" "${FFMPEG_LIB_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/tools/license/LICENSE.GPLv3 "${FFMPEG_LIB_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 else - cp "${BASEDIR}/LICENSE.LGPLv3" "${FFMPEG_LIB_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/LICENSE "${FFMPEG_LIB_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 fi # COPY EXTERNAL LIBRARY LICENSES @@ -505,9 +505,9 @@ create_ffmpeg_kit_framework() { # COPY FRAMEWORK LICENSES if [[ "${GPL_ENABLED}" == "yes" ]]; then - cp "${BASEDIR}/LICENSE.GPLv3" "${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/tools/license/LICENSE.GPLv3 "${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 else - cp "${BASEDIR}/LICENSE.LGPLv3" "${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/LICENSE "${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH}/LICENSE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 fi cp "${BASEDIR}/tools/source/SOURCE" "${FFMPEG_KIT_FRAMEWORK_RESOURCE_PATH}/SOURCE" 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 diff --git a/scripts/function-linux.sh b/scripts/function-linux.sh index 679c979..faedc08 100755 --- a/scripts/function-linux.sh +++ b/scripts/function-linux.sh @@ -196,9 +196,9 @@ create_linux_bundle() { # COPY LIBRARY LICENSES if [[ ${GPL_ENABLED} == "yes" ]]; then - cp "${BASEDIR}"/LICENSE.GPLv3 "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/tools/license/LICENSE.GPLv3 "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 else - cp "${BASEDIR}"/LICENSE.LGPLv3 "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 + cp "${BASEDIR}"/LICENSE "${LICENSE_BASEDIR}"/license.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 fi cp "${BASEDIR}"/tools/source/SOURCE "${LICENSE_BASEDIR}"/source.txt 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 diff --git a/LICENSE.GPLv3 b/tools/license/LICENSE.GPLv3 similarity index 100% rename from LICENSE.GPLv3 rename to tools/license/LICENSE.GPLv3