fix(av1): disable av1 build

alibaba · Feb 20, 2020 · 8d571db · 8d571db
1 parent b829487
commit 8d571db
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/build_tools/build_dav1d.sh b/build_tools/build_dav1d.sh
@@ -76,7 +76,6 @@ function build_dav1d(){
 
     if [ "${BUILD}" != "False" ];then
         local build_dir="build/dav1d/$1/$2"
-        #local install_fat="${CWD}/install/dav1d/$1/fat"
         rm -rf ${build_dir}
         mkdir -p ${build_dir}
 
@@ -85,18 +84,15 @@ function build_dav1d(){
         create_dav1d_config
 
         #clear env flag due to meson don't fully support
-        CFLAGS_BAK=${CFLAGS}
-        LDFLAGS_BAK=${LDFLAGS}
         CFLAGS=
         LDFLAGS=
+        CC=
 
         cd ${build_dir}
         meson ${DAV1D_SOURCE_DIR} --buildtype release --prefix ${install_dir} --default-library static --cross-file ${user_config}
         ninja -C ./
         meson install
 
-        CFLAGS=${CFLAGS_BAK}
-        LDFLAGS=${LDFLAGS_BAK}
         cd ${CWD}
     fi
     DAV1D_INSTALL_DIR=${install_dir}

diff --git a/external/contribute/dav1d/0001-chore-enable-bitcode.patch b/external/contribute/dav1d/0001-chore-enable-bitcode.patch
@@ -0,0 +1,28 @@
+From 874b7786fd9032fab802ec4007a5e3c010fe24a5 Mon Sep 17 00:00:00 2001
+From: skufly <skufly@163.com>
+Date: Wed, 8 Jan 2020 15:04:06 +0800
+Subject: [PATCH] chore: enable bitcode
+
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 2bcd0b8..db04f4e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -27,7 +27,10 @@ project('dav1d', ['c'],
+     default_options: ['c_std=c99',
+                       'warning_level=2',
+                       'buildtype=release',
+-                      'b_ndebug=if-release'],
++                      'b_ndebug=if-release',
++                      'b_bitcode=true',
++                      'b_asneeded=false',
++                      ],
+     meson_version: '>= 0.47.0')
+
+ dav1d_soname_version       = '3.1.0'
+-- 
+2.19.1
+
diff --git a/external/player_git_source_list.sh b/external/player_git_source_list.sh
@@ -38,9 +38,12 @@ CURL_BRANCH="curl-7_63_0"
 clone_git $CURL_GIT "$CURL_BRANCH"
 
 if [[ -z "${DAV1D_EXTERNAL_DIR}" ]];then
-    if [ -z "${DAV1D_GIT}" ];then
-        DAV1D_GIT="https://code.videolan.org/videolan/dav1d.git"
+    if [[ -n "${DAV1D_SOURCE_DIR}" ]];then
+        echo "check out dav1d"
+        if [ -z "${DAV1D_GIT}" ];then
+            DAV1D_GIT="https://code.videolan.org/videolan/dav1d.git"
+        fi
+        DAV1D_BRANCH="0.5.2"
+        clone_git $DAV1D_GIT $DAV1D_BRANCH
     fi
-    DAV1D_BRANCH="0.5.2"
-    clone_git $DAV1D_GIT $DAV1D_BRANCH
 fi
diff --git a/external/user_env.sh b/external/user_env.sh
@@ -7,7 +7,7 @@ FDK_AAC_SOURCE_DIR=$TOP_DIR/external/fdk-aac/
 X264_SOURCE_DIR=$TOP_DIR/external/x264/
 OPEN_SSL_SOURCE_DIR=$TOP_DIR/external/openssl/
 CURL_SOURCE_DIR=$TOP_DIR/external/curl
-DAV1D_SOURCE_DIR=$TOP_DIR/external/dav1d
+#DAV1D_SOURCE_DIR=$TOP_DIR/external/dav1d
 #ARES_SOURCE_DIR=$TOP_DIR/external/cares
 #RTMPDUMP_SOURCE_DIR=$TOP_DIR/external/rtmpdump/
 #ANDROID_NDK=$ANDROID_NDK_HOME