Merge pull request #8 from jroweboy/master

Update build envs to ubuntu 20.04. Change mingw build env to arch

linux-clang-format/Dockerfile

@@ -1,5 +1,6 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER yuzu
-RUN useradd -m -s /bin/bash yuzu
+RUN useradd -m -s /bin/bash yuzu && \
-RUN apt-get update && apt-get -y full-upgrade
+    apt-get update && apt-get -y full-upgrade && \
-RUN apt-get install -y git clang-format-6.0
+    apt-get install -y git clang-format-6.0 && \
+    apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log

linux-fresh/Dockerfile

@@ -1,5 +1,19 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER yuzu
-RUN useradd -m -s /bin/bash yuzu
+RUN useradd -m -s /bin/bash yuzu && \
-RUN apt-get update && apt-get -y full-upgrade
+    DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade && \
-RUN apt-get install --no-install-recommends -y build-essential libsdl2-dev libssl-dev python qtbase5-dev qtwebengine5-dev libqt5opengl5-dev wget git ccache cmake ninja-build
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    build-essential \
+    libsdl2-dev \
+    libssl-dev \
+    python \
+    qtbase5-dev \
+    qtbase5-private-dev \
+    qtwebengine5-dev \
+    libqt5opengl5-dev \
+    wget \
+    git \
+    ccache \
+    cmake \
+    ninja-build && \
+    apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log

linux-mingw/Dockerfile

@@ -1,12 +1,41 @@
-FROM ubuntu:18.04
+FROM archlinux:latest
 MAINTAINER yuzu
-RUN useradd -m -s /bin/bash yuzu && mkdir -p /tmp/pkgs
+# Add mingw-repo "ownstuff" is a AUR with an up to date mingw64
-RUN apt-get update && apt-get install -y gpg wget git python3-pip python ccache p7zip-full g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake ninja-build
+RUN useradd -m -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
-# workaround broken headers in Ubuntu MinGW package
+    echo "[ownstuff]" >> /etc/pacman.conf && \
-COPY errno.h /usr/x86_64-w64-mingw32/include/
+    echo "SigLevel = Optional TrustAll" >> /etc/pacman.conf && \
-# add mingw-w64 auxiliary ppa repository
+    echo "Server = https://martchus.no-ip.biz/repo/arch/ownstuff/os/\$arch" >> /etc/pacman.conf && \
-RUN echo 'deb http://ppa.launchpad.net/tobydox/mingw-w64/ubuntu bionic main ' > /etc/apt/sources.list.d/extras.list
+    pacman -Syu --noconfirm && \
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv '72931B477E22FEFD47F8DECE02FE5F12ADDE29B2' && apt-get update
+    pacman -Syu --noconfirm && \
-RUN apt-get install -y sdl2-mingw-w64 qt5base-mingw-w64 qt5tools-mingw-w64 libsamplerate-mingw-w64 qt5multimedia-mingw-w64
+    pacman -S --needed --noconfirm --noprogressbar \
-COPY mingw-setup.sh /tmp/pkgs
+    base-devel \
-RUN cd /tmp/pkgs && bash -e mingw-setup.sh
+    gnupg \
+    wget \
+    git \
+    python-pip \
+    python \
+    ccache \
+    p7zip \
+    cmake \
+    ninja \
+    mingw-w64-gcc \
+    mingw-w64-tools \
+    mingw-w64-sdl2 \
+    mingw-w64-qt5-base \
+    mingw-w64-qt5-tools \
+    mingw-w64-qt5-graphicaleffects \
+    mingw-w64-qt5-multimedia \
+    mingw-w64-qt5-winextras \
+    python2 \
+    mingw-w64-opus \
+    mingw-w64-winpthreads && \
+    pacman -Scc --noconfirm && \
+    rm -rf /usr/share/man/ /tmp/ /var/tmp/
+
+COPY mingw-setup.sh /tmp/
+RUN cd /tmp/ && bash -e mingw-setup.sh
+# Compatibility with the old Ubuntu MingW image
+RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5
+
+# Cleanup
+USER root

linux-mingw/mingw-setup.sh

@@ -2,14 +2,6 @@
 # install pefile
 pip3 install pefile
 
-MINGW_URL='https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z/download'
-TARGET_DIR='mingw64/x86_64-w64-mingw32/lib/'
-
-echo 'Downloading MinGW replacement binaries...'
-wget -q "${MINGW_URL}" -O 'mingw.7z'
-7z x 'mingw.7z' "${TARGET_DIR}"lib{mf,mfplat,mfuuid}.a
-cp -rv "${TARGET_DIR}"/* '/usr/x86_64-w64-mingw32/lib/'
-
 # ffmpeg
 FFMPEG_VER='4.1'
 for i in 'shared' 'dev'; do

linux-transifex/Dockerfile

@@ -1,4 +1,10 @@
 FROM alpine
-RUN adduser -u 1000 -D -s /bin/bash yuzu
+MAINTAINER yuzu
-RUN apk update && apk add build-base cmake python3-dev qt5-qttools-dev qt5-qtmultimedia-dev
+RUN adduser -u 1000 -D -s /bin/bash yuzu && \
-RUN pip3 install transifex-client
+    apk update && apk add build-base && \
+    cmake \
+    python3-dev \
+    qt5-qttools-dev \
+    qt5-qtmultimedia-dev && \
+    pip3 install transifex-client && \
+    apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log/