Update Ubuntu for AppImage to 24.04

.builds/freebsd.yml

@@ -1,5 +1,5 @@
 
-image: freebsd/13.x
+image: freebsd/14.x
 
 sources:
   - https://git.sr.ht/~thestr4ng3r/chiaki
@@ -7,7 +7,8 @@ sources:
 packages:
   - cmake
   - protobuf
-  - py39-protobuf
+  - py311-setuptools # should not be needed with nanopb >= 0.4.9
+  - py311-protobuf
   - opus
   - qt5-core
   - qt5-qmake

.builds/openbsd.yml

@@ -7,6 +7,7 @@ sources:
 packages:
   - cmake
   - protobuf
+  - py3-setuptools # should not be needed with nanopb >= 0.4.9
   - py3-protobuf
   - opus
   - qtbase

README.md

@@ -10,12 +10,17 @@
 Chiaki is a Free and Open Source Software Client for PlayStation 4 and PlayStation 5 Remote Play
 for Linux, FreeBSD, OpenBSD, NetBSD, Android, macOS, Windows, Nintendo Switch and potentially even more platforms.
 
-![Screenshot](assets/screenshot.png)
-
-## Project Status
+## Project Status and Contributing
 
 As all relevant features are implemented, this project is considered to be finished and in maintenance mode only.
