Merge branch 'main' into dev

sipeed · Dec 5, 2024 · 4f602b6 · 4f602b6
2 parents 4038e5d + 4260664
commit 4f602b6
Show file tree

Hide file tree

Showing 44 changed files with 118 additions and 44 deletions.
diff --git a/components/3rd_party/FFmpeg/CMakeLists.txt b/components/3rd_party/FFmpeg/CMakeLists.txt
@@ -78,7 +78,7 @@ set_property(SOURCE ${ffmpeg_dynamic_lib_file} PROPERTY GENERATED 1)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -D__ERROR__=00*10000000+__LINE__*1000 -DOS_LINUX)
 
 ###############################################

diff --git a/components/3rd_party/RtspServer/CMakeLists.txt b/components/3rd_party/RtspServer/CMakeLists.txt
@@ -68,7 +68,7 @@ append_srcs_dir(ADD_SRCS        "${src_path}/src/net"
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -D__ERROR__=00*10000000+__LINE__*1000 -DOS_LINUX)
 
 ###############################################

diff --git a/components/3rd_party/asio/CMakeLists.txt b/components/3rd_party/asio/CMakeLists.txt
@@ -46,7 +46,7 @@ list(APPEND ADD_DEFINITIONS -DASIO_STANDALONE=1)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/brotli/CMakeLists.txt b/components/3rd_party/brotli/CMakeLists.txt
@@ -56,7 +56,7 @@
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/cpp-httplib/CMakeLists.txt b/components/3rd_party/cpp-httplib/CMakeLists.txt
@@ -56,7 +56,7 @@ register_component()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/cvi_tpu/CMakeLists.txt b/components/3rd_party/cvi_tpu/CMakeLists.txt
@@ -109,7 +109,7 @@ register_component()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/eigen/CMakeLists.txt b/components/3rd_party/eigen/CMakeLists.txt
@@ -46,7 +46,7 @@ list(APPEND ADD_DEFINITIONS -DASIO_STANDALONE=1)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/freetype/CMakeLists.txt b/components/3rd_party/freetype/CMakeLists.txt
@@ -56,7 +56,7 @@ list(APPEND ADD_REQUIREMENTS brotli)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/harfbuzz/CMakeLists.txt b/components/3rd_party/harfbuzz/CMakeLists.txt
@@ -56,7 +56,7 @@
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/http_request/CMakeLists.txt b/components/3rd_party/http_request/CMakeLists.txt
@@ -40,7 +40,7 @@ list(APPEND ADD_INCLUDE "HTTPRequest/include"
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/ini/CMakeLists.txt b/components/3rd_party/ini/CMakeLists.txt
@@ -40,7 +40,7 @@ aux_source_directory("inifile2/src" ADD_SRCS)  # collect all source file in src
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/libmodbus/CMakeLists.txt b/components/3rd_party/libmodbus/CMakeLists.txt
@@ -90,7 +90,7 @@ set_property(SOURCE ${libmodbus_static_lib_file} PROPERTY GENERATED 1)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -D__ERROR__=00*10000000+__LINE__*1000 -DOS_LINUX)
 
 ###############################################

diff --git a/components/3rd_party/lvgl/CMakeLists.txt b/components/3rd_party/lvgl/CMakeLists.txt
@@ -79,7 +79,7 @@ list(APPEND ADD_REQUIREMENTS rlottie)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 list(APPEND ADD_DEFINITIONS -DLV_CONF_INCLUDE_SIMPLE -DLV_LVGL_H_INCLUDE_SIMPLE)

diff --git a/components/3rd_party/media_server/CMakeLists.txt b/components/3rd_party/media_server/CMakeLists.txt
@@ -104,7 +104,7 @@ set_property(SOURCE ${ADD_STATIC_LIB} PROPERTY GENERATED 1)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 list(APPEND ADD_DEFINITIONS -D__ERROR__=00*10000000+__LINE__*1000 -DOS_LINUX)
 
 ###############################################

