Merge pull request #34 from vitor-k/patch
Re-freeze linux-frozen and install qtbase5-private-dev
This commit is contained in:
commit
5796195306
@ -5,4 +5,22 @@ ENV DEBIAN_FRONTEND=noninteractive
|
||||
# Create a user account citra (UID 1027) that the container will run as
|
||||
RUN useradd -m -u 1027 -s /bin/bash citra
|
||||
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
|
||||
RUN apt-get install -y \
|
||||
p7zip-full \
|
||||
build-essential \
|
||||
libsdl2-dev \
|
||||
qtbase5-dev \
|
||||
qtbase5-private-dev \
|
||||
libqt5opengl5-dev \
|
||||
qtmultimedia5-dev \
|
||||
qttools5-dev \
|
||||
qttools5-dev-tools \
|
||||
libavcodec-dev \
|
||||
libavfilter-dev \
|
||||
libavformat-dev \
|
||||
libswscale-dev \
|
||||
wget \
|
||||
git \
|
||||
ccache \
|
||||
cmake \
|
||||
ninja-build
|
||||
|
@ -1,19 +1,20 @@
|
||||
FROM ubuntu:20.04
|
||||
FROM ubuntu:22.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 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
|
||||
libsdl2-dev 2.0.20+dfsg-2build1 jammy \
|
||||
qtbase5-dev 5.15.3+dfsg-2 jammy \
|
||||
qtbase5-private-dev 5.15.3+dfsg-2 jammy \
|
||||
libqt5opengl5-dev 5.15.3+dfsg-2 jammy \
|
||||
qt5-qmltooling-plugins 5.15.3+dfsg-1 jammy \
|
||||
qtdeclarative5-dev 5.15.3+dfsg-1 jammy \
|
||||
qtmultimedia5-dev 5.15.3-1 jammy \
|
||||
libicu70 70.1-2 jammy \
|
||||
cmake 3.22.1-1ubuntu1 jammy \
|
||||
libavcodec-dev 7:4.4.2-0ubuntu0.22.04.1 jammy \
|
||||
libavformat-dev 7:4.4.2-0ubuntu0.22.04.1 jammy \
|
||||
libswscale-dev 7:4.4.2-0ubuntu0.22.04.1 jammy
|
||||
RUN rm -rf /tmp/pkgs
|
||||
|
Loading…
x
Reference in New Issue
Block a user