Эх сурвалжийг харах

Fix Wine installation procedure

Seungmin Kim 3 жил өмнө
parent
commit
f8d15b6527
1 өөрчлөгдсөн 3 нэмэгдсэн , 2 устгасан
  1. 3 2
      Dockerfile

+ 3 - 2
Dockerfile

@@ -117,6 +117,8 @@ RUN dpkg --add-architecture i386 && \
         pkg-config \
         pkg-config \
         mesa-utils \
         mesa-utils \
         mesa-utils-extra \
         mesa-utils-extra \
+        mesa-va-drivers \
+        mesa-vulkan-drivers \
         libglu1 \
         libglu1 \
         libglu1:i386 \
         libglu1:i386 \
         libsm6 \
         libsm6 \
@@ -193,7 +195,7 @@ RUN dpkg --add-architecture i386 && \
 # Wine, Winetricks, and PlayOnLinux, comment out the below lines to disable
 # Wine, Winetricks, and PlayOnLinux, comment out the below lines to disable
 ARG WINE_BRANCH=devel
 ARG WINE_BRANCH=devel
 RUN if [ "${UBUNTU_RELEASE}" = "18.04" ]; then add-apt-repository ppa:cybermax-dexter/sdl2-backport; fi && \
 RUN if [ "${UBUNTU_RELEASE}" = "18.04" ]; then add-apt-repository ppa:cybermax-dexter/sdl2-backport; fi && \
-    curl -fsSL -o /usr/share/keyrings/winehq-archive.key "https://dl.winehq.org/wine-builds/winehq.key" && \
+    mkdir -pm755 /etc/apt/keyrings && curl -fsSL -o /etc/apt/keyrings/winehq-archive.key "https://dl.winehq.org/wine-builds/winehq.key" && \
     curl -fsSL -o "/etc/apt/sources.list.d/winehq-$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2).sources" "https://dl.winehq.org/wine-builds/ubuntu/dists/$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2)/winehq-$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2).sources" && \
     curl -fsSL -o "/etc/apt/sources.list.d/winehq-$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2).sources" "https://dl.winehq.org/wine-builds/ubuntu/dists/$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2)/winehq-$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2).sources" && \
     add-apt-repository ppa:lutris-team/lutris && \
     add-apt-repository ppa:lutris-team/lutris && \
     apt-get update && apt-get install --install-recommends -y \
     apt-get update && apt-get install --install-recommends -y \
@@ -238,7 +240,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         libpangocairo-1.0-0 \
         libpangocairo-1.0-0 \
         libgirepository1.0-dev \
         libgirepository1.0-dev \
         libjpeg-dev \
         libjpeg-dev \
-        libvpx-dev \
         zlib1g-dev \
         zlib1g-dev \
         x264 && \
         x264 && \
     if [ "${UBUNTU_RELEASE}" \> "20.04" ]; then apt-get install --no-install-recommends -y xcvt; fi && \
     if [ "${UBUNTU_RELEASE}" \> "20.04" ]; then apt-get install --no-install-recommends -y xcvt; fi && \