yuzu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments.git synced 2024-12-22 20:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fresh: Misceallaneous fixes

Browse source 
Adds packages needed for Qt development, fixes Clang package typos,
patches Qt build error.

fresh: Add llvm-14 and libpulse-dev

Needed for lld and audio support, respectively.
This commit is contained in:
lat9nq 2022-05-19 23:37:16 -04:00
parent bc8a489473
commit 207671baf9
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
linux-fresh/Dockerfile
View file

@ -22,14 +22,18 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
file \ file \
gpg-agent \ gpg-agent \
libfile-mimeinfo-perl \ libfile-mimeinfo-perl \
libglu1-mesa-dev \
libpulse-dev \
libssl-dev \ libssl-dev \
libtool \ libtool \
libudev-dev \ libudev-dev \
libva-dev \ libva-dev \
libwayland-dev \ libwayland-dev \
libzip-dev \ libzip-dev \
mesa-common-dev \
nasm \ nasm \
ninja-build \ ninja-build \
pkg-config \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
software-properties-common \ software-properties-common \
@ -64,8 +68,9 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
echo "deb http://apt.llvm.org/${UBUNTU_VER}/ llvm-toolchain-${UBUNTU_VER}-${CLANG_VER} main" >> /etc/apt/sources.list && \ echo "deb http://apt.llvm.org/${UBUNTU_VER}/ llvm-toolchain-${UBUNTU_VER}-${CLANG_VER} main" >> /etc/apt/sources.list && \
apt-get update -y && \ apt-get update -y && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
clang-${CLANG_VER} && \ clang-${CLANG_VER} \
lld-${CLANG_VER} && \ lld-${CLANG_VER} \
llvm-${CLANG_VER} \
llvm-${CLANG_VER}-linker-tools && \ llvm-${CLANG_VER}-linker-tools && \
ln -s $(which clang-${CLANG_VER}) /usr/bin/clang && \ ln -s $(which clang-${CLANG_VER}) /usr/bin/clang && \
ln -s $(which clang++-${CLANG_VER}) /usr/bin/clang++ && \ ln -s $(which clang++-${CLANG_VER}) /usr/bin/clang++ && \
@ -73,6 +78,7 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
apt-get clean autoclean && \ apt-get clean autoclean && \
apt-get autoremove --yes && \ apt-get autoremove --yes && \
rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
# Install CMake from upstream # Install CMake from upstream
# yuzu requires CMake version 3.15, however Ubuntu only provides 3.10 to Bionic. # yuzu requires CMake version 3.15, however Ubuntu only provides 3.10 to Bionic.
RUN cd /tmp && \ RUN cd /tmp && \
@ -80,6 +86,7 @@ RUN cd /tmp && \
tar xvf cmake-${CMAKE_VER}-Linux-x86_64.tar.gz && \ tar xvf cmake-${CMAKE_VER}-Linux-x86_64.tar.gz && \
cp -rv cmake-${CMAKE_VER}-Linux-x86_64/* /usr && \ cp -rv cmake-${CMAKE_VER}-Linux-x86_64/* /usr && \
rm -rf cmake-* rm -rf cmake-*
# Install Boost 1.75.0 from yuzu-emu/ext-linux-bin # Install Boost 1.75.0 from yuzu-emu/ext-linux-bin
RUN cd /tmp && \ RUN cd /tmp && \
wget https://github.com/yuzu-emu/ext-linux-bin/raw/main/boost/boost_1_75_0.tar.xz &&\ wget https://github.com/yuzu-emu/ext-linux-bin/raw/main/boost/boost_1_75_0.tar.xz &&\
@ -87,8 +94,15 @@ RUN cd /tmp && \
chown -R root:root boost_1_75_0/ && \ chown -R root:root boost_1_75_0/ && \
cp -rv boost_1_75_0/include boost_1_75_0/lib /usr && \ cp -rv boost_1_75_0/include boost_1_75_0/lib /usr && \
rm -rf boost* rm -rf boost*
# Setup paths for Qt binaries # Setup paths for Qt binaries
ENV LD_LIBRARY_PATH=/opt/qt${QT_PKG_VER}/lib:${LD_LIBRARY_PATH} ENV LD_LIBRARY_PATH=/opt/qt${QT_PKG_VER}/lib:${LD_LIBRARY_PATH}
ENV PATH=/opt/qt${QT_PKG_VER}/bin:${PATH} ENV PATH=/opt/qt${QT_PKG_VER}/bin:${PATH}
# Fix GCC 11 <-> Qt 5.15 issue
COPY qtconcurrentthreadengine.patch /opt/qt515/qtconcurrentthreadengine.patch
RUN patch /opt/qt515/include/QtConcurrent/qtconcurrentthreadengine.h /opt/qt515/qtconcurrentthreadengine.patch && \
rm /opt/qt515/qtconcurrentthreadengine.patch
USER 1027 USER 1027
COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml

7
linux-fresh/qtconcurrentthreadengine.patch Normal file
View file

@ -0,0 +1,7 @@
250,251c250,251
< ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
< :ThreadEngineStarterBase<void>(_threadEngine) {}
---
> ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
> : ThreadEngineStarterBase<void>(_threadEngine) {}

2
linux-fresh/settings.yml
View file

@ -87,7 +87,7 @@ compiler:
clang: clang:
version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0", version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
"5.0", "6.0", "7.0", "7.1", "5.0", "6.0", "7.0", "7.1",
"8", "9", "10", "11", "12", "13"] "8", "9", "10", "11", "12", "13", "14"]
libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static] libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static]
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
runtime: [None, MD, MT, MTd, MDd] runtime: [None, MD, MT, MTd, MDd]