[packaging,flatpak] update dependencies

packaging/flatpak/com.freerdp.FreeRDP.json

@@ -1,13 +1,21 @@
 {
+	"add-build-extensions": {
+		"org.freedesktop.Platform.ffmpeg-full": {
+			"add-ld-path": ".",
+			"directory": "lib/ffmpeg",
+			"version": "24.08"
+		},
+		"org.freedesktop.Platform.openh264": {
+			"add-ld-path": ".",
+			"directory": "lib/openh264",
+			"version": "2.5.0"
+		}
+	},
 	"app-id": "com.freerdp.FreeRDP",
-	"runtime": "org.freedesktop.Platform",
-	"runtime-version": "23.08",
-	"sdk": "org.freedesktop.Sdk",
 	"build-options": {
 		"cflags": "-O3",
 		"cxxflags": "-O3"
 	},
-	"command": "freerdp.sh",
 	"cleanup": [
 		"*.a",
 		"*.la",
@@ -19,33 +27,17 @@
 		"/share/examples",
 		"/share/man"
 	],
+	"command": "freerdp.sh",
 	"finish-args": [
 		"--device=dri",
-		/* X11 + XShm access */
 		"--share=ipc",
 		"--socket=x11",
-		/* Needs to talk to the network */
 		"--share=network",
-		/* Play sounds redirected from guests */
 		"--socket=pulseaudio",
 		"--socket=cups",
-		/* Wayland access */
 		"--socket=wayland",
-		/* Allow rw access to download folder */
 		"--filesystem=xdg-download"
 	],
-	"add-build-extensions": {
-		"org.freedesktop.Platform.ffmpeg-full": {
-			"directory": "lib/ffmpeg",
-			"version": "23.08",
-			"add-ld-path": "."
-		},
-		"org.freedesktop.Platform.openh264": {
-			"directory": "lib/openh264",
-			"version": "2.4.1",
-			"add-ld-path": "."
-		}
-	},
 	"modules": [
 		"modules/openssl.json",
 		"modules/libusb.json",
@@ -55,10 +47,13 @@
 		"modules/pcsc.json",
 		"modules/krb5.json",
 		"modules/opensc.json",
+		"modules/pkcs11-helper.json",
+		"modules/SDL3.json",
+		"modules/SDL3_image.json",
+		"modules/SDL3_ttf.json",
 		{
-			"name": "freerdp",
-			"buildsystem": "cmake-ninja",
 			"builddir": true,
+			"buildsystem": "cmake-ninja",
 			"cleanup": [],
 			"config-opts": [
 				"-DCMAKE_VERBOSE_MAKEFILE=ON",
@@ -92,27 +87,31 @@
 				"-DWITH_WEBVIEW:BOOL=OFF",
 				"-DWITH_PULSE:BOOL=ON"
 			],
+			"name": "freerdp",
 			"sources": [
 				{
-					"type": "dir",
+					"path": "../..",
-					"path": "../.."
+					"type": "dir"
 				}
 			]
 		},
 		{
-			"name": "wrapper",
-			"buildsystem": "simple",
 			"build-commands": [
 				"install -D freerdp.sh /app/bin/freerdp.sh",
 				"mkdir -p /app/lib/ffmpeg",
 				"mkdir -p /app/lib/openh264"
 			],
+			"buildsystem": "simple",
+			"name": "wrapper",
 			"sources": [
 				{
-					"type": "file",
+					"path": "freerdp.sh",
-					"path": "freerdp.sh"
+					"type": "file"
 				}
 			]
 		}
-	]
+	],
+	"runtime": "org.freedesktop.Platform",
+	"runtime-version": "24.08",
+	"sdk": "org.freedesktop.Sdk"
 }

packaging/flatpak/modules/SDL2_image.json

