From b07890cd8dc76a0dde43cd244a6329ff611ff1aa Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Wed, 5 Oct 2022 18:18:12 -0300 Subject: [PATCH 1/2] linux-fresh: install qtbase5-private-dev --- linux-fresh/Dockerfile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index a4e6130..89c1431 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -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 From 8531c03ea5652cc3353ea3728fdb26116aacfbda Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Wed, 5 Oct 2022 18:18:35 -0300 Subject: [PATCH 2/2] linux-frozen: re-freeze with ubuntu 22.04 --- linux-frozen/Dockerfile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index 043beaf..02821ee 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -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