From 207671baf922e2168c987da0665d69079fae5ec4 Mon Sep 17 00:00:00 2001
From: lat9nq <lat9nq@gmail.com>
Date: Thu, 19 May 2022 23:37:16 -0400
Subject: [PATCH] fresh: Misceallaneous fixes

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.
---
 linux-fresh/Dockerfile                     | 18 ++++++++++++++++--
 linux-fresh/qtconcurrentthreadengine.patch |  7 +++++++
 linux-fresh/settings.yml                   |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 linux-fresh/qtconcurrentthreadengine.patch

diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile
index 2a7a748..d9acfd3 100644
--- a/linux-fresh/Dockerfile
+++ b/linux-fresh/Dockerfile
@@ -22,14 +22,18 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
     file \
     gpg-agent \
     libfile-mimeinfo-perl \
+    libglu1-mesa-dev \
+    libpulse-dev \
     libssl-dev \
     libtool \
     libudev-dev \
     libva-dev \
     libwayland-dev \
     libzip-dev \
+    mesa-common-dev \
     nasm \
     ninja-build \
+    pkg-config \
     python3-pip \
     python3-setuptools \
     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 && \
     apt-get update -y && \
     apt-get install --no-install-recommends -y \
-    clang-${CLANG_VER} && \
-    lld-${CLANG_VER} && \
+    clang-${CLANG_VER} \
+    lld-${CLANG_VER} \
+    llvm-${CLANG_VER} \
     llvm-${CLANG_VER}-linker-tools && \
     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 autoremove --yes && \
     rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
+
 # Install CMake from upstream
 # yuzu requires CMake version 3.15, however Ubuntu only provides 3.10 to Bionic.
 RUN cd /tmp && \
@@ -80,6 +86,7 @@ RUN cd /tmp && \
     tar xvf cmake-${CMAKE_VER}-Linux-x86_64.tar.gz && \
     cp -rv cmake-${CMAKE_VER}-Linux-x86_64/* /usr && \
     rm -rf cmake-*
+
 # Install Boost 1.75.0 from yuzu-emu/ext-linux-bin
 RUN cd /tmp && \
     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/ && \
     cp -rv boost_1_75_0/include boost_1_75_0/lib /usr && \
     rm -rf boost*
+    
 # Setup paths for Qt binaries
 ENV LD_LIBRARY_PATH=/opt/qt${QT_PKG_VER}/lib:${LD_LIBRARY_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
 COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml
diff --git a/linux-fresh/qtconcurrentthreadengine.patch b/linux-fresh/qtconcurrentthreadengine.patch
new file mode 100644
index 0000000..e861ca9
--- /dev/null
+++ b/linux-fresh/qtconcurrentthreadengine.patch
@@ -0,0 +1,7 @@
+250,251c250,251
+<     ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
+<     :ThreadEngineStarterBase<void>(_threadEngine) {}
+---
+>     ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
+>         : ThreadEngineStarterBase<void>(_threadEngine) {}
+
diff --git a/linux-fresh/settings.yml b/linux-fresh/settings.yml
index dec4fb8..720ae7a 100644
--- a/linux-fresh/settings.yml
+++ b/linux-fresh/settings.yml
@@ -87,7 +87,7 @@ compiler:
     clang:
         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",
-                  "8", "9", "10", "11", "12", "13"]
+                  "8", "9", "10", "11", "12", "13", "14"]
         libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static]
         cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
         runtime: [None, MD, MT, MTd, MDd]