From 4f607a3bccd663e5faed14b7426e503476a2480b Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Thu, 16 Apr 2020 15:59:32 +0200
Subject: [PATCH] Update snapshot build to use Ubuntu 18.04 LTS

Ubuntu 16.04 would provide better distro compatibility, but we need SDL
in version 2.0.5 or newer to enable resizable window support on Linux.

Pretty soon Ubuntu 20.04 LTS will be released, so targetting previous
LTS release should be enough.
---
 .github/workflows/linux.yml | 9 ++++++---
 README.md                   | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d0c76430..b358dbaa 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -64,13 +64,13 @@ jobs:
 
   build_linux_release_dynamic:
     name: Release build (dynamic)
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     if: github.event_name != 'pull_request' || contains('dreamer,kcgen,ant-222', github.actor) == false
     steps:
       - uses: actions/checkout@v1
       - run:  sudo apt-get update
       - name: Install C++ compiler and libraries
-        run:  sudo apt-get install -y tree libpng16-dev librsvg2-bin $(./scripts/list-build-dependencies.sh -m apt -c gcc)
+        run:  sudo apt-get install -y tree libpng-dev librsvg2-bin $(./scripts/list-build-dependencies.sh -m apt -c gcc)
       - name:  Prepare compiler cache
         id:    prep-ccache
         shell: bash
@@ -109,7 +109,10 @@ jobs:
         run: |
           set -x
           ./autogen.sh
-          ./configure CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" LDFLAGS="$FLAGS $LINKFLAGS -flto=$(nproc)" --disable-screenshots
+          ./configure \
+              CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" \
+              LDFLAGS="$FLAGS $LINKFLAGS -flto=$(nproc)" \
+              --enable-png-static
           make -j "$(nproc)"
           strip src/dosbox
       - name: Package
diff --git a/README.md b/README.md
index c1d6e49f..ca710157 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ packages installed via your package manager.
 
     sudo dnf install SDL2 SDL2_net opusfile
 
-#### Debian, Ubuntu
+#### Debian (10 or newer), Ubuntu (18.04 LTS or newer)
 
     sudo apt install libsdl2-2.0 libsdl2-net-2.0 libopusfile0
 
@@ -97,6 +97,7 @@ packages installed via your package manager.
 
     sudo pacman -S sdl2 sdl2_net opusfile
 
+
 ### [Windows]
 
 A dosbox.exe file in a snapshot package is not signed, therefore Windows 10