add ffmpeg4、5、6、7

debugly · debugly · commit b49db3440cc6 · 2025-06-05T18:51:24.000+08:00
diff --git a/configs/ffconfig/auto-detect-third-libs.sh b/configs/ffconfig/auto-detect-third-libs.sh
@@ -22,6 +22,7 @@
 # pkg-config --libs dav1d
 # pkg-config --cflags --libs libbluray
 
+
 THIRD_CFG_FLAGS=
 
 # echo "----------------------"
@@ -133,6 +134,21 @@ echo "----------------------"
 
 # FFmpeg 4.2 支持AV1、AVS2等格式
 # dav1d由VideoLAN，VLC和FFmpeg联合开发，项目由AOM联盟赞助，和libaom相比，dav1d性能普遍提升100%，最高提升400%
+
+result=$(gt_or_equal "$GIT_REPO_VERSION" "4.2")
+if [[ $result ]]; then
+    
+    pkg-config --libs dav1d --silence-errors >/dev/null && enable_dav1d=1
+
+    if [[ $enable_dav1d ]];then
+        echo "[✅] --enable-libdav1d : $(pkg-config --modversion dav1d)"
+        THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libdav1d --enable-decoder=libdav1d"
+    else
+        echo "[❌] --disable-libdav1d --disable-decoder=libdav1d"
+    fi
+    echo "----------------------"
+fi
+
 #从FFmpeg7.1.1开始支持硬解av1，苹果需要M3芯片
 result=$(gt_or_equal "$GIT_REPO_VERSION" "7.1.1")
 if [[ $result ]]; then
@@ -144,28 +160,25 @@ fi
 
 echo "----------------------"
 
-pkg-config --libs dav1d --silence-errors >/dev/null && enable_dav1d=1
-
-if [[ $enable_dav1d ]];then
-    echo "[✅] --enable-libdav1d : $(pkg-config --modversion dav1d)"
-    THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libdav1d --enable-decoder=libdav1d"
-else
-    echo "[❌] --disable-libdav1d --disable-decoder=libdav1d"
-fi
+# 从6开始支持的 smb2 协议
+result=$(gt_or_equal "$GIT_REPO_VERSION" "6")
+if [[ $result ]]; then
+    pkg-config --libs libsmb2 --silence-errors >/dev/null && enable_smb2=1
 
-echo "----------------------"
+    if [[ $enable_smb2 ]];then
+        echo "[✅] --enable-libsmb2 : $(pkg-config --modversion libsmb2)"
+        THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libsmb2 --enable-protocol=libsmb2"
+    else
+        echo "[❌] --disable-libsmb2 --disable-protocol=libsmb2"
+    fi
 
-pkg-config --libs libsmb2 --silence-errors >/dev/null && enable_smb2=1
+    echo "----------------------"
 
-if [[ $enable_smb2 ]];then
-    echo "[✅] --enable-libsmb2 : $(pkg-config --modversion libsmb2)"
-    THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libsmb2 --enable-protocol=libsmb2"
-else
-    echo "[❌] --disable-libsmb2 --disable-protocol=libsmb2"
+    echo "[✅] --enable-parser=av3a"
+    THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-parser=av3a --enable-demuxer=av3a"
+    echo "----------------------"
 fi
 
-echo "----------------------"
-
 pkg-config --libs libbluray --silence-errors >/dev/null && enable_bluray=1
 
 if [[ $enable_bluray ]];then
@@ -174,6 +187,7 @@ if [[ $enable_bluray ]];then
 else
     echo "[❌] --disable-libbluray --disable-protocol=bluray"
 fi
+
 echo "----------------------"
 
 #不确定7代之前的版本是否支持dvdvideo
@@ -188,29 +202,35 @@ if [[ $result ]]; then
     else
         echo "[❌] --disable-dvdvideo"
     fi
+    echo "----------------------"
 else
-    pkg-config --libs dvdread --silence-errors >/dev/null && enable_dvdread=1
-    if [[ $enable_dvdread ]];then
-        echo "[✅] --enable-libdvdread : $(pkg-config --modversion dvdread)"
-        THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libdvdread --enable-protocol=dvd"
-    else
-        echo "[❌] --disable-dvd protocol"
+    result=$(gt_or_equal "$GIT_REPO_VERSION" "5")
+    if [[ $result ]]; then
+        pkg-config --libs dvdread --silence-errors >/dev/null && enable_dvdread=1
+        if [[ $enable_dvdread ]];then
+            echo "[✅] --enable-libdvdread : $(pkg-config --modversion dvdread)"
+            THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libdvdread --enable-protocol=dvd"
+        else
+            echo "[❌] --disable-dvd protocol"
+        fi
+        echo "----------------------"
     fi
 fi
 
