build ffmpeg5

Author: debugly

.github/workflows/publish-github-release.yml

@@ -1,8 +1,8 @@
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+# on:
+#   push:
+#     branches: [master]
+#   pull_request:
+#     branches: [master]
 
 name: Create Release (Github Edition)
 
@@ -18,7 +18,8 @@ jobs:
         # https://stackoverflow.com/questions/4916492/git-describe-fails-with-fatal-no-names-found-cannot-describe-anything
         # git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs > constants.env
         # git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs > constants.env
-        grep VERSION= download-pre.sh | awk -F = '{printf "RELEASE_VERSION=%s",$2}' | xargs > constants.env
+        d=$(date +'%y%m%d%H%M%S')
+        grep IJK_VERSION= download-pre.sh | awk -F = '{printf "RELEASE_VERSION=%s-$d",$2}' | xargs > constants.env
         echo 'EDITION=github' >> constants.env
         cat constants.env
     - name: Export Env

.github/workflows/publish-ijk-release.yml

@@ -1,8 +1,8 @@
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+# on:
+#   push:
+#     branches: [master]
+#   pull_request:
+#     branches: [master]
 
 name: Create Release (IJK Edition)
 
@@ -18,7 +18,8 @@ jobs:
         # https://stackoverflow.com/questions/4916492/git-describe-fails-with-fatal-no-names-found-cannot-describe-anything
         # git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs > constants.env
         # git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs > constants.env
-        grep VERSION= download-pre.sh | awk -F = '{printf "RELEASE_VERSION=%s",$2}' | xargs > constants.env
+        d=$(date +'%y%m%d%H%M%S')
+        grep IJK_VERSION= download-pre.sh | awk -F = '{printf "RELEASE_VERSION=%s-$d",$2}' | xargs > constants.env
         echo 'EDITION=ijk' >> constants.env
         cat constants.env
     - name: Export Env

apple/compile-cfgs/list.txt

@@ -1 +1 @@
-libyuv openssl opus bluray ffmpeg
+libyuv openssl opus bluray dav1d ffmpeg

apple/do-compile/dav1d.sh

@@ -33,28 +33,23 @@ echo "===check env end==="
 
 # prepare build config
 DAV1D_CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --buildtype release --default-library static"
-CFLAGS="-arch $XC_ARCH $XC_DEPLOYMENT_TARGET $XC_OTHER_CFLAGS"
-
-echo "----------------------"
-echo "[*] compile $LIB_NAME"
-echo "CC: $XCRUN_CC"
-echo "DAV1D_CFG_FLAGS: $DAV1D_CFG_FLAGS"
-echo "CFLAGS: $CFLAGS"
-echo "----------------------"
-echo
 
 cd $XC_BUILD_SOURCE
 export CC="$XCRUN_CC"
 export CXX="$XCRUN_CXX"
 
 if [[ $(uname -m) != "$XC_ARCH" || "$XC_FORCE_CROSS" ]]; then
    echo "[*] cross compile, on $(uname -m) compile $XC_PLAT $XC_ARCH."
-   # https://www.gnu.org/software/automake/manual/html_node/Cross_002dCompilation.html
-   CFLAGS="$CFLAGS -isysroot $XCRUN_SDK_PATH"
-   BLURAY_CFG_FLAGS="$BLURAY_CFG_FLAGS --host=$XC_ARCH-apple-darwin --with-sysroot=$XCRUN_SDK_PATH"
    DAV1D_CFG_FLAGS="$DAV1D_CFG_FLAGS --cross-file package/crossfiles/$XC_ARCH-macos.meson"
 fi
 
+echo "----------------------"
+echo "[*] compile $LIB_NAME"
+echo "CC: $XCRUN_CC"
+echo "DAV1D_CFG_FLAGS: $DAV1D_CFG_FLAGS"
+echo "----------------------"
+echo
+
 if [[ -d build ]]; then
    rm -rf build
 fi

apple/do-compile/ffmpeg.sh

@@ -38,7 +38,7 @@ echo "===check env end==="
 FF_BUILD_OPT=$1
 
 # ffmpeg build params
-source `pwd`/../ffconfig/module.sh
+source $(pwd)/../ffconfig/module.sh
 FFMPEG_CFG_FLAGS="$COMMON_FF_CFG_FLAGS"
 
 FFMPEG_CFG_FLAGS="--prefix=$XC_BUILD_PREFIX $FFMPEG_CFG_FLAGS"
@@ -57,7 +57,7 @@ FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-pic"
 FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-neon"
 FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-asm"
 
-if [[ "$FF_BUILD_OPT" == "debug" ]];then
+if [[ "$FF_BUILD_OPT" == "debug" ]]; then
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --disable-optimizations"
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-debug"
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --disable-small"
@@ -73,10 +73,10 @@ FFMPEG_C_FLAGS="$FFMPEG_C_FLAGS -fno-stack-check -arch $XC_ARCH"
 FFMPEG_C_FLAGS="$FFMPEG_C_FLAGS $XC_DEPLOYMENT_TARGET $XC_OTHER_CFLAGS"
 
 # for cross compile