-No major updates are planned and contributions are only accepted in special cases.
+No major updates are planned and contributions are only accepted in special cases such as security issues.
+The objective is to keep a stable base and not break existing support for less mainstream platforms such as BSDs.
+
+**For a more active, fast moving and community-oriented project, refer
+to [chiaki-ng](https://streetpea.github.io/chiaki-ng/) ("next generation").
+If you would like to contribute, this will likely also be the best place to do so.**
+
+![Screenshot](assets/screenshot.png)
 
 ## Installing
 
@@ -28,7 +33,7 @@ Builds are provided for Linux, Android, macOS, Nintendo Switch and Windows.
 You can download them [here](https://git.sr.ht/~thestr4ng3r/chiaki/refs).
 
 * **Linux**: The provided file is an [AppImage](https://appimage.org/). Simply make it executable (`chmod +x <file>.AppImage`) and run it.
-* **Android**: Install from [Google Play](https://play.google.com/store/apps/details?id=com.metallic.chiaki), [F-Droid](https://f-droid.org/packages/com.metallic.chiaki/) or download the APK from Sourcehut.
+* **Android**: Install from [F-Droid](https://f-droid.org/packages/com.metallic.chiaki/) or download the APK from Sourcehut.
 * **macOS**: Drag the application from the `.dmg` into your Applications folder.
 * **Windows**: Extract the `.zip` file and execute `chiaki.exe`.
 * **Switch**: Download the `.nro` file and copy it into the `switch/` directory on your SD card.

scripts/Dockerfile.bionic

@@ -1,16 +0,0 @@
-
-FROM ubuntu:bionic
-
-RUN apt-get update
-RUN apt-get install -y software-properties-common gpg wget
-RUN add-apt-repository ppa:beineri/opt-qt-5.12.10-bionic
-COPY kitware-archive-latest.asc /kitware-archive-latest.asc
-RUN cat /kitware-archive-latest.asc | gpg --dearmor > /usr/share/keyrings/kitware-archive-keyring.gpg
-RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' > /etc/apt/sources.list.d/kitware.list
-RUN apt-get update
-RUN apt-get -y install git g++ cmake ninja-build curl pkg-config unzip python3-pip \
-	libssl-dev libopus-dev qt512base qt512multimedia qt512svg \
-	libgl1-mesa-dev nasm libudev-dev libva-dev fuse libevdev-dev libudev-dev
-
-CMD []
-

scripts/Dockerfile.noble

@@ -0,0 +1,13 @@
+
+FROM ubuntu:noble
+
+RUN apt-get update
+# Hint: python3-setuptools should not be needed with nanopb >= 0.4.9
+RUN apt-get -y install git g++ cmake ninja-build curl pkg-config unzip \
+	python3-protobuf protobuf-compiler \
+	python3-setuptools \
+	libssl-dev libopus-dev qtbase5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5svg5-dev \
+	libgl1-mesa-dev nasm libudev-dev libva-dev fuse libevdev-dev libudev-dev file
+
+CMD []
+

scripts/build-appimage.sh

@@ -7,8 +7,6 @@ appdir=${1:-`pwd`/appimage/appdir}
 
 mkdir appimage
 
-pip3 install --user protobuf==3.19.5 # need support for python 3.6 for running on bionic
-scripts/fetch-protoc.sh appimage
 export PATH="`pwd`/appimage/protoc/bin:$PATH"
 scripts/build-ffmpeg.sh appimage
 scripts/build-sdl2.sh appimage
@@ -18,7 +16,7 @@ cd build_appimage
 cmake \
 	-GNinja \
 	-DCMAKE_BUILD_TYPE=Release \
-	"-DCMAKE_PREFIX_PATH=`pwd`/../appimage/ffmpeg-prefix;`pwd`/../appimage/sdl2-prefix;/opt/qt512" \
+	"-DCMAKE_PREFIX_PATH=`pwd`/../appimage/ffmpeg-prefix;`pwd`/../appimage/sdl2-prefix" \
 	-DCHIAKI_ENABLE_TESTS=ON \
 	-DCHIAKI_ENABLE_CLI=OFF \
 	-DCHIAKI_ENABLE_GUI=ON \
@@ -40,9 +38,6 @@ curl -L -O https://github.com/linuxdeploy/linuxdeploy/releases/download/continuo
 chmod +x linuxdeploy-x86_64.AppImage
 curl -L -O https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
 chmod +x linuxdeploy-plugin-qt-x86_64.AppImage
-set +e
-source /opt/qt512/bin/qt512-env.sh
-set -e
 
 export LD_LIBRARY_PATH="`pwd`/sdl2-prefix/lib:$LD_LIBRARY_PATH"
 export EXTRA_QT_PLUGINS=opengl

scripts/build-ffmpeg.sh

@@ -5,7 +5,7 @@ cd "./$1"
 shift
 ROOT="`pwd`"
 
-TAG=n4.3.1
+TAG=n4.3.9
 
 git clone https://git.ffmpeg.org/ffmpeg.git --depth 1 -b $TAG && cd ffmpeg || exit 1
 

scripts/fetch-protoc.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -xe
-
-cd $(dirname "${BASH_SOURCE[0]}")/..
-cd "./$1"
-ROOT="`pwd`"
-
-URL=https://github.com/protocolbuffers/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip
-
-curl -L "$URL" -o protoc.zip
-unzip protoc.zip -d protoc
-

scripts/kitware-archive-latest.asc

@@ -1,64 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGK0u/sBEADD57vA+Zjb9sEUOM2HlwW8l0OJyxW/G4oxcTIaiC2Iuki5fXN1
-VgQD646hUmUh/eMxRcwMpUpihHLcmQxoFWMFwBmljB9Ext8vgthwJoOSr0UwjRTe
-qt8IpgEk+2VTQ5/T2XSu//fhw28rP7k5+fMqdIC/COaM/+jCZC17trSkjFcPcPNY
-jyC/p40iPfYPDzMdUZhCcxC4ovtlImI6Bkr0x1/NDdy1FsQ4mxFirvV2a0XgjizY
-4r25CpgKkMolf9bjAT3Cx2RGYJ5etnB6Ck74NP0bKQikkeWLo2jmrnix+oU07p2Q
-PgjsNw5soIczHwHm6mEtSN7vduqNa6QkGFFce0eDK2NIajxt620HUB53zrtaKj/J
-ACwHj6SxCszbbHo83GiULGR+hmkPHnio5ob0gJwjMp6iWcbtgL4y19i+b8J696t+
-LL5IRBKqXM75XmHZW1munrAVeICWjSpQSYbIGEmYlcCtvxIl3VwH4KZUuhO3BAR6
-V5IgFjYIQkz/ngTywY/8KKaxMUWs2wE/lMLnJKPnDgGlvJ+JCPom0wjrdM2xm2WI
-+PBAUXe8onw1hB/ozP6/pPN4p/H6+ZsiQ2razJcjgE9AYtGZY8tEB2fi7f5wNeg0
-irTmK363zMkqp7pfZMtARkogKBRzmR/8g+EHT4eFBwd3qm/g0Z98KcNaXwARAQAB
-tEVLaXR3YXJlIEFwdCBBcmNoaXZlIEF1dG9tYXRpYyBTaWduaW5nIEtleSAoMjAy
-MykgPGRlYmlhbkBraXR3YXJlLmNvbT6JAlQEEwEKAD4WIQQezC2Z2NabJNCvPiRA
-PgvFpfV4KwUCYrS7+wIbAwUJBaOagAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK
-CRBAPgvFpfV4KyvuD/4n27+wbDt1sol4lyETR60CrVIZvklGscs5Sxawor7EsDYz
-NMu4TVE4q/Wt6MwRmJd9OZBldxb8Wm8VxOEkq69X4aPeDhyPFTyJJNTsuIFlThPo
-q2vkTno44EqQq37gcc20giCLgQL25CV92uvER8N9kBuT7JagDF8DE7ha0nsQ/zYp
-3ikI1EQOIluYc2f3q02ZbLeRm7WqaVW+WDDfRH+6RCuACqeXhgmc8mSPc04nO0Kr
-IS7M5/Eq8OOflQnQsV3DW8JUb9E9Q+P3+PMZ9mUbjjeNPZbD18dYWuHJObUWuP65
-g1w7jjAu/WWJwXQdBvxcDPmELLUZGnHJeVkrzuh9O1CBeuABltz8IvKb9MmC8Aob
-q7996IljIMKfhBjae+/G2AuswgDykRJxKvTZYEIVngR8WaoZ7CAhBY7Ch+DElq/5
-AEz4QwVESJYitoyf3ei8nVZAHuoytgBgnUHh6bJSWXQZKAcm8w6b7cwTjyZxTg+a
-sYXfgZq15BXec8McUp1hM0pA2GI1cMh+3zKz38kQnbUWT/Eo/en2JPWGlY018qxL
-+Ok6wuZeUGH6ZB+DXJz1WukxVNupjd4OE3N4mdhZiemwSArVeK/P9yIFjyI0aiay
-7IwL7LoKu1XfSYjUOODkr7e/CTOhITdZXCX0GdEt3WjOkCcwTfU3VJAh7zq8lbkC
-DQRitLwFARAAwkCT3xuREKGfc33mxRwDZe+D4BuLSzOEx06/qSxccuuWa+HcMnDe
-gG96kCFpRqzAdCiiN8b4u5A5tHO9lf+CUkykGI3afjTNbKnTKP+hN92CDfaJQ0bA
-4n6I9yOAyJtwGSfX5ivTKEMdrPhw6TX2sASLuVBLbmPBtwRR/ciOdhRG2t51AXQl
-Hp47dTTQP9Wo2HUFLmiqm/bYGXTnKMqP+hrfii868/arfNgO421/Up0s6vhuaDb9
-ZCq88GMe3v9gJ+yr/giTNyVKoK4yNEwzJIBJ0wlXULc4PQrX1QIR60gxfe8BJLcL
-1wy+qGYhbdpHVn2k6dZsbJL3EmoetxmHJj5DmF7+KAmWhrUteF8Z5HtZyUKzLX9/
-IfkcVGSZdsJHb5gkBK0olSd6SXZF9r/ZpyHhc41gfABkGCXVfphSuFDlrutHcmwI
-1RF69DQidl6ixP8O/dEN2iBgw2tvvMz/1dsN12U2LIpAhV2OL5ueIbgsmJE5w43g
-K7Eb1D37KPbStWVyfZF2fOHN+Mg7Yjqun5Rq8pWKr+oxGYk2046DG4N+glCZrBKB
-LnpNsMaLKFxhte5r1KrhyfRtYVQ10sWQB9wPPekRxqlDPog8KkX55WzxYPYH38Nd
-qkgDdrILdxBkF3ThX5eEntQRarqVbVpLGk7eSYGPkpJ7l+RYiSehPSkAEQEAAYkE
-cgQYAQoAJhYhBB7MLZnY1psk0K8+JEA+C8Wl9XgrBQJitLwFAhsCBQkFo5qAAkAJ
-EEA+C8Wl9XgrwXQgBBkBCgAdFiEE9B5eruaZPk3sJUs1QtWhkrgZxdoFAmK0vAUA
-CgkQQtWhkrgZxdpNvRAAvtCTTabvicfEXKgcv13FDWSE31F5hyAcK7spK7cehu3B
-9+yU3nMJcPtIhA8VUQ/mC8sm5AGtWQetKn1nXRrS/xyssit8OSb8VPiOY7/HGD+R
-9vSAgJwV+trr9inzz1ySmmEfuYi6xBK6YCO//lgtQZq8Ycd06yczSwgqyPOYiTfs
-dG4wudOqob7Ea62p//kaOgv3HIWx3fuWa86Rfw56jsRzO9+lnUuDOXAfYcaev5af
-BijcEySJfDgH2Lw1YfgOCu57VTJK8ZyTN29DWv7Ypjp0REOTdjFFf4gmpDX5Ib2D
-lOUlDwu3ijmXGz63Pi8Col4UlE3i0vJk9WKcMTOIx/+e+83LGJjTwk2K4BWgzOl/
-ZRYGchf3dloQzdglumuhH3epyAZrjQXKCawUGn+7eKj+BqAVDtdOikdcZ2XtLO7F
-YY5JMszPE3EwwngiYjJgo0YIOuj+JoEasLU1sVmIr1GYu0sySyknFuXooftnsLPY
-hcw2gllLNK58XOARsuyWFa+b3NhmrJ+S4+hc0nMlEqsJPE8SksWjCTACtsK0CMnz
-DbwDy1R5oV2+nzkRN1Up6341bbXLu6JrWVxegkrVa3mcDU3Z3/3Y4+vzn09lc2vz
-wBpygs5ZvOWPPNamQf6QnlnWbjdDdjC+1qJZC5aM66vD7lbpVtDFIbzb+rGuCf3P
-mw//angfnJh26pxzDGYkkkPqradV3IGfI36QFCZ6WBL1c8C3/P5gMLS+cswjl+yq
-CuwjOLC9LXjSygXJdR4vfKbW9ReOBv9hG9TmDDuR3YmXOYwBcZKxalSrHpC4/n5o
-K3a8LX74AHMp7zD9EGuqo0Dr5A0nr5QpgZ4JIWhUNzHKNQEe5lW3Q9tujdZzu9ZT
-k6uTRMc+jpyWM6R4/SDo3UE7ClIgXEgswM+vyILFiymSZOxiHQBJFno3bkm1NO8v
-+rWrHdy9/1tivQLXh3GWc/uYkytRKgdorbcoZ8D6OOIFaNJlJW6yxZ+V6sAB1K6l
-cPOaHch+SGtzPfg5eeW/9QuUuXrDk1M7hvxhV9BBA6Enz7Ns6Zn7gehQSRkUc4aW
-HcbkXCxZQzCoUDJPLr7Vw1lrfPgvVfWdxvtgOuDFGmnX4V0xCXI2j4ETtDlyLDi4
-VxoZ9CoyWT99hwEeIr5qa3+4WiMO/3pijKm88gh80thC1udHfNUicv3BG4jrEkyb
-k1+2dk9Gath9gs++oymifoRdQP2vrEVb+2Tdxf4AFW/JY+pzOJVL5+sxrX+E5+gT
-H5qClep/LdPlgPOYJzldb9aV+t5ku9OkSg30Yoi1+4Y2Rn43zKchL+1YdYJebvAF
-btmO4yp5zFUfUjMQ3iRZyQ4VIVQvakojbVfTvMcSW5Vrggk=
-=8BHh
------END PGP PUBLIC KEY BLOCK-----

scripts/run-podman-build-appimage.sh

@@ -3,13 +3,14 @@
 set -xe
 cd "`dirname $(readlink -f ${0})`"
 
-podman build -t chiaki-bionic . -f Dockerfile.bionic
+podman build --arch amd64 -t localhost/chiaki-noble . -f Dockerfile.noble
 cd ..
 podman run --rm \
+	--arch amd64 \
 	-v "`pwd`:/build/chiaki" \
 	-w "/build/chiaki" \
 	--device /dev/fuse \
 	--cap-add SYS_ADMIN \
-	-t chiaki-bionic \
+	-t localhost/chiaki-noble \
 	/bin/bash -c "scripts/build-appimage.sh /build/appdir"
 

scripts/switch/dev-container.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd "`dirname $(readlink -f ${0})`/../.."
+
+podman run --rm \
+	-v "`pwd`:/build/chiaki" \
+	-w "/build/chiaki" \
+	-it \
+	quay.io/thestr4ng3r/chiaki-build-switch:v3 \
+	/bin/bash

scripts/switch/run-podman-build-chiaki.sh

@@ -6,5 +6,5 @@ podman run --rm \
 	-v "`pwd`:/build/chiaki" \
 	-w "/build/chiaki" \
 	-it \
-	thestr4ng3r/chiaki-build-switch:v2 \
+	quay.io/thestr4ng3r/chiaki-build-switch:v3 \
 	${1:-/bin/bash -c "scripts/switch/build.sh"}

switch/CMakeLists.txt

@@ -61,17 +61,16 @@ target_include_directories(borealis PUBLIC
 
 find_package(glfw3 REQUIRED)
 find_library(EGL EGL)
-find_library(GLAPI glapi)
-find_library(DRM_NOUVEAU drm_nouveau)
-target_link_libraries(borealis
+target_link_libraries(borealis PUBLIC
 	glfw
-	${EGL}
-	${GLAPI}
-	${DRM_NOUVEAU})
+	${EGL})
 
 if(CHIAKI_IS_SWITCH)
 	target_compile_definitions(borealis PUBLIC
 		BOREALIS_RESOURCES="romfs:/")
+	find_library(GLAPI glapi)
+	find_library(DRM_NOUVEAU drm_nouveau)
+	target_link_libraries(borealis PUBLIC ${GLAPI} ${DRM_NOUVEAU})
 else()
 	target_compile_definitions(borealis PUBLIC
 		BOREALIS_RESOURCES="./switch/res/")
@@ -114,9 +113,7 @@ target_link_libraries(chiaki-borealis
 if(CHIAKI_IS_SWITCH)
 	# libnx is forced by the switch toolchain
 	find_library(Z z)
-	find_library(GLAPI glapi) # TODO: make it transitive from borealis
-	find_library(DRM_NOUVEAU drm_nouveau) # TODO: make it transitive from borealis
-	target_link_libraries(chiaki-borealis ${Z} ${GLAPI} ${DRM_NOUVEAU})
+	target_link_libraries(chiaki-borealis ${Z} ${GLAPI})
 endif()
 
 install(TARGETS chiaki-borealis

switch/include/io.h

@@ -67,7 +67,7 @@ class IO
 		// default nintendo switch res
 		int screen_width = 1280;
 		int screen_height = 720;
-		AVCodec *codec;
+		const AVCodec *codec;
 		AVCodecContext *codec_context;
 		AVFrame *frame;
 		SDL_AudioDeviceID sdl_audio_device_id = 0;

switch/include/settings.h

@@ -61,7 +61,6 @@ class Settings
 		};
 
 		ConfigurationItem ParseLine(std::string * line, std::string * value);
-		size_t GetB64encodeSize(size_t);
 
 	public:
 		// singleton configuration

switch/src/main.cpp

@@ -28,8 +28,6 @@ bool appletMainLoop()
 // use a custom nintendo switch socket config
 // chiaki requiers many threads with udp/tcp sockets
 static const SocketInitConfig g_chiakiSocketInitConfig = {
-	.bsdsockets_version = 1,
-
 	.tcp_tx_buf_size = 0x8000,
 	.tcp_rx_buf_size = 0x10000,
 	.tcp_tx_buf_max_size = 0x40000,

switch/src/settings.cpp

@@ -29,11 +29,7 @@ Settings::ConfigurationItem Settings::ParseLine(std::string *line, std::string *
 	return UNKNOWN;
 }
 
-size_t Settings::GetB64encodeSize(size_t in)
-{
-	// calculate base64 buffer size after encode
-	return ((4 * in / 3) + 3) & ~3;
-}
+#define B64_ENCODED_SIZE(in) (((4 * in / 3) + 3) & ~3)
 
 Settings *Settings::instance = nullptr;
 
@@ -458,8 +454,7 @@ std::string Settings::GetHostRPKey(Host *host)
 	{
 		if(host->rp_key_data || host->registered)
 		{
-			size_t rp_key_b64_sz = this->GetB64encodeSize(0x10);
-			char rp_key_b64[rp_key_b64_sz + 1] = { 0 };
+			char rp_key_b64[B64_ENCODED_SIZE(0x10) + 1] = { 0 };
 			ChiakiErrorCode err;
 			err = chiaki_base64_encode(
 				host->rp_key, 0x10,
@@ -502,8 +497,7 @@ std::string Settings::GetHostRPRegistKey(Host *host)
 	{
 		if(host->rp_key_data || host->registered)
 		{
-			size_t rp_regist_key_b64_sz = this->GetB64encodeSize(CHIAKI_SESSION_AUTH_SIZE);
-			char rp_regist_key_b64[rp_regist_key_b64_sz + 1] = { 0 };
+			char rp_regist_key_b64[B64_ENCODED_SIZE(CHIAKI_SESSION_AUTH_SIZE) + 1] = { 0 };
 			ChiakiErrorCode err;
 			err = chiaki_base64_encode(
 				(uint8_t *)host->rp_regist_key, CHIAKI_SESSION_AUTH_SIZE,