From e1f5c17f76b6fd219a0f7507259ccda77d7e2284 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Tue, 5 Apr 2022 10:02:15 +0300 Subject: [PATCH 1/3] Update default FFmpeg version to 5.0.1 --- README.md | 2 +- scripts/parse-arguments.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2a2f3fa..39f55c1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The script also produces `ffmpeg` and `ffprobe` executables that can be used in The main focus of ffmpeg-android-maker is to prepare shared libraries for seamless integration into an Android project. The script prepares the `output` directory that is meant to be used. And it's not the only thing this project does. -By default this script downloads and builds the FFmpeg **5.0**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **5.0.1**, but the version can be overridden. The details of how this script is implemented are described in this series of posts: * [Part 1](https://proandroiddev.com/a-story-about-ffmpeg-in-android-part-i-compilation-898e4a249422) diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index b8cdc43..3d21a47 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -9,7 +9,7 @@ ABIS_TO_BUILD=() API_LEVEL=19 SOURCE_TYPE=TAR -SOURCE_VALUE=5.0 +SOURCE_VALUE=5.0.1 EXTERNAL_LIBRARIES=() FFMPEG_GPL_ENABLED=false From 059605687ac63ed70db4e606dfc940c2d022eb6e Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 17 Jun 2022 23:00:29 +0300 Subject: [PATCH 2/3] Using llvm-as instead of GAS --- scripts/export-build-variables.sh | 2 +- scripts/libaom/android.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/export-build-variables.sh b/scripts/export-build-variables.sh index 13ae035..d913f85 100755 --- a/scripts/export-build-variables.sh +++ b/scripts/export-build-variables.sh @@ -55,6 +55,7 @@ export CROSS_PREFIX_WITH_PATH=${TOOLCHAIN_PATH}/bin/llvm- # The FAM_ prefix is used to eliminate passing those values implicitly to build systems export FAM_ADDR2LINE=${CROSS_PREFIX_WITH_PATH}addr2line export FAM_AR=${CROSS_PREFIX_WITH_PATH}ar +export FAM_AS=${CROSS_PREFIX_WITH_PATH}as export FAM_NM=${CROSS_PREFIX_WITH_PATH}nm export FAM_OBJCOPY=${CROSS_PREFIX_WITH_PATH}objcopy export FAM_OBJDUMP=${CROSS_PREFIX_WITH_PATH}objdump @@ -69,7 +70,6 @@ export TARGET=${TARGET_TRIPLE_MACHINE_CC}-linux-${TARGET_TRIPLE_OS}${ANDROID_PLA export FAM_CC=${TOOLCHAIN_PATH}/bin/${TARGET}-clang export FAM_CXX=${FAM_CC}++ export FAM_LD=${FAM_CC} -export FAM_AS=${FAM_CC} # TODO consider abondaning this strategy of defining the name of the clang wrapper # in favour of just passing -mstackrealign and -fno-addrsig depending on diff --git a/scripts/libaom/android.cmake b/scripts/libaom/android.cmake index 06fcbdb..5ca078c 100644 --- a/scripts/libaom/android.cmake +++ b/scripts/libaom/android.cmake @@ -16,7 +16,7 @@ include("$ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") if(DEFINED CMAKE_ASM_NASM_COMPILER) set(AS_EXECUTABLE ${CMAKE_ASM_NASM_COMPILER}) else() - set(AS_EXECUTABLE ${_CMAKE_TOOLCHAIN_PREFIX}as) + set(AS_EXECUTABLE ${ANDROID_ASM_COMPILER}) endif() # AV1 Codec Library doesn't recognise 'i686' as CMAKE_SYSTEM_PROCESSOR From 89631fa5116707a183c0b894f663e5553436736e Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 19 Jun 2022 13:43:21 +0300 Subject: [PATCH 3/3] Trying actions/checkout@v3 --- .github/workflows/compilability_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compilability_check.yml b/.github/workflows/compilability_check.yml index 845f7e1..bbb8c0a 100644 --- a/.github/workflows/compilability_check.yml +++ b/.github/workflows/compilability_check.yml @@ -8,7 +8,7 @@ jobs: abi: [ "armeabi-v7a", "arm64-v8a", "x86", "x86_64" ] fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup the environment run: |