ffmpeg 4.0 compitable

Author: debugly

configs/libs/ffmpeg.sh

@@ -34,9 +34,10 @@ fi
 
 if [[ "$GIT_FFMPEG_COMMIT" != "" ]] ;then
     export GIT_COMMIT="$GIT_FFMPEG_COMMIT"
+    export GIT_REPO_VERSION="$GIT_FFMPEG_COMMIT"
 else
     export GIT_COMMIT=n6.1.2 #origin/release/5.1
+    export GIT_REPO_VERSION=6.1.2
 fi
 
-export GIT_REPO_VERSION=6.1.2
 export PRE_COMPILE_TAG=ffmpeg-6.1.2-250120163555

do-compile/android/ffmpeg.sh

@@ -94,6 +94,7 @@ fi
 echo "----------------------"
 echo "[*] compile"
 
+# V=1
 make -j$MR_HOST_NPROC >/dev/null
 
 echo "----------------------"
@@ -103,15 +104,15 @@ cp config.* $MR_BUILD_PREFIX
 make install >/dev/null
 mkdir -p $MR_BUILD_PREFIX/include/libffmpeg
 cp -f config.h $MR_BUILD_PREFIX/include/libffmpeg/
-cp -f config_components.h $MR_BUILD_PREFIX/include/libffmpeg/
+[ -e config_components.h ] && cp -f config_components.h $MR_BUILD_PREFIX/include/libffmpeg/
 # copy private header for ffmpeg-kit.
-cp -f $MR_BUILD_SOURCE/libavutil/getenv_utf8.h $MR_BUILD_PREFIX/include/libavutil/
+[ -e $MR_BUILD_SOURCE/libavutil/getenv_utf8.h ] && cp -f $MR_BUILD_SOURCE/libavutil/getenv_utf8.h $MR_BUILD_PREFIX/include/libavutil/
 cp -f $MR_BUILD_SOURCE/libavutil/internal.h $MR_BUILD_PREFIX/include/libavutil/
 cp -f $MR_BUILD_SOURCE/libavutil/libm.h $MR_BUILD_PREFIX/include/libavutil/
-cp -f $MR_BUILD_SOURCE/libavutil/attributes_internal.h $MR_BUILD_PREFIX/include/libavutil/
+[ -e $MR_BUILD_SOURCE/libavutil/attributes_internal.h ] && cp -f $MR_BUILD_SOURCE/libavutil/attributes_internal.h $MR_BUILD_PREFIX/include/libavutil/
 cp -f $MR_BUILD_SOURCE/libavcodec/mathops.h $MR_BUILD_PREFIX/include/libavcodec/
 
 mkdir -p $MR_BUILD_PREFIX/include/libavcodec/x86/
 cp -f $MR_BUILD_SOURCE/libavcodec/x86/mathops.h $MR_BUILD_PREFIX/include/libavcodec/x86/
 mkdir -p $MR_BUILD_PREFIX/include/libavutil/x86/
-cp -f $MR_BUILD_SOURCE/libavutil/x86/asm.h $MR_BUILD_PREFIX/include/libavutil/x86/
+cp -f $MR_BUILD_SOURCE/libavutil/x86/asm.h $MR_BUILD_PREFIX/include/libavutil/x86/

do-compile/apple/ffmpeg.sh

@@ -80,22 +80,19 @@ echo "[*] compile"
 
 make -j$MR_HOST_NPROC >/dev/null
 
-echo "----------------------"
-echo "[*] install"
-
 cp config.* $MR_BUILD_PREFIX
 make install >/dev/null
 mkdir -p $MR_BUILD_PREFIX/include/libffmpeg
 cp -f config.h $MR_BUILD_PREFIX/include/libffmpeg/
-cp -f config_components.h $MR_BUILD_PREFIX/include/libffmpeg/
+[ -e config_components.h ] && cp -f config_components.h $MR_BUILD_PREFIX/include/libffmpeg/
 # copy private header for ffmpeg-kit.
-cp -f $MR_BUILD_SOURCE/libavutil/getenv_utf8.h $MR_BUILD_PREFIX/include/libavutil/
+[ -e $MR_BUILD_SOURCE/libavutil/getenv_utf8.h ] && cp -f $MR_BUILD_SOURCE/libavutil/getenv_utf8.h $MR_BUILD_PREFIX/include/libavutil/
 cp -f $MR_BUILD_SOURCE/libavutil/internal.h $MR_BUILD_PREFIX/include/libavutil/
 cp -f $MR_BUILD_SOURCE/libavutil/libm.h $MR_BUILD_PREFIX/include/libavutil/
-cp -f $MR_BUILD_SOURCE/libavutil/attributes_internal.h $MR_BUILD_PREFIX/include/libavutil/
+[ -e $MR_BUILD_SOURCE/libavutil/attributes_internal.h ] && cp -f $MR_BUILD_SOURCE/libavutil/attributes_internal.h $MR_BUILD_PREFIX/include/libavutil/
 cp -f $MR_BUILD_SOURCE/libavcodec/mathops.h $MR_BUILD_PREFIX/include/libavcodec/
 
 mkdir -p $MR_BUILD_PREFIX/include/libavcodec/x86/
 cp -f $MR_BUILD_SOURCE/libavcodec/x86/mathops.h $MR_BUILD_PREFIX/include/libavcodec/x86/
 mkdir -p $MR_BUILD_PREFIX/include/libavutil/x86/
-cp -f $MR_BUILD_SOURCE/libavutil/x86/asm.h $MR_BUILD_PREFIX/include/libavutil/x86/
+cp -f $MR_BUILD_SOURCE/libavutil/x86/asm.h $MR_BUILD_PREFIX/include/libavutil/x86/

main.sh

@@ -21,8 +21,8 @@ set -e
 # 当前脚本所在目录
 THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
-export MR_SHELL_ROOT_DIR="$THIS_DIR"
-export MR_SHELL_TOOLS_DIR="${THIS_DIR}/tools"
+export    MR_SHELL_ROOT_DIR="$THIS_DIR"
+export   MR_SHELL_TOOLS_DIR="${THIS_DIR}/tools"
 export MR_SHELL_CONFIGS_DIR="${THIS_DIR}/configs"
 
 function elapsed()