@@ -0,0 +1,33 @@
+{
+	"builddir": true,
+	"buildsystem": "cmake-ninja",
+	"cleanup": [
+		"/include",
+		"/lib/*.la",
+		"/lib/*.a",
+		"/lib/cmake",
+		"/share/aclocal",
+		"/lib/pkgconfig"
+	],
+	"config-opts": [
+		"-DCMAKE_VERBOSE_MAKEFILE=ON",
+		"-DCMAKE_BUILD_TYPE:STRING=Release",
+		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+	],
+	"name": "SDL2_image",
+	"sources": [
+		{
+			"sha256": "f7c06a8783952cfe960adccdd3d8472b63ab31475b4390d10cfdcc1aea61238f",
+			"type": "archive",
+			"url":
+			    "https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.4/SDL2_image-2.8.4.tar.gz",
+			"x-checker-data": {
+				"project-id": 4781,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL2_image-${version0}.${version1}.${version2}.tar.gz"
+			}
+		}
+	]
+}

packaging/flatpak/modules/SDL2_ttf.json

@@ -0,0 +1,33 @@
+{
+	"builddir": true,
+	"buildsystem": "cmake-ninja",
+	"cleanup": [
+		"/include",
+		"/lib/*.la",
+		"/lib/*.a",
+		"/lib/cmake",
+		"/share/aclocal",
+		"/lib/pkgconfig"
+	],
+	"config-opts": [
+		"-DCMAKE_VERBOSE_MAKEFILE=ON",
+		"-DCMAKE_BUILD_TYPE:STRING=Release",
+		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+	],
+	"name": "SDL2_ttf",
+	"sources": [
+		{
+			"sha256": "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd",
+			"type": "archive",
+			"url":
+			    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-2.24.0.tar.gz",
+			"x-checker-data": {
+				"project-id": 4784,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version0}.${version1}.${version2}/SDL2_ttf-${version0}.${version1}.${version2}.tar.gz"
+			}
+		}
+	]
+}

packaging/flatpak/modules/SDL3.json

@@ -0,0 +1,33 @@
+{
+	"builddir": true,
+	"buildsystem": "cmake-ninja",
+	"cleanup": [
+		"/include",
+		"/lib/*.la",
+		"/lib/*.a",
+		"/lib/cmake",
+		"/share/aclocal",
+		"/lib/pkgconfig"
+	],
+	"config-opts": [
+		"-DCMAKE_VERBOSE_MAKEFILE=ON",
+		"-DCMAKE_BUILD_TYPE:STRING=Release",
+		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+	],
+	"name": "SDL3",
+	"sources": [
+		{
+			"sha256": "2938328317301dfbe30176d79c251733aa5e7ec5c436c800b99ed4da7adcb0f0",
+			"type": "archive",
+			"url":
+			    "https://github.com/libsdl-org/SDL/releases/download/release-3.2.4/SDL3-3.2.4.tar.gz",
+			"x-checker-data": {
+				"project-id": 4781,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL3-${version0}.${version1}.${version2}.tar.gz"
+			}
+		}
+	]
+}

packaging/flatpak/modules/SDL3_image.json

@@ -0,0 +1,33 @@
+{
+	"builddir": true,
+	"buildsystem": "cmake-ninja",
+	"cleanup": [
+		"/include",
+		"/lib/*.la",
+		"/lib/*.a",
+		"/lib/cmake",
+		"/share/aclocal",
+		"/lib/pkgconfig"
+	],
+	"config-opts": [
+		"-DCMAKE_VERBOSE_MAKEFILE=ON",
+		"-DCMAKE_BUILD_TYPE:STRING=Release",
+		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+	],
+	"name": "SDL3_image",
+	"sources": [
+		{
+			"sha256": "1690baea71b2b4ded9895126cddbc03a1000b027d099a4fb4669c4d23d73b19f",
+			"type": "archive",
+			"url":
+			    "https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.0/SDL3_image-3.2.0.tar.gz",
+			"x-checker-data": {
+				"project-id": 4781,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL3_image-${version0}.${version1}.${version2}.tar.gz"
+			}
+		}
+	]
+}

packaging/flatpak/modules/SDL3_ttf.json

