Add Ubuntu 22.04 build targets in Makefiles everywhere

allegro5/Makefile

@@ -17,6 +17,15 @@ ubuntu2004:
 	make package_sdl-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	git clone https://github.com/liballeg/allegro5.git
+	pushd allegro5 && git checkout 5.2.5.0
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh make impl_sdl
+	make package_sdl-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 prep:
 	apt-get update
 	apt-get install -y freeglut3-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev \
@@ -90,6 +99,19 @@ package-ubuntu2004:
 	rm -rf allegro5_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n allegro5 --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "allegro5 - build dependency" --url "https://github.com/liballeg/allegro5.git" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/allegro5/
+	cp -prv allegro5/allegro5_static/* out/opt/cppse/build/allegro5/
+	# with one exception I'm relying on internals of allegro5 for one file..
+	cp -prv allegro5/include/allegro5/internal/aintern_bitmap.h out/opt/cppse/build/allegro5/include/allegro5/internal/aintern_bitmap.h
+	# since above file also includes others, let's just sync the entire internal dir
+	cp -prv allegro5/include/allegro5/internal/* out/opt/cppse/build/allegro5/include/allegro5/internal/
+	# somewhere also platform became needed, let's pull those in as well
+	cp -prv allegro5/include/allegro5/platform/* out/opt/cppse/build/allegro5/include/allegro5/platform/
+	rm -rf allegro5_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n allegro5 --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "allegro5 - build dependency" --url "https://github.com/liballeg/allegro5.git" --deb-generate-changes -C /src/out
+
 package_sdl-ubuntu2004:
 	rm -rf out
 	mkdir -p out/opt/cppse/build/allegro5sdl/
@@ -100,6 +122,16 @@ package_sdl-ubuntu2004:
 	rm -rf allegro5sdl_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n allegro5sdl --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "allegro5 - SDL version - build dependency" --url "https://github.com/liballeg/allegro5.git" --deb-generate-changes -C /src/out
 
+package_sdl-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/allegro5sdl/
+	cp -prv allegro5/allegro5_static/* out/opt/cppse/build/allegro5sdl/
+	cp -prv allegro5/include/allegro5/internal/aintern_bitmap.h out/opt/cppse/build/allegro5sdl/include/allegro5/internal/aintern_bitmap.h
+	cp -prv allegro5/include/allegro5/internal/* out/opt/cppse/build/allegro5sdl/include/allegro5/internal/
+	cp -prv allegro5/include/allegro5/platform/* out/opt/cppse/build/allegro5sdl/include/allegro5/platform/
+	rm -rf allegro5sdl_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n allegro5sdl --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "allegro5 - SDL version - build dependency" --url "https://github.com/liballeg/allegro5.git" --deb-generate-changes -C /src/out
+
 
 clean:
 	rm -rf allegro5

apt-publisher/Makefile

@@ -15,6 +15,13 @@ apt-ubuntu2004:
 	make update-packages-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+apt-ubuntu2204:
+	wget $$SECRET_URL 1>/dev/null 2>/dev/null
+	tar -zxvf *secret.tar.gz
+	make prepare-packages-ubuntu2204
+	make update-packages-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 prepare-packages-ubuntu1804:
 	mkdir -p packages
 	cp -prv ffmpeg/pkg/*.deb \
@@ -57,12 +64,34 @@ prepare-packages-ubuntu2004:
 	        msxsaver/pkg/*.deb \
 	            packages/
 
+prepare-packages-ubuntu2204:
+	mkdir -p packages
+	cp -prv ffmpeg/pkg/*.deb \
+	        v8pp/pkg/*.deb \
+	        allegro5/pkg/*.deb \
+	        sfml/pkg/*.deb \
+	        boost/pkg/*.deb \
+	        fastpfor/pkg/*.deb \
+	        seasocks/pkg/*.deb \
+	        fmt/pkg/*.deb \
+	        openexr/pkg/*.deb \
+	        imagemagick/pkg/*.deb \
+	        pngpp/pkg/*.deb \
+	        tvision/pkg/*.deb \
+	        vivid/pkg/*.deb \
+	        inotify-cpp/pkg/*.deb \
+	        msxsaver/pkg/*.deb \
+	            packages/
+
 docker-ubuntu1804:
 	docker build . -t rayburgemeestre/apt-ubuntu:18.04 -f Dockerfile-ubuntu1804
 
 docker-ubuntu2004:
 	docker build . -t rayburgemeestre/apt-ubuntu:20.04 -f Dockerfile-ubuntu2004
 
+docker-ubuntu2204:
+	docker build . -t rayburgemeestre/apt-ubuntu:22.04 -f Dockerfile-ubuntu2204
+
 run-initialize-once:
 	echo Please refer to README. Initial steps were done once manually and tar of artifacts was zipped.
 	# mkdir -p repo gnupg keys
@@ -95,6 +124,21 @@ update-packages-ubuntu2004:
 	# NOTE: troubles with this shizzle? remove /mnt2/NAS/kube/cppse.nl/cppse.nl/repo
 	#       and also remove work dir in go-agent: rm -rf /var/lib/go-agent/pipelines/apt-publisher-ubuntu2004
 
+update-packages-ubuntu2204:
+	docker pull rayburgemeestre/apt-ubuntu:22.04
+	docker run -t -v $$PWD:$$PWD -v $$PWD/gnupg:/root/.gnupg -v $$PWD/repo:/repo --workdir $$PWD rayburgemeestre/apt-ubuntu:22.04 /bin/sh -c "reprepro -b /repo includedeb focal packages/*.deb"
+	docker run -t -v $$PWD:$$PWD -v $$PWD/gnupg:/root/.gnupg -v $$PWD/repo:/repo --workdir $$PWD rayburgemeestre/apt-ubuntu:22.04 /bin/sh -c "reprepro -b /repo list focal"
+	# echo produce artifact for debugging
+	tar -czf repo.tar.gz repo
+	# rsync to host
+	echo if the rsync fails, then double check if the ssh key is accepted in authorized_hosts
+	echo check https://ci.cppse.nl/go/admin/pipelines/apt-publisher-ubuntu2204/stages/publisher/job/make/environment_variables
+	echo then probably you need to rm -rf /mnt2/NAS/kube/cppse.nl/cppse.nl/repo
+	echo then probably you need to rm -rf /var/lib/go-agent/pipelines/apt-publisher-ubuntu2204
+	rsync --delete -raPv -e "$$SYNC_CMD_SSH" repo $$SYNC_CMD_DEST
+	# NOTE: troubles with this shizzle? remove /mnt2/NAS/kube/cppse.nl/cppse.nl/repo
+	#       and also remove work dir in go-agent: rm -rf /var/lib/go-agent/pipelines/apt-publisher-ubuntu2204
+
 shell-ubuntu1804:
 	docker pull rayburgemeestre/apt-ubuntu:18.04
 	docker run -i -t -v $$PWD:$$PWD -v $$PWD/gnupg:/root/.gnupg -v $$PWD/repo:/repo --workdir $$PWD rayburgemeestre/apt-ubuntu:18.04 /bin/bash
@@ -103,5 +147,9 @@ shell-ubuntu2004:
 	docker pull rayburgemeestre/apt-ubuntu:20.04
 	docker run -i -t -v $$PWD:$$PWD -v $$PWD/gnupg:/root/.gnupg -v $$PWD/repo:/repo --workdir $$PWD rayburgemeestre/apt-ubuntu:20.04 /bin/bash
 
+shell-ubuntu2204:
+	docker pull rayburgemeestre/apt-ubuntu:22.04
+	docker run -i -t -v $$PWD:$$PWD -v $$PWD/gnupg:/root/.gnupg -v $$PWD/repo:/repo --workdir $$PWD rayburgemeestre/apt-ubuntu:22.04 /bin/bash
+
 clean-all:
 	rm -rf repo gnupg keys

boost/Makefile

@@ -14,6 +14,12 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R
 
+ubuntu2204:
+	git clone --branch boost-1.73.0 --recursive https://github.com/boostorg/boost
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R
+
 impl:
 	switch-to-latest-clang
 	pushd boost && \
@@ -77,6 +83,14 @@ package-ubuntu2004:
 	rm -rf boost_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n boost --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "boost - build dependency" --url "https://github.com/liballeg/boost.git" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/boost/include/
+	cp -L -prv boost/stage/lib out/opt/cppse/build/boost/
+	cp -L -prv boost/boost out/opt/cppse/build/boost/include/
+	rm -rf boost_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n boost --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "boost - build dependency" --url "https://github.com/liballeg/boost.git" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf boost
 	rm -rf out

fastpfor/Makefile

@@ -14,6 +14,13 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	git clone https://github.com/rayburgemeestre/FastPFor
+	pushd FastPFor && git checkout change-google-test-branch # master at the time of writing
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 impl:
 	patch FastPFor/CMakeLists.txt libcpp.patch
 	switch-to-latest-clang
@@ -39,6 +46,15 @@ package-ubuntu2004:
 	rm -rf fastpfor_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n fastpfor --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "fastpfor - build dependency" --url "https://github.com/rayburgemeestre/FastPFor" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/fastpfor/lib
+	mkdir -p out/opt/cppse/build/fastpfor/include
+	cp -prv ./FastPFor/libFastPFOR.a out/opt/cppse/build/fastpfor/lib/
+	cp -prv ./FastPFor/headers out/opt/cppse/build/fastpfor/include/
+	rm -rf fastpfor_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n fastpfor --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "fastpfor - build dependency" --url "https://github.com/rayburgemeestre/FastPFor" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf FastPFor
 	rm -rf out

ffmpeg/Makefile

@@ -23,6 +23,17 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	# sometimes got 404 on videolan/x264
+	#git clone https://code.videolan.org/videolan/x264
+	#git clone git://source.ffmpeg.org/ffmpeg.git
+	git clone https://github.com/rayburgemeestre/x264
+	git clone https://github.com/rayburgemeestre/ffmpeg
+
+	bash ../ubuntu2204.sh make ffmpeg_impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 ffmpeg_impl:
 	apt-get update
 	sudo apt-get install -y yasm
@@ -72,6 +83,15 @@ package-ubuntu2004:
 	rm -rf cppseffmpeg_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n cppseffmpeg --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "ffmpeg - build dependency" --url "https://gitea.cppse.nl/rayburgemeestre/build-config/src/branch/master/ffmpeg" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/x264
+	mkdir -p out/opt/cppse/build/ffmpeg
+	cp -prv ./x264_out/* out/opt/cppse/build/x264/
+	cp -prv ./ffmpeg_out/* out/opt/cppse/build/ffmpeg/
+	rm -rf cppseffmpeg_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n cppseffmpeg --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "ffmpeg - build dependency" --url "https://gitea.cppse.nl/rayburgemeestre/build-config/src/branch/master/ffmpeg" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf x264
 	rm -rf ffmpeg

fmt/Makefile

@@ -7,6 +7,13 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	git clone https://github.com/rayburgemeestre/fmt --branch 7.1.3
+	bash ../ubuntu2204.sh make impl
+	bash ../ubuntu2204.sh make impl-emscripten
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 impl:
 	switch-to-latest-clang
 	apt-get update && apt-get install libz-dev -y && \
@@ -33,6 +40,14 @@ package-ubuntu2004:
 	rm -rf fmt_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n fmt --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "fmt - build dependency" --url "https://github.com/mattgodbolt/fmt" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/fmt
+	cp -prv fmt/build/fmt_out/* out/opt/cppse/build/fmt/
+	cp -prv fmt/build2/fmt_out/lib/libfmt.a out/opt/cppse/build/fmt/lib/libfmt-em.a
+	rm -rf fmt_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n fmt --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "fmt - build dependency" --url "https://github.com/mattgodbolt/fmt" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf fmt
 	rm -rf out

imagemagick/Makefile

@@ -6,6 +6,12 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	git clone --branch 7.0.10-53 https://github.com/ImageMagick/ImageMagick || true
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 impl:
 	switch-to-latest-clang
 	apt-get update && apt-get install libz-dev autoconf -y && \
@@ -24,6 +30,13 @@ package-ubuntu2004:
 	rm -rf cppseimagemagick_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n cppseimagemagick --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "imagemagick - build dependency" --url "https://github.com/ImageMagick/ImageMagick" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/imagemagick
+	cp -prv ImageMagick/imagemagick_out/* out/opt/cppse/build/imagemagick/
+	rm -rf cppseimagemagick_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n cppseimagemagick --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "imagemagick - build dependency" --url "https://github.com/ImageMagick/ImageMagick" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf ImageMagick
 	rm -rf out

inotify-cpp/Makefile

@@ -9,6 +9,15 @@ ubuntu2004:
 	bash ../ubuntu2004.sh make impl
 	make package-ubuntu2004
 
+ubuntu2204:
+	# check out revision that is master at the time of writing
+	git clone https://github.com/erikzenker/inotify-cpp || true
+	pushd inotify-cpp && \
+	git checkout 1a4413637a08f6303526a2be140806f5abaaffd5 && \
+	popd && \
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+
 impl:
 	dpkg -i boost/pkg/*.deb
 	pushd inotify-cpp && \
@@ -23,6 +32,13 @@ package-ubuntu2004:
 	rm -rf cppse_inotify-cpp_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n inotify-cpp --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "inotify-cpp - build dependency" --url "https://github.com/erikzenker/inotify-cpp" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/inotify-cpp
+	cp -prv inotify-cpp_out/* out/opt/cppse/build/inotify-cpp/
+	rm -rf cppse_inotify-cpp_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n inotify-cpp --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "inotify-cpp - build dependency" --url "https://github.com/erikzenker/inotify-cpp" --deb-generate-changes -C /src/out
+
 clean:
 	sudo rm -rf inotify-cpp*
 	sudo rm -rf out

openexr/Makefile

@@ -6,6 +6,12 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	git clone --branch v2.5.2 https://github.com/AcademySoftwareFoundation/openexr || true
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 impl:
 	switch-to-latest-clang
 	apt-get update && apt-get install libz-dev -y && \
@@ -28,6 +34,14 @@ package-ubuntu2004:
 	rm -rf cppseopenexr_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n cppseopenexr --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "openexr - build dependency" --url "https://github.com/AcademySoftwareFoundation/openexr" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/openexr
+	cp -prv openexr/build/openexr_out/* out/opt/cppse/build/openexr/
+	cp -prv openexr/build2/openexr_out/lib/* out/opt/cppse/build/openexr/lib/
+	rm -rf cppseopenexr_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n cppseopenexr --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "openexr - build dependency" --url "https://github.com/AcademySoftwareFoundation/openexr" --deb-generate-changes -C /src/out
+
 clean:
 	rm -rf openexr
 	rm -rf out

png++/Makefile

@@ -10,6 +10,11 @@ ubuntu2004:
 	tar -zxvf png++-0.2.10.tar.gz
 	make package-ubuntu2004
 
+ubuntu2204:
+	wget http://download.savannah.nongnu.org/releases/pngpp/png++-0.2.10.tar.gz
+	tar -zxvf png++-0.2.10.tar.gz
+	make package-ubuntu2204
+
 package-ubuntu1804:
 	rm -rf out
 	mkdir -p out/opt/cppse/build/png++
@@ -17,12 +22,12 @@ package-ubuntu1804:
 	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:
+package-ubuntu2204:
 	rm -rf out
 	mkdir -p out/opt/cppse/build/png++
 	cp -prv png++-0.2.10/*  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
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.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++*

seasocks/Makefile

@@ -11,6 +11,12 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	git clone https://github.com/rayburgemeestre/seasocks --branch v1.4.3
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 impl:
 	switch-to-latest-clang
 	apt-get update && apt-get install libz-dev -y && \
@@ -34,6 +40,13 @@ package-ubuntu2004:
 	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
 
+package-ubuntu2204:
+	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:22.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,5 +1,11 @@
 SHELL:=/bin/bash
 
+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-ubuntu1804
+
 ubuntu2004:
 	git clone https://github.com/SFML/SFML.git
 	pushd SFML && git checkout 2.5.x #  && patch -p1 < ../patch.txt
@@ -7,11 +13,12 @@ ubuntu2004:
 	make package-ubuntu2004
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
-ubuntu1804:
+ubuntu2204:
 	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-ubuntu1804
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
 impl:
 	# copy & paste from allegro5
@@ -44,6 +51,13 @@ package-ubuntu2004:
 	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
 
+package-ubuntu2204:
+	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:22.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

tvision/Makefile

@@ -9,6 +9,15 @@ ubuntu2004:
 	bash ../ubuntu2004.sh make impl
 	make package-ubuntu2004
 
+ubuntu2204:
+	# check out revision that is master at the time of writing
+	git clone https://github.com/magiblot/tvision || true
+	pushd tvision && \
+	git checkout 638f963fe4f6c84854f60f1e9c5772bf6603e4b2 && \
+	popd && \
+	bash ../ubuntu2204.sh make impl
+	make package-ubuntu2204
+
 impl:
 	pushd tvision && \
 	cmake . -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$$PWD/../tvision_out && \
@@ -24,6 +33,13 @@ package-ubuntu2004:
 	rm -rf cppse_tvision_*_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n cppse-tvision --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "tvision - build dependency" --url "https://github.com/magiblot/tvision" --deb-generate-changes -C /src/out
 
+package-ubuntu2204:
+	rm -rf out
+	mkdir -p out/opt/cppse/build/tvision
+	cp -prv tvision_out/*  out/opt/cppse/build/tvision/
+	rm -rf cppse_tvision_*_amd64.deb
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n cppse-tvision --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "tvision - build dependency" --url "https://github.com/magiblot/tvision" --deb-generate-changes -C /src/out
+
 clean:
 	sudo rm -rf tvision*
 	sudo rm -rf out

v8pp/Makefile

@@ -29,6 +29,20 @@ ubuntu2004:
 	make fpm_package
 	bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
 
+ubuntu2204:
+	# git clone https://github.com/rayburgemeestre/v8pp
+	#
+	git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git || true
+	# will be factored out at some point
+	git clone https://github.com/pmed/v8pp || true
+	pushd v8pp && git checkout d62a0d581fd4ab05beb8a675216a12c72a5077c8  # master at time of writing
+	bash ../ubuntu2204.sh make build
+	bash ../ubuntu2204.sh make archive  # outside container not enough permissions
+	bash ../ubuntu2204.sh make package  # outside container not enough permissions
+	# also packages v8pp for now
+	make fpm_package
+	bash ../ubuntu2204.sh chown $$(id -u):$$(id -g) . -R  # fix permissions
+
 build:
 	switch-to-latest-clang
 	apt-get update
@@ -70,7 +84,7 @@ package:
 	cp -prv v8/include out/opt/cppse/build/v8pp/include/v8
 
 fpm_package:
-	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:18.04 fpm -v 1.1 -s dir -t deb -n v8pp --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "v8pp - build dependency" --url "https://github.com/rayburgemeestre/v8pp" --deb-generate-changes -C /src/out
+	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:22.04 fpm -v 1.1 -s dir -t deb -n v8pp --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "v8pp - build dependency" --url "https://github.com/rayburgemeestre/v8pp" --deb-generate-changes -C /src/out
 
 clean:
 	rm -rf v8pp