Переглянути джерело

Update Selkies-GStreamer dependencies

Seungmin Kim 2 роки тому
батько
коміт
4923dd1bd1
2 змінених файлів з 14 додано та 9 видалено
  1. 9 7
      Dockerfile
  2. 5 2
      entrypoint.sh

+ 9 - 7
Dockerfile

@@ -385,8 +385,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         wmctrl \
         jq \
         gdebi-core \
-        glib-networking \
-        libopus0 \
         libgdk-pixbuf2.0-0 \
         libgtk2.0-bin \
         libgl-dev \
@@ -400,18 +398,22 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         xserver-xorg-core \
         wayland-protocols \
         libwayland-dev \
-        libwayland-egl-backend-dev \
+        libwayland-egl1 \
         libx11-xcb1 \
         libxkbcommon0 \
         libxdamage1 \
-        libxml2-dev \
-        libwebrtc-audio-processing1 \
+        libsoup2.4-1 \
+        libsoup-gnome2.4-1 \
         libsrtp2-1 \
-        libcairo-gobject2 \
+        lame \
+        libopus0 \
+        libwebrtc-audio-processing1 \
         pulseaudio \
         libpulse0 \
+        libcairo-gobject2 \
         libpangocairo-1.0-0 \
-        libgirepository1.0-dev \
+        libgirepository1.0-1 \
+        libopenjp2-7 \
         libjpeg-dev \
         libwebp-dev \
         libvpx-dev \

+ 5 - 2
entrypoint.sh

@@ -111,7 +111,7 @@ echo -e "Section \"ServerFlags\"\n    Option \"AutoAddGPU\" \"false\"\nEndSectio
 # Default display is :0 across the container
 export DISPLAY=":0"
 # Run Xorg server with required extensions
-Xorg vt7 -noreset -novtswitch -sharevts -dpi "${DPI}" +extension "GLX" +extension "RANDR" +extension "RENDER" +extension "MIT-SHM" "${DISPLAY}" &
+/usr/bin/Xorg vt7 -noreset -novtswitch -sharevts -dpi "${DPI}" +extension "GLX" +extension "RANDR" +extension "RENDER" +extension "MIT-SHM" "${DISPLAY}" &
 
 # Wait for X11 to start
 echo "Waiting for X socket"
@@ -121,13 +121,16 @@ echo "X socket is ready"
 # Run the x11vnc + noVNC fallback web interface if enabled
 if [ "${NOVNC_ENABLE,,}" = "true" ]; then
   if [ -n "$NOVNC_VIEWPASS" ]; then export NOVNC_VIEWONLY="-viewpasswd ${NOVNC_VIEWPASS}"; else unset NOVNC_VIEWONLY; fi
-  x11vnc -display "${DISPLAY}" -passwd "${BASIC_AUTH_PASSWORD:-$PASSWD}" -shared -forever -repeat -xkb -snapfb -threads -xrandr "resize" -rfbport 5900 ${NOVNC_VIEWONLY} &
+  /usr/local/bin/x11vnc -display "${DISPLAY}" -passwd "${BASIC_AUTH_PASSWORD:-$PASSWD}" -shared -forever -repeat -xkb -snapfb -threads -xrandr "resize" -rfbport 5900 ${NOVNC_VIEWONLY} &
   /opt/noVNC/utils/novnc_proxy --vnc localhost:5900 --listen 8080 --heartbeat 10 &
 fi
 
 # Start KDE desktop environment
 /usr/bin/dbus-launch /usr/bin/startplasma-x11 &
 
+# Start Fcitx input method framework
+/usr/bin/fcitx &
+
 # Add custom processes right below this line, or within `supervisord.conf` to perform service management similar to systemd
 
 echo "Session Running. Press [Return] to exit."