From 42d33d36f392f0c49cda93467e64960cb2de1787 Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Mon, 15 Apr 2024 23:45:16 +0100
Subject: [PATCH] Merged linux-fresh and linux-appimage build envs

---
 linux-fresh/Dockerfile => Dockerfile | 20 +++++++-
 linux-appimage/Dockerfile            | 75 ----------------------------
 2 files changed, 18 insertions(+), 77 deletions(-)
 rename linux-fresh/Dockerfile => Dockerfile (50%)
 delete mode 100644 linux-appimage/Dockerfile

diff --git a/linux-fresh/Dockerfile b/Dockerfile
similarity index 50%
rename from linux-fresh/Dockerfile
rename to Dockerfile
index d48e687..7225f6b 100644
--- a/linux-fresh/Dockerfile
+++ b/Dockerfile
@@ -14,16 +14,24 @@ RUN apt-get install -y \
     clang-format-18 \
     cmake \
     curl \
+    file \
     git \
     lld \
-    llvm \
+    llvm-18 \
     ninja-build \
-    p7zip-full \
     python3-pip \
     software-properties-common \
     unzip \
     wget \
     zip \
+    # FFmpeg
+    ffmpeg \
+    libavcodec-dev \
+    libavdevice-dev \
+    libavfilter-dev \
+    libavformat-dev \
+    libswresample-dev \
+    libswscale-dev \
     # Qt 6
     qt6-base-dev \
     qt6-base-private-dev \
@@ -38,3 +46,11 @@ RUN apt-get install -y \
     glslang-tools \
     # Other libraries
     libsdl2-dev
+
+# Download tools for building AppImages
+RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt-x86_64.sh
+RUN chmod a+x linuxdeploy-x86_64.AppImage
+RUN chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
+RUN chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh
\ No newline at end of file
diff --git a/linux-appimage/Dockerfile b/linux-appimage/Dockerfile
deleted file mode 100644
index b7c3e4e..0000000
--- a/linux-appimage/Dockerfile
+++ /dev/null
@@ -1,75 +0,0 @@
-FROM ubuntu:20.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Create a user account lime (UID 1027) that the container will run as
-RUN useradd -m -u 1027 -s /bin/bash lime
-
-# Update system, install PPAs and install packages for building Lime3DS.
-RUN apt-get update && apt-get full-upgrade -y
-RUN apt-get install -y software-properties-common lsb-release
-RUN add-apt-repository -y ppa:savoury1/build-tools
-RUN add-apt-repository -y ppa:savoury1/display
-RUN add-apt-repository -y ppa:savoury1/ffmpeg4
-RUN add-apt-repository -y ppa:savoury1/gcc-defaults-11
-RUN add-apt-repository -y ppa:savoury1/llvm-defaults-13
-RUN add-apt-repository -y ppa:savoury1/qt-6-2
-RUN add-apt-repository -y ppa:theofficialgman/gpu-tools
-RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y
-RUN apt-get install -y \
-    build-essential \
-    libsdl2-dev \
-    libssl-dev \
-    gcc-11 \
-    g++-11 \
-    cpp-11 \
-# Qt 6
-    qt6-base-dev \
-    qt6-base-private-dev \
-    qt6-multimedia-dev \
-    qt6-l10n-tools \
-    qt6-tools-dev \
-    qt6-tools-dev-tools \
-    qt6-gtk-platformtheme \
-    qt6-documentation-tools \
-    qt6-wayland \
-# FFmpeg
-    ffmpeg \
-    libavcodec-dev \
-    libavdevice-dev \
-    libavfilter-dev \
-    libavformat-dev \
-    libswresample-dev \
-    libswscale-dev \
-# Tools
-    cmake \
-    p7zip-full \
-    wget \
-    unzip \
-    git \
-    ccache \
-    ninja-build \
-    glslang-dev \
-    glslang-tools \
-    file \
-# qt6gtk2 dependencies
-    gtk2.0
-    
-# Install LLVM 15
-RUN wget https://apt.llvm.org/llvm.sh
-RUN chmod +x llvm.sh
-RUN ./llvm.sh 15 all
-RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 150
-RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 150
-
-# Compile and install qt6gtk2
-RUN git clone --recursive https://github.com/trialuser02/qt6gtk2
-RUN cd qt6gtk2 && qmake6 && make && make install
-
-# Download tools for building AppImages
-RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
-RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt-x86_64.sh
-RUN chmod a+x linuxdeploy-x86_64.AppImage
-RUN chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
-RUN chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh