修改编译脚本

.gitignore

@@ -2,3 +2,5 @@ build
 lib
 out
 .cache
+./libs
+libs/

CMakeLists.txt

@@ -51,8 +51,22 @@ include(dep/zlinuxcomponents/mycroft_precise/module.cmake)
 include(dep/zlinuxcomponents/audio/module.cmake)
 
 # 设置当前工程依赖的头文件路径和链接的库文件
-set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/)
-set(DEP_LINK_LIBRARIES ${DEP_LINK_LIBRARIES} asound pthread)
+set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/ libs/ffmpeg/include)
+set(DEP_LINK_DIRECTORIES ${DEP_LINK_DIRECTORIES} libs/ffmpeg/lib)
+set(DEP_LINK_LIBRARIES
+    ${DEP_LINK_LIBRARIES}
+    # ffmpeg
+    avcodec
+    avdevice
+    avfilter
+    avformat
+    avutil
+    swresample
+    swscale
+    m
+    # sys
+    asound
+    pthread)
 
 # 添加编译的目标文件
 zadd_executable_simple(

dep/zlinuxcomponents

@@ -1 +1 @@
-Subproject commit f2363bcf3040be73209257711fda42798883005c
+Subproject commit 20cff3988f92aae2bae4d05e7ab1f15078c64a5d

sh/envsetup_rk3328.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 # 下载编译器
 cd ${PROJECT_PATH}/build
+#
+# GCC原始下载地址，下面使用的是本地的下载地址
+# https://snapshots.linaro.org/components/toolchain/binaries/7.5-2019.12-rc1/aarch64-linux-gnu/gcc-linaro-7.5.0-2019.12-rc1-x86_64_aarch64-linux-gnu.tar.xz
+#
+wget -c "http://192.168.1.2:5000/d/s/738746148977685128/_nzQ8Q4hspZYDmEJb76gRQGDTjXqdFnk-pbLgN7-NQAo_"
+rm -rf gcc-linaro-7.5.0-2019.12-rc1-x86_64_aarch64-linux-gnu
+tar -xvf gcc-linaro-7.5.0-2019.12-rc1-x86_64_aarch64-linux-gnu.tar.xz
 
-wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu.tar.gz"
-rm -rf gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu
-tar -xvf gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu.tar.gz
-
-BUILD_TOOLS_PATH=${PROJECT_PATH}/build/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu/aarch64-linux-gnu/
+BUILD_TOOLS_PATH=${PROJECT_PATH}/build/gcc-linaro-7.5.0-2019.12-rc1-x86_64_aarch64-linux-gnu/aarch64-linux-gnu/
 
 # alsa 支持
 wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/libasound2_dev1.1.3-5ubuntu0.6.tar.gz"
@@ -22,6 +25,6 @@ mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/include/sys/* ${BUILD_TOOLS_PATH}/i
 
 # 构造build.sh
 echo "cmake ../ \\" >${PROJECT_PATH}/build/build.sh
-echo "-DCMAKE_C_COMPILER=${PROJECT_PATH}/build/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc \\" >>${PROJECT_PATH}/build/build.sh
-echo "-DCMAKE_CXX_COMPILER=${PROJECT_PATH}/build/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ \\" >>${PROJECT_PATH}/build/build.sh
+echo "-DCMAKE_C_COMPILER=${BUILD_TOOLS_PATH}/../bin/aarch64-linux-gnu-gcc \\" >>${PROJECT_PATH}/build/build.sh
+echo "-DCMAKE_CXX_COMPILER=${BUILD_TOOLS_PATH}/../bin/aarch64-linux-gnu-g++ \\" >>${PROJECT_PATH}/build/build.sh
 chmod +x ${PROJECT_PATH}/build/build.sh

sh/packet.sh

@@ -62,6 +62,10 @@ if [ "$BUILDFOR" == "rk3328" ]; then
 fi
 # 下载唤醒词语音
 wget_and_cpy 192.168.1.2:8021/manufacturer_mycroft/hotworld/xiaomaoxiaomao/test_xiaomaoxiaomao.wav
+
+
+
+
 ####################################################################
 ####################################################################
 

zcmake

@@ -1 +1 @@
-Subproject commit ec00cf7338f07e36c3fbbaa8f9f8fcc4312ac785
+Subproject commit cbc46d4ee6c9bf3cf302ace4e42914f83cd31b36