-if [[ $(uname -m) != "$XC_ARCH" || "$XC_FORCE_CROSS" ]];then
+if [[ $(uname -m) != "$XC_ARCH" || "$XC_FORCE_CROSS" ]]; then
     echo "[*] cross compile, on $(uname -m) compile $XC_PLAT $XC_ARCH."
     # https://www.gnu.org/software/automake/manual/html_node/Cross_002dCompilation.html
-    FFMPEG_C_FLAGS="$FFMPEG_C_FLAGS -isysroot $XCRUN_SDK_PATH"
+    FFMPEG_C_FLAGS="$FFMPEG_C_FLAGS --sysroot $XCRUN_SDK_PATH"
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-cross-compile"
 fi
 
@@ -91,63 +91,65 @@ echo "[*] check OpenSSL"
 # https://ffmpeg.org/doxygen/4.1/md_LICENSE.html
 # https://www.openssl.org/source/license.html
 
-#----------------------
+MY_PKG_CONFIG_PATH=''
 # with openssl
 # use pkg-config fix ff4.0--ijk0.8.8--20210426--001 use openssl 1_1_1m occur can't find openssl error.
 if [[ -f "${XC_PRODUCT_ROOT}/openssl-$XC_ARCH/lib/pkgconfig/openssl.pc" ]]; then
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-nonfree --enable-openssl"
-   
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${XC_PRODUCT_ROOT}/openssl-$XC_ARCH/lib/pkgconfig"
-   
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/openssl-$XC_ARCH/lib/pkgconfig"
+
     echo "[*] --enable-openssl"
 else
     echo "[*] --disable-openssl"
 fi
-echo "------------------------"
 
 echo "----------------------"
 echo "[*] check x264"
 
-#----------------------
 # with x264
 if [[ -f "${XC_PRODUCT_ROOT}/x264-$XC_ARCH/lib/pkgconfig/x264.pc" ]]; then
     # libx264 is gpl and --enable-gpl is not specified.
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-gpl --enable-libx264"
-    
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${XC_PRODUCT_ROOT}/x264-$XC_ARCH/lib/pkgconfig"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/x264-$XC_ARCH/lib/pkgconfig"
 
     echo "[*] --enable-libx264"
 else
     echo "[*] --disable-libx264"
 fi
-echo "------------------------"
 
 echo "----------------------"
 echo "[*] check fdk-aac"
 
-#----------------------
 # with fdk-aac
 if [[ -f "${XC_PRODUCT_ROOT}/fdk-aac-$XC_ARCH/lib/pkgconfig/fdk-aac.pc" ]]; then
 
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-nonfree --enable-libfdk-aac"
-    
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${XC_PRODUCT_ROOT}/fdk-aac-$XC_ARCH/lib/pkgconfig"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/fdk-aac-$XC_ARCH/lib/pkgconfig"
 
     echo "[*] --enable-libfdk-aac"
 else
     echo "[*] --disable-libfdk-aac"
 fi
-echo "------------------------"
 
 echo "----------------------"
 echo "[*] check mp3lame"
 
-#----------------------
 # with lame
 if [[ -f "${XC_PRODUCT_ROOT}/lame-$XC_ARCH/lib/libmp3lame.a" ]]; then
     # libmp3lame is gpl and --enable-gpl is not specified.
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-gpl --enable-libmp3lame"
-    
+
     FDKAAC_C_FLAGS="-I${XC_PRODUCT_ROOT}/lame-$XC_ARCH/include"
     FDKAAC_LD_FLAGS="-L${XC_PRODUCT_ROOT}/lame-$XC_ARCH/lib -lmp3lame"
 
@@ -157,62 +159,77 @@ if [[ -f "${XC_PRODUCT_ROOT}/lame-$XC_ARCH/lib/libmp3lame.a" ]]; then
 else
     echo "[*] --disable-libmp3lame"
 fi
-echo "------------------------"
 
 echo "----------------------"
 echo "[*] check opus"
 
-#----------------------
 # with opus
 if [[ -f "${XC_PRODUCT_ROOT}/opus-$XC_ARCH/lib/pkgconfig/opus.pc" ]]; then
-    
+
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-libopus --enable-decoder=opus"
-    
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${XC_PRODUCT_ROOT}/opus-$XC_ARCH/lib/pkgconfig"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/opus-$XC_ARCH/lib/pkgconfig"
 
     echo "[*] --enable-libopus --enable-decoder=opus"
 else
     echo "[*] --disable-libopus"
 fi
-echo "------------------------"
 
-#----------------------
+echo "----------------------"
+echo "[*] check bluray"
+
 # with bluray
 if [[ -f "${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig/libbluray.pc" ]]; then
-    
+
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
-    
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig"
 
     echo "[*] --enable-libbluray --enable-protocol=bluray"
 else
     echo "[*] --disable-libbluray --disable-protocol=bluray"
 fi
-echo "------------------------"
 
-#----------------------
+echo "----------------------"
+echo "[*] check dav1d"
+
 # FFmpeg 4.2 支持AV1、AVS2等格式
 # dav1d由VideoLAN，VLC和FFmpeg联合开发，项目由AOM联盟赞助，和libaom相比，dav1d性能普遍提升100%，最高提升400%
 if [[ -f "${XC_PRODUCT_ROOT}/dav1d-$XC_ARCH/lib/pkgconfig/dav1d.pc" ]]; then
-    FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-decoder=av1 --enable-libdav1d"
-    
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${XC_PRODUCT_ROOT}/dav1d-$XC_ARCH/lib/pkgconfig"
 
-    echo "[*] --enable-decoder=av1 --enable-libdav1d"
+    FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-libdav1d --enable-decoder=libdav1d"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/dav1d-$XC_ARCH/lib/pkgconfig"
+
+    echo "[*] --enable-libdav1d --enable-decoder=libdav1d"
 else
-    echo "[*] --disable-decoder=av1 --disable-libdav1d"
+    echo "[*] --disable-libdav1d --disable-decoder=libdav1d"
+fi
+
+#just wait videotoolbox support decode av1
+# FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-decoder=av1"
+
+if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+    export PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH"
 fi
-echo "------------------------"
 
-#parser subtitles
-FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-demuxer=ass --enable-demuxer=webvtt --enable-demuxer=srt"
-    
 CC="$XCRUN_CC"
 
-#----------------------
+# echo "PKG_CONFIG_PATH:${PKG_CONFIG_PATH}"
+# pkg-config --variable pc_path pkg-config
+# pkg-config --libs dav1d
+
 echo "----------------------"
 echo "[*] configure"
-echo "------------------------"
 
 if [[ ! -d $XC_BUILD_SOURCE ]]; then
     echo ""
@@ -227,15 +244,15 @@ cd $XC_BUILD_SOURCE
 if [[ -f "./config.h" ]]; then
     echo 'reuse configure'
 else
-    echo 
+    echo
     echo "CC: $CC"
     echo
     echo "CFLAGS: $FFMPEG_C_FLAGS"
     echo
     echo "FF_CFG_FLAGS: $FFMPEG_CFG_FLAGS"
     echo
     echo "LDFLAG:$FFMPEG_LDFLAGS $FFMPEG_DEP_LIBS"
-    echo 
+    echo
     ./configure \
         $FFMPEG_CFG_FLAGS \
         --cc="$CC" \
@@ -255,4 +272,4 @@ make install -j8 1>/dev/null
 mkdir -p $XC_BUILD_PREFIX/include/libffmpeg
 cp -f config.h $XC_BUILD_PREFIX/include/libffmpeg/config.h
 # copy private header.
-#cp -f $XC_BUILD_SOURCE/libavformat/avc.h $XC_BUILD_PREFIX/include/libavformat/avc.h
+#cp -f $XC_BUILD_SOURCE/libavformat/avc.h $XC_BUILD_PREFIX/include/libavformat/avc.h

download-pre.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-VERSION=20230304181936
+IJK_VERSION=0.10.0
 
 set -e
 
@@ -66,8 +66,8 @@ fi
 
 if test -z $VER ;then
     #VER=$(git describe --abbrev=0 --tag | awk -F - '{printf "%s-%s",$1,$2}')
-    VER="$VERSION"
-    echo "use the default version:${VER}"
+    usage
+    exit
 fi
 
 if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' ]]; then

extra/patches/dav1d/0001-add-macos-x86_64-cross-file.patch

@@ -1,6 +1,6 @@
-From 9f11442c4cde071eaee82dc01df9e8403a2bc39a Mon Sep 17 00:00:00 2001
+From e7e92544aca6c577d6a6527f731bfeb069b331dd Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
-Date: Thu, 28 Jul 2022 17:38:38 +0800
+Date: Thu, 25 May 2023 14:53:53 +0800
 Subject: [PATCH] add macos x86_64 cross file
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH] add macos x86_64 cross file
 
 diff --git a/package/crossfiles/x86_64-macos.meson b/package/crossfiles/x86_64-macos.meson
 new file mode 100644
-index 0000000..bfeb08a
+index 0000000..cf484d1
 --- /dev/null
 +++ b/package/crossfiles/x86_64-macos.meson
 @@ -0,0 +1,30 @@
@@ -27,12 +27,12 @@ index 0000000..bfeb08a
 +strip = 'strip'
 +
 +[built-in options]
-+c_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk']
-+cpp_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk']
-+c_link_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk']
-+cpp_link_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk']
-+objc_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk']
-+objcpp_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk']
++c_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11']
++cpp_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11']
++c_link_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11']
++cpp_link_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11']
++objc_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11']
++objcpp_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11']
 +
 +[properties]
 +root = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer'
@@ -46,5 +46,5 @@ index 0000000..bfeb08a
 +endian = 'little'
 \ No newline at end of file
 -- 
-2.30.1 (Apple Git-130)
+2.39.2 (Apple Git-143)