@@ -0,0 +1,33 @@
+{
+	"builddir": true,
+	"buildsystem": "cmake-ninja",
+	"cleanup": [
+		"/include",
+		"/lib/*.la",
+		"/lib/*.a",
+		"/lib/cmake",
+		"/share/aclocal",
+		"/lib/pkgconfig"
+	],
+	"config-opts": [
+		"-DCMAKE_VERBOSE_MAKEFILE=ON",
+		"-DCMAKE_BUILD_TYPE:STRING=Release",
+		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+	],
+	"name": "SDL3_ttf",
+	"sources": [
+		{
+			"sha256": "0ac7c23d9a037d3e3922ea1027fd8e923f03b0840042a49cca7652d2b49989a6",
+			"type": "archive",
+			"url":
+			    "https://github.com/libsdl-org/SDL_ttf/releases/download/prerelease-3.1.2/SDL3_ttf-3.1.2.tar.gz",
+			"x-checker-data": {
+				"project-id": 4784,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version0}.${version1}.${version2}/SDL3_ttf-${version0}.${version1}.${version2}.tar.gz"
+			}
+		}
+	]
+}

packaging/flatpak/modules/cJSON.json

@@ -1,18 +1,26 @@
 {
-	"name": "cjson",
+	"builddir": true,
 	"buildsystem": "cmake-ninja",
 	"cleanup": [],
 	"config-opts": [
 		"-DCMAKE_VERBOSE_MAKEFILE=ON",
 		"-DCMAKE_BUILD_TYPE:STRING=Release",
-		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+		"-DCMAKE_INSTALL_LIBDIR:PATH=lib",
+		"-DWITH_PULSE:BOOL=ON"
 	],
+	"name": "cjson",
 	"sources": [
 		{
-			"type": "git",
+			"sha256": "3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5",
-			"url": "https://github.com/DaveGamble/cJSON.git",
+			"type": "archive",
-			"tag": "v1.7.17",
+			"url": "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.18.tar.gz",
-			"commit": "87d8f0961a01bf09bef98ff89bae9fdec42181ee"
+			"x-checker-data": {
+				"project-id": 21330,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/DaveGamble/cJSON/archive/refs/tags/v${version0}.${version1}.${version2}.tar.gz"
+			}
 		}
 	]
 }

packaging/flatpak/modules/krb5.json

@@ -1,12 +1,19 @@
 {
-	"name": "krb5",
 	"buildsystem": "autotools",
-	"subdir": "src",
+	"name": "krb5",
 	"sources": [
 		{
+			"sha256": "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35",
 			"type": "archive",
-			"url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.2.tar.gz",
+			"url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.3.tar.gz",
-			"sha256": "9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491"
+			"x-checker-data": {
+				"project-id": 13287,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://kerberos.org/dist/krb5/${version0}.${version1}/krb5-${version0}.${version1}.${version2}.tar.gz"
 			}
-	]
+		}
+	],
+	"subdir": "src"
 }

packaging/flatpak/modules/libusb.json

