dav1d use meson and support android

debugly · debugly · commit 89001940924a · 2025-02-12T14:35:19.000+08:00
diff --git a/.github/workflows/dav1d.yml b/.github/workflows/dav1d.yml
@@ -5,16 +5,22 @@ on:
   pull_request:
     branches: [master]
 
-name: Create dav1d Release
+name: Dav1d
 
 jobs:
   build:
-    name: compile dav1d then deploy
+    name: compile apple and android dav1d then deploy
     runs-on: macos-14
     env:
       GH_TOKEN: ${{ github.token }}
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+    - uses: nttld/setup-ndk@v1
+      id: setup-ndk
+      with:
+        ndk-version: r21e
+        add-to-path: false
+        local-cache: true
     - name: One Step
       run: .github/workflows/onestep.sh dav1d all
diff --git a/configs/libs/dav1d.sh b/configs/libs/dav1d.sh
@@ -20,10 +20,10 @@ export LIB_NAME='dav1d'
 export LIPO_LIBS="libdav1d"
 export LIB_DEPENDS_BIN="meson ninja nasm"
 export GIT_LOCAL_REPO=extra/dav1d
-export GIT_COMMIT=1.5.0
+export GIT_COMMIT=1.5.1
 export GIT_WITH_SUBMODULE=0
 export REPO_DIR=dav1d
-export GIT_REPO_VERSION=1.5.0
+export GIT_REPO_VERSION=1.5.1
 export PRE_COMPILE_TAG=dav1d-1.5.0-241227150820
 
 # you can export GIT_DAV1D_UPSTREAM=git@xx:yy/dav1d.git use your mirror
diff --git a/configs/meson-crossfiles/arm64-android.meson b/configs/meson-crossfiles/arm64-android.meson
diff --git a/configs/meson-crossfiles/arm64-ios-simulator.meson b/configs/meson-crossfiles/arm64-ios-simulator.meson
@@ -3,6 +3,12 @@
 # these might not work for you. Use the googels and xcrun.
 # https://mesonbuild.com/Reference-tables.html#cpu-families
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
 
 [built-in options]
 c_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
diff --git a/configs/meson-crossfiles/arm64-ios.meson b/configs/meson-crossfiles/arm64-ios.meson
@@ -2,6 +2,13 @@
 # Apple keeps changing the location and names of files so
 # these might not work for you. Use the googels and xcrun.
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
 [built-in options]
 c_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
 cpp_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
diff --git a/configs/meson-crossfiles/arm64-macos.meson b/configs/meson-crossfiles/arm64-macos.meson
@@ -2,6 +2,13 @@
 # Apple keeps changing the location and names of files so
 # these might not work for you. Use the googels and xcrun.
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
 [built-in options]
 c_args = ['-arch', 'arm64', '-mmacosx-version-min=10.11', '-Os']
 cpp_args = ['-arch', 'arm64', '-mmacosx-version-min=10.11', '-Os']
diff --git a/configs/meson-crossfiles/arm64-tvos-simulator.meson b/configs/meson-crossfiles/arm64-tvos-simulator.meson
@@ -2,6 +2,13 @@
 # Apple keeps changing the location and names of files so
 # these might not work for you. Use the googels and xcrun.
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
 [built-in options]
 c_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
 cpp_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
diff --git a/configs/meson-crossfiles/arm64-tvos.meson b/configs/meson-crossfiles/arm64-tvos.meson
@@ -2,6 +2,13 @@
 # Apple keeps changing the location and names of files so
 # these might not work for you. Use the googels and xcrun.
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
 [built-in options]
 c_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
 cpp_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
diff --git a/configs/meson-crossfiles/armv7a-android.meson b/configs/meson-crossfiles/armv7a-android.meson
@@ -1,6 +1,6 @@
 [binaries]
-c = 'armv7a-linux-androideabi19-clang'
-cpp = 'armv7a-linux-androideabi19-clang++'
+c = 'armv7a-linux-androideabi21-clang'
+cpp = 'armv7a-linux-androideabi21-clang++'
 ar = 'llvm-ar'
 strip = 'llvm-strip'
 pkgconfig = 'pkg-config'
diff --git a/configs/meson-crossfiles/x86-android.meson b/configs/meson-crossfiles/x86-android.meson
@@ -1,6 +1,6 @@
 [binaries]
-c = 'i686-linux-android19-clang'
-cpp = 'i686-linux-android19-clang++'
+c = 'i686-linux-android21-clang'
+cpp = 'i686-linux-android21-clang++'
 ar = 'llvm-ar'
 strip = 'llvm-strip'
 pkgconfig = 'pkg-config'
diff --git a/configs/meson-crossfiles/x86_64-ios-simulator.meson b/configs/meson-crossfiles/x86_64-ios-simulator.meson
@@ -2,6 +2,13 @@
 # Apple keeps changing the location and names of files so
 # these might not work for you. Use the googels and xcrun.
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
 [built-in options]
 c_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
 cpp_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
diff --git a/configs/meson-crossfiles/x86_64-macos.meson b/configs/meson-crossfiles/x86_64-macos.meson
@@ -2,6 +2,13 @@
 # Apple keeps changing the location and names of files so
 # these might not work for you. Use the googels and xcrun.
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
 [built-in options]
 c_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-Os']
 cpp_args = ['-arch', 'x86_64', '-mmacosx-version-min=10.11', '-Os']
diff --git a/configs/meson-crossfiles/x86_64-tvos-simulator.meson b/configs/meson-crossfiles/x86_64-tvos-simulator.meson
@@ -2,6 +2,13 @@
 # Apple keeps changing the location and names of files so
 # these might not work for you. Use the googels and xcrun.
 
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+ar = 'ar'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
 [built-in options]
 c_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
 cpp_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
