More Ubuntu 20.04 fixes

png++/Makefile

@@ -1,17 +1,29 @@
 SHELL:=/bin/bash
 
-pngpp:
+pngpp-ubuntu1804:
 	wget http://download.savannah.nongnu.org/releases/pngpp/png++-0.2.9.tar.gz
 	tar -zxvf png++-0.2.9.tar.gz
-	make package
+	make package-ubuntu1804
 
-package:
+pngpp-ubuntu2004:
+	wget http://download.savannah.nongnu.org/releases/pngpp/png++-0.2.9.tar.gz
+	tar -zxvf png++-0.2.9.tar.gz
+	make package-ubuntu2004
+
+package-ubuntu1804:
 	rm -rf out
 	mkdir -p out/opt/cppse/build/png++
 	cp -prv png++-0.2.9/*  out/opt/cppse/build/png++/
 	rm -rf pngpp_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:18.04 fpm -v 1.1 -s dir -t deb -n pngpp --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "png++ - build dependency" --url "https://www.nongnu.org/pngpp/" --deb-generate-changes -C /src/out
 
+package-ubuntu2004:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/png++
+	cp -prv png++-0.2.9/*  out/opt/cppse/build/png++/
+	rm -rf pngpp_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n pngpp --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "png++ - build dependency" --url "https://www.nongnu.org/pngpp/" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf png++*
 	rm -rf png*.tar.gz

seasocks/Makefile

@@ -1,9 +1,14 @@
 SHELL:=/bin/bash
 
-seasocks_:
+ubuntu1804:
 	git clone https://github.com/rayburgemeestre/seasocks --branch v1.4.3
 	bash ../ubuntu1804.sh make impl
-	make package
+	make package-ubuntu1804
+
+ubuntu2004:
+	git clone https://github.com/rayburgemeestre/seasocks --branch v1.4.3
+	bash ../ubuntu2004.sh make impl
+	make package-ubuntu2004
 
 impl:
 	update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
@@ -18,13 +23,20 @@ impl:
 	make -j $$(nproc) && \
 	make install
 
-package:
+package-ubuntu1804:
 	rm -rf out
 	mkdir -p out/opt/cppse/build/seasocks
 	cp -prv seasocks/build/seasocks_out/* out/opt/cppse/build/seasocks/
 	rm -rf seasocks_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:18.04 fpm -v 1.1 -s dir -t deb -n seasocks --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "seasocks - build dependency" --url "https://github.com/mattgodbolt/seasocks" --deb-generate-changes -C /src/out
 
+package-ubuntu2004:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/seasocks
+	cp -prv seasocks/build/seasocks_out/* out/opt/cppse/build/seasocks/
+	rm -rf seasocks_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n seasocks --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "seasocks - build dependency" --url "https://github.com/mattgodbolt/seasocks" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf seasocks
 	rm -rf out

sfml/Makefile

@@ -1,10 +1,16 @@
 SHELL:=/bin/bash
 
-sfml:
+ubuntu1804:
 	git clone https://github.com/SFML/SFML.git
 	pushd SFML && git checkout 2.5.x #  && patch -p1 < ../patch.txt
 	bash ../ubuntu1804.sh make impl
-	make package
+	make package-ubuntu1804
+
+ubuntu2004:
+	git clone https://github.com/SFML/SFML.git
+	pushd SFML && git checkout 2.5.x #  && patch -p1 < ../patch.txt
+	bash ../ubuntu2004.sh make impl
+	make package-ubuntu2004
 
 impl:
 	# copy & paste from allegro5
@@ -28,13 +34,20 @@ impl:
 	make -j $$(nproc) && \
 	make install
 
-package:
+package-ubuntu1804:
 	rm -rf out
 	mkdir -p out/opt/cppse/build/sfml/
 	cp -prv SFML/sfml_static/* out/opt/cppse/build/sfml/
 	rm -rf sfml_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:18.04 fpm -v 1.1 -s dir -t deb -n sfml --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "SFML - build dependency" --url "https://github.com/SFML/SFML.git" --deb-generate-changes -C /src/out
 
+package-ubuntu2004:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/sfml/
+	cp -prv SFML/sfml_static/* out/opt/cppse/build/sfml/
+	rm -rf sfml_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n sfml --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "SFML - build dependency" --url "https://github.com/SFML/SFML.git" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf SFML
 	rm -rf out

ubuntu2004.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker run $FLAGS -t -v $PWD:$PWD --workdir $PWD rayburgemeestre/build-ubuntu:20.04 sh -c "$*"
+