Merge branch 'master' into clang-name

This commit is contained in:
Tobias 2020-08-28 16:13:52 +02:00 committed by GitHub
commit b6c937a0de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 22 deletions

View File

@ -1,4 +1,5 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y git clang-format-10 p7zip-full

View File

@ -1,5 +1,6 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y p7zip-full wget git flatpak flatpak-builder ca-certificates sshfs curl fuse dnsutils gnupg2 sudo
RUN flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo

View File

@ -1,4 +1,5 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools libavcodec-dev libavfilter-dev libavformat-dev libswscale-dev wget git ccache cmake ninja-build

View File

@ -1,18 +1,19 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive
RUN mkdir -p /tmp/pkgs
COPY install_package.py /tmp/pkgs
RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python-launchpadlib ccache ninja-build
RUN cd /tmp/pkgs && python2 install_package.py \
libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \
qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \
libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \
qt5-qmltooling-plugins 5.9.3-0ubuntu1 bionic \
qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \
qtmultimedia5-dev 5.9.3-0ubuntu3 bionic \
libicu57 57.1-6ubuntu0.2 bionic \
cmake 3.10.2-1ubuntu2 bionic \
libavcodec-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \
libavformat-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \
libswscale-dev 7:3.4.4-0ubuntu0.18.04.1 bionic
RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python3-launchpadlib ccache ninja-build
RUN cd /tmp/pkgs && python3 install_package.py \
libsdl2-dev 2.0.10+dfsg1-3 focal \
qtbase5-dev 5.12.8+dfsg-0ubuntu1 focal \
libqt5opengl5-dev 5.12.8+dfsg-0ubuntu1 focal \
qt5-qmltooling-plugins 5.12.8-0ubuntu1 focal \
qtdeclarative5-dev 5.12.8-0ubuntu1 focal \
qtmultimedia5-dev 5.12.8-0ubuntu1 focal \
libicu66 66.1-2ubuntu2 focal \
cmake 3.16.3-1ubuntu1 focal \
libavcodec-dev 7:4.2.4-1ubuntu0.1 focal \
libavformat-dev 7:4.2.4-1ubuntu0.1 focal \
libswscale-dev 7:4.2.4-1ubuntu0.1 focal
RUN rm -rf /tmp/pkgs

View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
import sys
import re
@ -27,8 +27,8 @@ def get_url(pkg, distro):
def list_dependencies(deb_file):
t = subprocess.check_output(
['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\: \K.*$") || true'.format(deb_file)])
deps = [i.split('|')[0].strip() for i in t.split(',')]
['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\\: \\K.*$") || true'.format(deb_file)])
deps = [i.split(b'|')[0].decode('utf-8').strip() for i in t.split(b',')]
equals_re = re.compile(r'^(.*) \(= (.*)\)$')
return [equals_re.sub(r'\1=\2', i).split('=') for i in filter(equals_re.match, deps)]

View File

@ -1,5 +1,6 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive
RUN mkdir -p /tmp/pkgs
RUN apt-get update && apt-get install -y gpg wget git python3-pip ccache p7zip-full g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake ninja-build
# workaround broken headers in Ubuntu MinGW package

View File

@ -1,5 +1,6 @@
FROM debian:buster-slim
LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y p7zip-full libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pip cmake
RUN apt-get install -y git p7zip-full libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pip cmake
RUN pip3 install transifex-client