diff --git a/do-compile/android/dav1d.sh b/do-compile/android/dav1d.sh
@@ -0,0 +1,19 @@
+#! /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.
+#
+
+# call common meson build shell
+./meson-compatible.sh
diff --git a/do-compile/android/meson-compatible.sh b/do-compile/android/meson-compatible.sh
@@ -0,0 +1,72 @@
+#! /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.
+#
+
+set -e
+
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
+
+MESON_OTHER_FLAGS="$1"
+
+echo "----------------------"
+echo "[*] configurate $LIB_NAME"
+echo "[*] other meson flags: $MESON_OTHER_FLAGS"
+echo "----------------------"
+
+# prepare build config
+CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --default-library static"
+
+if [[ "$MR_DEBUG" == "debug" ]]; then
+    CFG_FLAGS="$CFG_FLAGS --buildtype=debug"
+else
+    CFG_FLAGS="$CFG_FLAGS --buildtype=release"
+fi
+
+export CC="$MR_CC"
+export CXX="$MR_CXX"
+
+if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]]; then
+    if [[ $MR_IS_SIMULATOR == 1 ]]; then
+        echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH simulator."
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
+    else
+        echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH."
+        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
+    fi
+fi
+
+CFG_FLAGS="$CFG_FLAGS $MESON_OTHER_FLAGS"
+
+echo "----------------------"
+echo "[*] compile $LIB_NAME"
+echo "CC: $MR_CC"
+echo "CFG_FLAGS: $CFG_FLAGS"
+echo "----------------------"
+echo
+
+cd $MR_BUILD_SOURCE
+build=./meson_wksp
+rm -rf $build
+
+meson setup $build $CFG_FLAGS
+
+cd $build
+
+meson compile && meson install
+
+# ninja -C build
+# ninja -C build install
diff --git a/do-compile/apple/dav1d.sh b/do-compile/apple/dav1d.sh
@@ -15,63 +15,5 @@
 # limitations under the License.
 #
 
-set -e
-
-THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
-cd "$THIS_DIR"
-
-echo "=== [$0] check env begin==="
-env_assert "MR_ARCH"
-env_assert "MR_BUILD_NAME"
-env_assert "MR_CC"
-env_assert "MR_BUILD_SOURCE"
-env_assert "MR_BUILD_PREFIX"
-env_assert "MR_SYS_ROOT"
-env_assert "MR_HOST_NPROC"
-echo "MR_DEBUG:$MR_DEBUG"
-echo "MR_IS_SIMULATOR:$MR_IS_SIMULATOR"
-echo "===check env end==="
-
-# prepare build config
-CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --default-library static"
-
-if [[ "$BUILD_OPT" == "debug" ]]; then
-    CFG_FLAGS="$CFG_FLAGS --buildtype=debug"
-else
-    CFG_FLAGS="$CFG_FLAGS --buildtype=release"
-fi
-
-cd $MR_BUILD_SOURCE
-export CC="$MR_CC"
-export CXX="$MR_CXX"
-
-if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]]; then
-    if [[ $MR_IS_SIMULATOR != 1 ]]; then
-        echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT.meson"
-    else
-        echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH simulator."
-        CFG_FLAGS="$CFG_FLAGS --cross-file $MR_SHELL_CONFIGS_DIR/meson-crossfiles/$MR_ARCH-$MR_PLAT-simulator.meson"
-    fi
-fi
-
-echo "----------------------"
-echo "[*] compile $LIB_NAME"
-echo "CC: $MR_CC"
-echo "CFG_FLAGS: $CFG_FLAGS"
-echo "----------------------"
-echo
-
-build=./build-$MR_ARCH
-if [[ -d $build ]]; then
-    rm -rf $build
-fi
-
-meson setup $build $CFG_FLAGS
-
-cd $build
-
-meson compile && meson install
-
-# ninja -C build
-# ninja -C build install
+# call common meson build shell
+./meson-compatible.sh
diff --git a/do-compile/apple/freetype.sh b/do-compile/apple/freetype.sh
@@ -34,7 +34,7 @@ echo "===check env end==="
 # prepare build config
 CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --default-library static -Dpng=disabled -Dharfbuzz=disabled"
 
-if [[ "$BUILD_OPT" == "debug" ]]; then
+if [[ "$MR_DEBUG" == "debug" ]]; then
     CFG_FLAGS="$CFG_FLAGS --buildtype=debug"
 else
     CFG_FLAGS="$CFG_FLAGS --buildtype=release"
diff --git a/do-compile/apple/fribidi.sh b/do-compile/apple/fribidi.sh
@@ -42,7 +42,7 @@ if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]];then
     CFG_FLAGS="$CFG_FLAGS --host=$MR_ARCH-apple-darwin --with-sysroot=$MR_SYS_ROOT"
 fi
 
-if [[ "$BUILD_OPT" == "debug" ]]; then
+if [[ "$MR_DEBUG" == "debug" ]]; then
     CFG_FLAGS="$CFG_FLAGS --enable-debug"
 fi
 
diff --git a/do-compile/apple/harfbuzz.sh b/do-compile/apple/harfbuzz.sh
@@ -36,7 +36,7 @@ echo "===check env end==="
 # prepare build config
 CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --default-library static -Ddocs=disabled -Dcairo=disabled -Dchafa=disabled -Dtests=disabled"
 
-if [[ "$BUILD_OPT" == "debug" ]]; then
+if [[ "$MR_DEBUG" == "debug" ]]; then
     CFG_FLAGS="$CFG_FLAGS --buildtype=debug"
 else
     CFG_FLAGS="$CFG_FLAGS --buildtype=release"
diff --git a/do-compile/apple/meson-compatible.sh b/do-compile/apple/meson-compatible.sh
