Undo SDL patch, and introduce ubuntu 20.04 FPM build image

Dockerfile-ubuntu2004

@@ -0,0 +1,37 @@
+FROM ubuntu:20.04
+
+MAINTAINER Ray Burgemeestre
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get -y install g++ git sudo wget gnupg2 && \
+    apt-get -y install libssl-dev build-essential && \
+    apt-get -y install vim gdb strace && \
+    \
+    echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main >> /etc/apt/sources.list && \
+    echo deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main >> /etc/apt/sources.list && \
+    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - ; \
+    apt update -y && \
+    apt-get install -y clang-10 lldb-10 lld-10 && \
+    apt-get install -y libc++-10-dev libc++-10-dev clang-format-10 && \
+    \
+    rm -rf /var/lib/apt/lists/*
+
+# Install newer CMake to avoid some warnings the "FindBoost" script throws on
+#  more recent versions of boost that the system CMake doesn't now about.
+# I chose a bloody new boost, so I need to use the latest RC1 (at the time of writing)
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.18.0-rc1/cmake-3.18.0-rc1.tar.gz && \
+    tar -zxf cmake-3.18.0-rc1.tar.gz && \
+    cd cmake-3.18.0-rc1 && \
+    ./bootstrap && \
+    make -j $(nproc) && \
+    make install && \
+    cd .. && \
+    rm -rf cmake-3.18.0-rc1 && \
+    rm -rf cmake-3.18.0-rc1.tar.gz
+
+# Fix some weird linker issue CAF build runs into. (fails to link -lc++abi)
+RUN cp -prv /usr/lib/llvm-10/lib/libc++abi.so.1.0 /usr/lib/llvm-10/lib/libc++abi.so
+
+CMD "/bin/bash"

Makefile

@@ -8,5 +8,14 @@ ubuntu1804nocache:
 ubuntu1804publish:
 	docker push rayburgemeestre/build-ubuntu:18.04
 
+ubuntu2004:
+	docker build . -f Dockerfile-ubuntu2004 -t rayburgemeestre/build-ubuntu:20.04
+
+ubuntu2004nocache:
+	docker build . -f Dockerfile-ubuntu2004 -t rayburgemeestre/build-ubuntu:20.04 --no-cache
+
+ubuntu2004publish:
+	docker push rayburgemeestre/build-ubuntu:20.04
+
 shell:
 	docker run -it -v $$PWD:$$PWD --workdir $$PWD rayburgemeestre/build-ubuntu:18.04 /bin/bash

fpm/Dockerfile-ubuntu2004

@@ -0,0 +1,20 @@
+FROM ubuntu:20:04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN set -x \
+	&& apt-get update && apt-get install -y --no-install-recommends \
+		ruby \
+		ruby-dev \
+		gcc \
+		g++ \
+		make \
+		ca-certificates \
+		libffi-dev \
+		ruby-ffi \
+	&& gem install fpm \
+	&& mkdir /src/
+
+WORKDIR /src/
+
+CMD /usr/local/bin/fpm

fpm/Makefile

@@ -2,7 +2,14 @@ SHELL:=/bin/bash
 
 ubuntu1804fpm:
 	docker pull rayburgemeestre/fpm-ubuntu:18.04 || true
-	docker build . -f Dockerfile -t rayburgemeestre/fpm-ubuntu:18.04
+	docker build . -f Dockerfile-ubuntu1804 -t rayburgemeestre/fpm-ubuntu:18.04
 
-publish:
+ubuntu2004fpm:
+	docker pull rayburgemeestre/fpm-ubuntu:18.04 || true
+	docker build . -f Dockerfile-ubuntu2004 -t rayburgemeestre/fpm-ubuntu:20.04
+
+publish1804:
 	docker push rayburgemeestre/fpm-ubuntu:18.04
+
+publish2004:
+	docker push rayburgemeestre/fpm-ubuntu:20.04

sfml/Makefile

@@ -2,7 +2,7 @@ SHELL:=/bin/bash
 
 sfml:
 	git clone https://github.com/SFML/SFML.git
-	pushd SFML && git checkout 2.5.x && patch -p1 < ../patch.txt
+	pushd SFML && git checkout 2.5.x #  && patch -p1 < ../patch.txt
 	bash ../ubuntu1804.sh make impl
 	make package