-echo "----------------------"
+result=$(gt_or_equal "$GIT_REPO_VERSION" "5")
+if [[ $result ]]; then
+    pkg-config --libs uavs3d --silence-errors >/dev/null && enable_uavs3d=1
 
-pkg-config --libs uavs3d --silence-errors >/dev/null && enable_uavs3d=1
+    if [[ $enable_uavs3d ]];then
+        echo "[✅] --enable-libuavs3d : $(pkg-config --modversion uavs3d)"
+        THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libuavs3d --enable-decoder=libuavs3d"
+    else
+        echo "[❌] --disable-libuavs3d --disable-decoder=libuavs3d"
+    fi
 
-if [[ $enable_uavs3d ]];then
-    echo "[✅] --enable-libuavs3d : $(pkg-config --modversion uavs3d)"
-    THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libuavs3d --enable-decoder=libuavs3d"
-else
-    echo "[❌] --disable-libuavs3d --disable-decoder=libuavs3d"
+    echo "----------------------"
 fi
 
-echo "----------------------"
-
 pkg-config --libs libxml-2.0 --silence-errors >/dev/null && enable_xml2=1
 
 if [[ $enable_xml2 ]];then
@@ -242,8 +262,6 @@ echo "----------------------"
 #     echo "[❌] --disable-decoder=av3a"
 # fi
 
-echo "[✅] --enable-parser=av3a"
-THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-parser=av3a --enable-demuxer=av3a"
 
 # --------------------------------------------------------------
 THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --pkg-config-flags=--static"
diff --git a/configs/libs/ffmpeg4.sh b/configs/libs/ffmpeg4.sh
@@ -0,0 +1,47 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2021 Matt Reach<qianlongxu@gmail.com>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# 
+# brew install nasm
+# If you really want to compile without asm, configure with --disable-asm.
+
+export LIB_NAME='ffmpeg'
+export LIPO_LIBS="libavcodec libavformat libavutil libswscale libswresample libavfilter libavdevice"
+export LIB_DEPENDS_BIN="nasm pkg-config"
+export GIT_LOCAL_REPO=extra/ffmpeg
+export REPO_DIR=ffmpeg4
+export PATCH_DIR=ffmpeg-n4.0
+
+# you can export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git use your mirror
+if [[ "$GIT_FFMPEG_UPSTREAM" != "" ]] ;then
+    export GIT_UPSTREAM="$GIT_FFMPEG_UPSTREAM"
+else
+    export GIT_UPSTREAM=https://github.com/FFmpeg/FFmpeg.git
+fi
+
+if [[ "$GIT_FFMPEG_COMMIT" != "" ]] ;then
+    export GIT_COMMIT="$GIT_FFMPEG_COMMIT"
+    export GIT_REPO_VERSION="$GIT_FFMPEG_COMMIT"
+else
+    export GIT_COMMIT=n4.0.5
+    export GIT_REPO_VERSION=4.0.5
+fi
+
+# pre compiled
+export PRE_COMPILE_TAG_TVOS=
+export PRE_COMPILE_TAG_MACOS=
+export PRE_COMPILE_TAG_IOS=
+export PRE_COMPILE_TAG_ANDROID=
diff --git a/configs/libs/ffmpeg5.sh b/configs/libs/ffmpeg5.sh
@@ -0,0 +1,47 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2021 Matt Reach<qianlongxu@gmail.com>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# 
+# brew install nasm
+# If you really want to compile without asm, configure with --disable-asm.
+
+export LIB_NAME='ffmpeg'
+export LIPO_LIBS="libavcodec libavformat libavutil libswscale libswresample libavfilter libavdevice"
+export LIB_DEPENDS_BIN="nasm pkg-config"
+export GIT_LOCAL_REPO=extra/ffmpeg
+export REPO_DIR=ffmpeg5
+export PATCH_DIR=ffmpeg-n5.1
+
+# you can export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git use your mirror
+if [[ "$GIT_FFMPEG_UPSTREAM" != "" ]] ;then
+    export GIT_UPSTREAM="$GIT_FFMPEG_UPSTREAM"
+else
+    export GIT_UPSTREAM=https://github.com/FFmpeg/FFmpeg.git
+fi
+
+if [[ "$GIT_FFMPEG_COMMIT" != "" ]] ;then
+    export GIT_COMMIT="$GIT_FFMPEG_COMMIT"
+    export GIT_REPO_VERSION="$GIT_FFMPEG_COMMIT"
+else
+    export GIT_COMMIT=n5.1.6
+    export GIT_REPO_VERSION=5.1.6
+fi
+
+# pre compiled
+export PRE_COMPILE_TAG_TVOS=
+export PRE_COMPILE_TAG_MACOS=
+export PRE_COMPILE_TAG_IOS=
+export PRE_COMPILE_TAG_ANDROID=
diff --git a/configs/libs/ffmpeg6.sh b/configs/libs/ffmpeg6.sh
@@ -0,0 +1,48 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2021 Matt Reach<qianlongxu@gmail.com>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# 
+# brew install nasm
+# If you really want to compile without asm, configure with --disable-asm.
+
+export LIB_NAME='ffmpeg'
+export LIPO_LIBS="libavcodec libavformat libavutil libswscale libswresample libavfilter libavdevice"
+export LIB_DEPENDS_BIN="nasm pkg-config"
+export GIT_LOCAL_REPO=extra/ffmpeg
+export REPO_DIR=ffmpeg6
+export PATCH_DIR=ffmpeg-n6.1
+
+# you can export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git use your mirror
+if [[ "$GIT_FFMPEG_UPSTREAM" != "" ]] ;then
+    export GIT_UPSTREAM="$GIT_FFMPEG_UPSTREAM"
+else
+    export GIT_UPSTREAM=https://github.com/FFmpeg/FFmpeg.git
+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.1 #origin/release/5.1
+    export GIT_REPO_VERSION=6.1.1
+fi
+
+# pre compiled
+export PRE_COMPILE_TAG=ffmpeg-6.1.2-250227145407
+export PRE_COMPILE_TAG_TVOS=ffmpeg-6.1.1-250520112635
+export PRE_COMPILE_TAG_MACOS=ffmpeg-6.1.1-250520112635
+export PRE_COMPILE_TAG_IOS=ffmpeg-6.1.1-250520112635
+export PRE_COMPILE_TAG_ANDROID=ffmpeg-6.1.2-250310113110
diff --git a/configs/libs/ffmpeg7.sh b/configs/libs/ffmpeg7.sh
@@ -22,7 +22,8 @@ export LIB_NAME='ffmpeg'
 export LIPO_LIBS="libavcodec libavformat libavutil libswscale libswresample libavfilter libavdevice"
 export LIB_DEPENDS_BIN="nasm pkg-config"
 export GIT_LOCAL_REPO=extra/ffmpeg
