From 91a9e4f66d6acdd52b0d81a0ec1a2d19059835b7 Mon Sep 17 00:00:00 2001
From: Neil Horne <neilh713@tpg.com.au>
Date: Fri, 10 Nov 2023 12:39:05 +1100
Subject: [PATCH] chore: Use Ubuntu 20.04 (focal), move to Qt 5.15.2,
 dependency updates (#16)

* Use Ubuntu 20.04 (focal), Qt 5.15.2 add extra qt dependencies for linuxdeploy

* Use Ubuntu 20.04 (focal), Qt 5.15.2 add extra qt dependencies for linuxdeploy

* Update dfu-util libusb and openssl dependencies

* Add back gstreamer deleted in error

* Change openssl root directory hint to libssl1
---
 dev/Dockerfile | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/dev/Dockerfile b/dev/Dockerfile
index c81c50d..afcc6a7 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -1,4 +1,4 @@
-ARG OS_CODENAME=bionic
+ARG OS_CODENAME=focal
 
 FROM ubuntu:${OS_CODENAME}
 
@@ -20,7 +20,7 @@ RUN apt-get update && \
         build-essential \
         dumb-init \
         libfox-1.6-dev python3-clang-10 \
-        libsdl1.2-dev libsdl2-dev \
+        libsdl2-dev \
         cmake \
         git \
         zip \
@@ -28,8 +28,13 @@ RUN apt-get update && \
         file \
         python3-pip \
         gawk \
-        # Install some dependencies required by Qt libs
-        libxkbcommon-x11-0 gstreamer1.0-plugins-base && \
+        # Install dfu-util and libusb
+        dfu-util \
+        # Install dependencies required by Qt libs
+        libssl-dev \
+        gstreamer1.0-plugins-base \
+        # linuxdeploy-plugin-qt requires libxcb1 and supporting libs
+        awesome && \
     rm -rf /var/lib/apt/lists/*
 
 RUN python3 -m pip install -U pip setuptools \
@@ -44,7 +49,7 @@ RUN python3 -m pip install -U pip setuptools \
 # see https://github.com/miurahr/aqtinstall/
 # see https://github.com/vslotman/docker-aqtinstall
 
-ARG QT_VERSION=5.12.9
+ARG QT_VERSION=5.15.2
 # if modules use syntax -m MODULE [MODULE]
 ARG QT_MODULES=
 # supported versions of dependencies
@@ -76,4 +81,8 @@ VOLUME ["/src"]
 
 ENV ASAN_OPTIONS="detect_leaks=0"
 
+# HINTS for cmake find_package
+ENV LIBUSB1_ROOT_DIR=/usr/lib/x86_64-linux-gnu
+ENV LIBSSL1_ROOT_DIR=/usr/lib/x86_64-linux-gnu
+
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]