From 63316f3e0a2e07e0a6d5a5f1be9afabe936b3730 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 9 May 2021 23:42:00 -0400
Subject: [PATCH 1/2] fresh: Remove Conan usage

Installing packages here does nothing: the container just re-downloads
them at CMake configure time. So skip installing them altogether.
---
 linux-fresh/Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile
index fc1b165..e1a7c10 100644
--- a/linux-fresh/Dockerfile
+++ b/linux-fresh/Dockerfile
@@ -89,6 +89,3 @@ ENV LD_LIBRARY_PATH=/opt/qt${QT_PKG_VER}/lib:${LD_LIBRARY_PATH}
 ENV PATH=/opt/qt${QT_PKG_VER}/bin:${PATH}
 USER 1027
 COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml
-RUN conan install catch2/2.13.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
-    conan install fmt/7.1.2@ -s compiler.libcxx=libstdc++11 --build=missing && \
-    conan install nlohmann_json/3.9.1@ -s compiler.libcxx=libstdc++11 --build=missing

From 3146cfd6597f5de57fd3aba7c886f4fbc6031991 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 9 May 2021 23:43:06 -0400
Subject: [PATCH 2/2] fresh: Add hidapi 0.10.1 from ext-linux-bin

libhidapi-dev from Bionic repositories is too old for our needs.
Download and install a binary package for hidapi manually from
yuzu-emu/ext-linux-bin.

This also adds a number of packages required to compile hidapi. Needed
for producing new hidapi packages in the future.
---
 linux-fresh/Dockerfile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile
index e1a7c10..b3aa435 100644
--- a/linux-fresh/Dockerfile
+++ b/linux-fresh/Dockerfile
@@ -13,6 +13,8 @@ ENV UBUNTU_VER=bionic
 RUN useradd -m -u 1027 -s /bin/bash yuzu && \
     apt-get update && apt-get -y full-upgrade && \
     apt-get install --no-install-recommends -y \
+    autoconf \
+    automake \
     build-essential \
     ccache \
     file \
@@ -21,6 +23,8 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
     liblz4-dev \
     libopus-dev \
     libssl-dev \
+    libtool \
+    libusb-1.0-0-dev \
     libzip-dev \
     libzstd-dev \
     nasm \
@@ -84,6 +88,13 @@ 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*
+# Install hidapi 0.10.1 from yuzu-emu/ext-linux-bin
+RUN cd /tmp && \
+    wget https://github.com/yuzu-emu/ext-linux-bin/raw/main/hidapi/hidapi_0_10_1.tar.xz &&\
+    tar xvf hidapi_0_10_1.tar.xz && \
+    chown -R root:root hidapi/ && \
+    cp -rv hidapi/include hidapi/lib hidapi/share /usr && \
+    rm -rf hidapi*
 # 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}