@@ -1,22 +1,22 @@
 {
-	"name": "libusb",
-	"config-opts": [
-		"--disable-static"
-	],
 	"cleanup": [
 		"/lib/*.la",
 		"/lib/pkgconfig",
 		"/include"
 	],
-	"sources": [
+	"config-opts": [
-		{
+		"--disable-static"
-			"type": "archive",
-			"url":
-			    "https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2",
-			"sha256": "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575"
-		}
 	],
+	"name": "libusb",
 	"post-install": [
 		"install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
+	],
+	"sources": [
+		{
+			"sha256": "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575",
+			"type": "archive",
+			"url":
+			    "https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2"
+		}
 	]
 }

packaging/flatpak/modules/opensc.json

@@ -1,13 +1,25 @@
 {
-	"name": "opensc",
 	"buildsystem": "autotools",
 	"cleanup": [],
-	"config-opts": [],
+	"config-opts": [
+		"--disable-assert",
+		"--disable-fuzzing",
+		"--disable-man",
+		"--disable-strict"
+	],
+	"name": "opensc",
 	"sources": [
 		{
+			"sha256": "f16291a031d86e570394762e9f35eaf2fcbc2337a49910f3feae42d54e1688cb",
 			"type": "archive",
-			"url": "https://github.com/OpenSC/OpenSC/releases/download/0.25.0/opensc-0.25.0.tar.gz",
+			"url": "https://github.com/OpenSC/OpenSC/releases/download/0.26.1/opensc-0.26.1.tar.gz",
-			"sha256": "e6d7b66e2a508a377ac9d67aa463025d3c54277227be10bd08872e3407d6622f"
+			"x-checker-data": {
+				"project-id": 13287,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/OpenSC/OpenSC/tags/${version0}.${version1}.${version2}"
+			}
 		}
 	]
 }

packaging/flatpak/modules/openssl.json

@@ -1,17 +1,18 @@
 {
-	"name": "openssl",
-	"buildsystem": "simple",
 	"build-commands": [
 		"./config --prefix=/app --openssldir=/app --libdir=lib shared",
 		"make -j build_sw",
 		"make -j install_sw"
 	],
+	"buildsystem": "simple",
 	"cleanup": [],
+	"name": "openssl",
 	"sources": [
 		{
+			"sha256": "002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3",
 			"type": "archive",
-			"url": "https://openssl.org/source/openssl-3.1.5.tar.gz",
+			"url":
-			"sha256": "6ae015467dabf0469b139ada93319327be24b98251ffaeceda0221848dc09262"
+			    "https://github.com/openssl/openssl/releases/download/openssl-3.4.1/openssl-3.4.1.tar.gz"
 		}
 	]
 }

packaging/flatpak/modules/pcsc.json

@@ -1,23 +1,29 @@
 {
-	"name": "pcsc",
+	"cleanup": [
+		"/share/doc",
+		"/share/man"
+	],
 	"config-opts": [
 		"--disable-libsystemd",
 		"--enable-pic",
 		"--disable-libusb",
-		"--disable-polkit",
 		"--enable-shared",
+		"--disable-polkit",
 		"--with-systemdsystemunitdir=/app/lib/systemd/"
 	],
+	"name": "pcsc",
 	"sources": [
 		{
-			"type": "git",
+			"sha256": "7fcb59f66a323f63cf1ab492579a57d899806835c52ba377af9ac57df68bf39b",
-			"url": "https://github.com/LudovicRousseau/PCSC.git",
+			"type": "archive",
-			"tag": "2.0.3",
+			"url": "https://github.com/LudovicRousseau/PCSC/archive/refs/tags/2.3.1.tar.gz",
-			"commit": "c4e7f6f9c6fe56fafd3f13c31fcc4f670ad6d022"
+			"x-checker-data": {
+				"project-id": 2611,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/LudovicRousseau/PCSC/tags/${version0}.${version1}.${version2}"
+			}
 		}
-	],
-	"cleanup": [
-		"/share/doc",
-		"/share/man"
 	]
 }

packaging/flatpak/modules/pcsc.json.orig

@@ -0,0 +1,39 @@
+{
+      "name": "pcsc",
+      "config-opts": [
+        "--disable-libsystemd",
+        "--enable-pic",
+        "--disable-libusb",
+        "--enable-shared",
+<<<<<<< HEAD
+=======
+        "--disable-polkit",
+>>>>>>> beta
+        "--with-systemdsystemunitdir=/app/lib/systemd/"
+      ],
+      "sources": [
+        {
+<<<<<<< HEAD
+          "type": "git",
+          "url": "https://github.com/LudovicRousseau/PCSC.git",
+          "tag": "2.0.0",
+          "commit": "549922c1355fdd1e85eb0a952fefda7bb96e286a"
+=======
+           "type": "git",
+           "url": "https://github.com/LudovicRousseau/PCSC.git",
+           "tag": "2.3.0",
+           "commit": "a2c25c5fa25b5e2400fe6a002ea2263069ebd94f",
+           "x-checker-data": {
+               "type": "anitya",
+               "project-id": 2611,
+               "stable-only": true,
+               "url-template": "https://github.com/LudovicRousseau/PCSC/tags/${version0}.${version1}.${version2}"
+           }
+>>>>>>> beta
+        }
+      ],
+      "cleanup": [
+        "/share/doc",
+        "/share/man"
+      ]
+}

packaging/flatpak/modules/pkcs11-helper.json

@@ -0,0 +1,26 @@
+{
+	"buildsystem": "autotools",
+	"name": "pkcs11-helper",
+	"sources": [
+		{
+			"sha256": "076c9f664812a45f2da25efc157338b0b8bb1949117f0144050fec176b6fdf78",
+			"type": "archive",
+			"url":
+			    "https://github.com/OpenSC/pkcs11-helper/archive/refs/tags/pkcs11-helper-1.30.0.tar.gz",
+			"x-checker-data": {
+				"project-id": 91990,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/OpenSC/pkcs11-helper/archive/refs/tags/pkcs11-helper-$version.tar.gz"
+			}
+		},
+		{
+			"commands": [
+				"autoreconf -vfi"
+			],
+			"dest-filename": "autogen.sh",
+			"type": "script"
+		}
+	]
+}

packaging/flatpak/modules/uriparser.json

@@ -1,23 +1,28 @@
 {
-      "name": "uriparser",
+	"builddir": true,
 	"buildsystem": "cmake-ninja",
-      "cleanup": [
+	"cleanup": [],
-      ],
 	"config-opts": [
 		"-DCMAKE_VERBOSE_MAKEFILE=ON",
 		"-DCMAKE_BUILD_TYPE:STRING=Release",
 		"-DCMAKE_INSTALL_LIBDIR:PATH=lib",
-        "-DURIPARSER_BUILD_TESTS:BOOL=OFF",
 		"-DURIPARSER_BUILD_DOCS:BOOL=OFF",
-        "-DURIPARSER_BUILD_TOOLS:BOOL=OFF",
+		"-DURIPARSER_BUILD_TESTS:BOOL=OFF"
-        "-DURIPARSER_BUILD_WCHAR_T:BOOL=OFF"
 	],
+	"name": "urlparser",
 	"sources": [
 		{
-          "type": "git",
+			"sha256": "1d71c054837ea32a31e462bce5a1af272379ecf511e33448e88100b87ff73b2e",
-          "url": "https://github.com/uriparser/uriparser.git",
+			"type": "archive",
-          "tag": "uriparser-0.9.7",
+			"url":
-          "commit": "634b678fa858abf1d1ebc0634e96e9e29596e92a"
+			    "https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.8/uriparser-0.9.8.tar.xz",
+			"x-checker-data": {
+				"project-id": 10160,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/uriparser/uriparser/releases/download/uriparser-${version0}.${version1}.${version2}/uriparser-${version0}.${version1}.${version2}.tar.xz"
+			}
 		}
 	]
 }

packaging/flatpak/modules/xprop.json

@@ -1,14 +1,21 @@
 {
-	"name": "xprop",
-	"sources": [
-		{
-			"type": "archive",
-			"url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.7.tar.xz",
-			"sha256": "4436e3148bb91a162406230d9f736a49ca8b50b74790015dc15d78d6ce8e825f"
-		}
-	],
 	"cleanup": [
 		"/share/doc",
 		"/share/man"
+	],
+	"name": "xprop",
+	"sources": [
+		{
+			"sha256": "d689e2adb7ef7b439f6469b51cda8a7daefc83243854c2a3b8f84d0f029d67ee",
+			"type": "archive",
+			"url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.8.tar.xz",
+			"x-checker-data": {
+				"project-id": 14958,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://xorg.freedesktop.org/releases/individual/app/xprop-${version0}.${version1}.${version2}.tar.xz"
+			}
+		}
 	]
 }