-export REPO_DIR=ffmpeg
+export REPO_DIR=ffmpeg7
+export PATCH_DIR=ffmpeg-n7.1.1
 
 # you can export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git use your mirror
 if [[ "$GIT_FFMPEG_UPSTREAM" != "" ]] ;then
@@ -40,9 +41,8 @@ else
 fi
 
 # pre compiled
-export PRE_COMPILE_TAG=ffmpeg-6.1.2-250227145407
+
 export PRE_COMPILE_TAG_TVOS=ffmpeg-7.1.1-250605164908
 export PRE_COMPILE_TAG_MACOS=ffmpeg-7.1.1-250605164908
 export PRE_COMPILE_TAG_IOS=ffmpeg-7.1.1-250605164908
-export PRE_COMPILE_TAG_ANDROID=ffmpeg-6.1.2-250310113110
 
diff --git a/do-compile/apple/ffmpeg.sh b/do-compile/apple/ffmpeg.sh
@@ -88,19 +88,19 @@ 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/
-[ -e config_components.h ] && cp -f config_components.h $MR_BUILD_PREFIX/include/libffmpeg/
+cp -f config_components.h $MR_BUILD_PREFIX/include/libffmpeg/ &> /dev/null || true
 # copy private header for ffmpeg-kit.
-[ -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/getenv_utf8.h $MR_BUILD_PREFIX/include/libavutil/ &> /dev/null || true
 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/
-[ -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/libavutil/attributes_internal.h $MR_BUILD_PREFIX/include/libavutil/ &> /dev/null || true
 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/
 #copy private header for hls.c
-cp -f $MR_BUILD_SOURCE/libavformat/demux.h $MR_BUILD_PREFIX/include/libavformat/
-cp -f $MR_BUILD_SOURCE/libavformat/http.h $MR_BUILD_PREFIX/include/libavformat/
-cp -f $MR_BUILD_SOURCE/libavformat/hls_sample_encryption.h $MR_BUILD_PREFIX/include/libavformat/
+cp -f $MR_BUILD_SOURCE/libavformat/demux.h $MR_BUILD_PREFIX/include/libavformat/ &> /dev/null || true
+cp -f $MR_BUILD_SOURCE/libavformat/http.h $MR_BUILD_PREFIX/include/libavformat/ &> /dev/null || true
+cp -f $MR_BUILD_SOURCE/libavformat/hls_sample_encryption.h $MR_BUILD_PREFIX/include/libavformat/ &> /dev/null || true
