From 53a01ea2f3c866b260c280740d1e6d0ffabcbb8b Mon Sep 17 00:00:00 2001
From: dragonflylee <dragonflylee@outlook.com>
Date: Mon, 17 Jun 2024 15:26:25 +0800
Subject: [PATCH] fix: missing config item `DANMAKU_ON`

---
 app/src/utils/config.cpp                 | 1 +
 scripts/deb/switchroot-bionic/Dockerfile | 4 ++--
 scripts/deb/ubuntu-focal/Dockerfile      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/utils/config.cpp b/app/src/utils/config.cpp
index 29828e72..2d6e1f22 100644
--- a/app/src/utils/config.cpp
+++ b/app/src/utils/config.cpp
@@ -65,6 +65,7 @@ std::unordered_map<AppConfig::Item, AppConfig::Option> AppConfig::settingMap = {
     {PLAYER_HWDEC, {"player_hwdec"}},
     {PLAYER_HWDEC_CUSTOM, {"player_hwdec_custom"}},
     {PLAYER_ASPECT, {"player_aspect", {"auto", "stretch", "crop", "4:3", "16:9"}}},
+    {DANMAKU_ON, {"danmaku_on"}},
     {DANMAKU_STYLE_AREA, {"danmaku_style_area", {"1/4", "1/2", "3/4", "1"}, {25, 50, 75, 100}}},
     {DANMAKU_STYLE_ALPHA,
         {
diff --git a/scripts/deb/switchroot-bionic/Dockerfile b/scripts/deb/switchroot-bionic/Dockerfile
index e4205927..b0d13cd1 100644
--- a/scripts/deb/switchroot-bionic/Dockerfile
+++ b/scripts/deb/switchroot-bionic/Dockerfile
@@ -3,7 +3,7 @@
 # docker run --rm --name switchroot --network host -v $PWD:/opt -w /opt -it dragonflylee/build:switchroot-bionic bash -l
 
 FROM arm64v8/ubuntu:18.04
-RUN apt-get update && apt-get install -y gnupg wget \
+RUN apt-get update && apt-get install -y gpg wget gnupg- \
   && wget -qO- https://newrepo.switchroot.org/pubkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/switchroot.gpg \
   && echo > /etc/apt/sources.list.d/99-switchroot-newrepo.list "deb https://newrepo.switchroot.org/ switchroot unstable" \
   && wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/kitware.gpg \
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y gnupg wget \
   && apt-get update && apt-get install -y --no-install-recommends gcc-8 g++-8 nasm cmake ninja-build sudo git gcc- manpages- \
   && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/cc cc /usr/bin/gcc-8 \
   && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60 --slave /usr/bin/cpp cpp /usr/bin/g++-8 \
-  && apt-get remove -y gnupg && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /usr/share/man/*
+  && apt-get remove -y gpg && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /usr/share/man/*
 
 RUN apt-get update && apt-get install -y --no-install-recommends xorg-dev libdbus-1-dev libssl-dev \
     libass-dev libwebp-dev libv4l-dev libpulse-dev libuchardet-dev nvidia-l4t-jetson-multimedia-api \
diff --git a/scripts/deb/ubuntu-focal/Dockerfile b/scripts/deb/ubuntu-focal/Dockerfile
index 39ce76ea..79ced379 100644
--- a/scripts/deb/ubuntu-focal/Dockerfile
+++ b/scripts/deb/ubuntu-focal/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:focal
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y gnupg wget \
+RUN apt-get update && apt-get install -y gpg wget gnupg- \
   && wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/kitware.gpg \
   && echo > /etc/apt/sources.list.d/kitware.list "deb https://apt.kitware.com/ubuntu/ focal main" \
   && apt-get update && apt-get install -y --no-install-recommends g++ nasm make patch cmake sudo git xz-utils manpages- \