diff --git a/components/3rd_party/ntp_client/CMakeLists.txt b/components/3rd_party/ntp_client/CMakeLists.txt
@@ -39,7 +39,7 @@ aux_source_directory("ntp_client" ADD_SRCS)  # collect all source file in src di
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/omv/CMakeLists.txt b/components/3rd_party/omv/CMakeLists.txt
@@ -110,7 +110,7 @@ set_property(SOURCE "${src_path}/alloc" PROPERTY GENERATED 1)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/openssl/CMakeLists.txt b/components/3rd_party/openssl/CMakeLists.txt
@@ -56,7 +56,7 @@
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/pybind11/CMakeLists.txt b/components/3rd_party/pybind11/CMakeLists.txt
@@ -44,7 +44,7 @@ list(APPEND ADD_PRIVATE_INCLUDE "")
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/python3/CMakeLists.txt b/components/3rd_party/python3/CMakeLists.txt
@@ -56,7 +56,7 @@
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/qrcode/CMakeLists.txt b/components/3rd_party/qrcode/CMakeLists.txt
@@ -60,7 +60,7 @@ aux_source_directory("${src_path}/core/src/qrcode" ADD_SRCS)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/quirc/CMakeLists.txt b/components/3rd_party/quirc/CMakeLists.txt
@@ -43,7 +43,7 @@ aux_source_directory("./src" ADD_SRCS)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/rlottie/CMakeLists.txt b/components/3rd_party/rlottie/CMakeLists.txt
@@ -71,7 +71,7 @@ endif()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/sdl/CMakeLists.txt b/components/3rd_party/sdl/CMakeLists.txt
@@ -56,7 +56,7 @@
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/sunxi_mpp/CMakeLists.txt b/components/3rd_party/sunxi_mpp/CMakeLists.txt
@@ -223,7 +223,7 @@ set_property(SOURCE ${sunxi_mpp_dynamic_lib_file} PROPERTY GENERATED 1)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/websocket/CMakeLists.txt b/components/3rd_party/websocket/CMakeLists.txt
@@ -51,7 +51,7 @@ list(APPEND ADD_INCLUDE "${websocketpp_root}"
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/yaml/CMakeLists.txt b/components/3rd_party/yaml/CMakeLists.txt
@@ -41,7 +41,7 @@ aux_source_directory("yaml-cpp/src" ADD_SRCS)  # collect all source file in src
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/zbar/CMakeLists.txt b/components/3rd_party/zbar/CMakeLists.txt
@@ -49,7 +49,7 @@ list(REMOVE_ITEM ADD_SRCS "${src_path}/zbar/svg.c")
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/3rd_party/zip/CMakeLists.txt b/components/3rd_party/zip/CMakeLists.txt
@@ -40,7 +40,7 @@ aux_source_directory("zip/src" ADD_SRCS)  # collect all source file in src dir,
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/basic/CMakeLists.txt b/components/basic/CMakeLists.txt
@@ -56,7 +56,7 @@ list(APPEND ADD_REQUIREMENTS pthread stdc++fs ini yaml ntp_client)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/basic/include/maix_type.hpp b/components/basic/include/maix_type.hpp
@@ -24,17 +24,17 @@ namespace maix
          * Construct a Bytes object from a uint8_t array.
          * @param data uint8_t array
          * @param len length of the array
-         * @param auto_detele if true, will delete data when destruct. When copy is true, this arg will be ignore.
+         * @param auto_delete if true, will delete data when destruct. When copy is true, this arg will be ignore.
          * @param copy data will be copy to new buffer if true, if false, will use data directly,
          *             default true to ensure memory safety.
          * @maixcdk maix.Bytes.Bytes
          */
-        Bytes(uint8_t *data, uint32_t len, bool auto_detele = false, bool copy = true)
+        Bytes(uint8_t *data, uint32_t len, bool auto_delete = false, bool copy = true)
         {
             this->data = data;
             this->data_len = len;
             this->buff_len = len;
-            this->_is_alloc = auto_detele;
+            this->_is_alloc = auto_delete;
             if(len > 0)
             {
                 if(data && copy)

diff --git a/components/comm/CMakeLists.txt b/components/comm/CMakeLists.txt
@@ -49,7 +49,7 @@ list(APPEND ADD_REQUIREMENTS basic peripheral libmodbus)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/ext_dev/CMakeLists.txt b/components/ext_dev/CMakeLists.txt
@@ -79,7 +79,7 @@ register_component()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/maixcam_lib/CMakeLists.txt b/components/maixcam_lib/CMakeLists.txt
@@ -86,7 +86,7 @@ endif()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/network/CMakeLists.txt b/components/network/CMakeLists.txt
@@ -63,7 +63,7 @@ register_component()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/nn/CMakeLists.txt b/components/nn/CMakeLists.txt
@@ -63,7 +63,7 @@ register_component()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/peripheral/CMakeLists.txt b/components/peripheral/CMakeLists.txt
@@ -65,7 +65,7 @@ list(APPEND ADD_REQUIREMENTS basic)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/vision/CMakeLists.txt b/components/vision/CMakeLists.txt
@@ -76,7 +76,7 @@ list(APPEND ADD_REQUIREMENTS eigen voice)
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/vision_extra/CMakeLists.txt b/components/vision_extra/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/components/voice/CMakeLists.txt b/components/voice/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
 # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1)
 
 #### Add compile option for this component
-#### and components denpend on this component
+#### Add components that depend on this component
 # list(APPEND ADD_DEFINITIONS -DAAAAA222=1
 #                             -DAAAAA333=1)
 ###############################################

diff --git a/docs/doc/README.md b/docs/doc/README.md
@@ -43,7 +43,7 @@ Note that the MaixCAM toolchain only supports x86_64 CPUs and is not compatible
 
 ```shell
 sudo apt update
-sudo apt install git cmake build-essential python3 python3-pip
+sudo apt install git cmake build-essential python3 python3-pip autoconf automake libtool
 cmake --version # cmake version should be >= 3.13
 ```
 > To compile for a Linux PC (instead of cross-compiling for a dev board), if you’re using `Ubuntu`, ensure the system version is `>=20.04`, or some dependencies may be too outdated to compile. Install dependencies following the commands in the [Dockerfile](https://github.com/sipeed/MaixCDK/blob/main/docs/doc/dev/docker/Dockerfile).