更新依赖安装脚本
This commit is contained in:
parent
e94430cf1f
commit
261e46fdc2
@ -72,12 +72,11 @@ install_basic_tools() {
|
||||
python3-dev \
|
||||
python3-venv
|
||||
|
||||
# 其他工具
|
||||
# 其他工具 (注意: ffmpeg稍后会从源码编译安装)
|
||||
apt-get install -y \
|
||||
htop \
|
||||
vim \
|
||||
net-tools \
|
||||
ffmpeg \
|
||||
v4l-utils
|
||||
|
||||
echo -e "${GREEN}✓${NC} 基础工具安装完成"
|
||||
@ -195,6 +194,14 @@ install_rknn() {
|
||||
install_ffmpeg_rk() {
|
||||
echo -e "${YELLOW}[5/6] 安装 FFmpeg (带Rockchip支持)...${NC}"
|
||||
|
||||
# 检查并处理系统预装的ffmpeg
|
||||
echo " 检查系统ffmpeg..."
|
||||
if dpkg -l | grep -q "^ii ffmpeg "; then
|
||||
echo " 发现系统预装ffmpeg,解除保留状态..."
|
||||
apt-mark unhold ffmpeg 2>/dev/null || true
|
||||
apt-get remove -y ffmpeg 2>/dev/null || true
|
||||
fi
|
||||
|
||||
cd "$TEMP_DIR"
|
||||
|
||||
# 检查是否已有ffmpeg-rockchip
|
||||
|
||||
Loading…
Reference in New Issue
Block a user