diffstat for gnome-remote-desktop-48.1 gnome-remote-desktop-48.1 debian/changelog | 14 ++++ debian/patches/rdp-renderer-Clear-VkDevice-when-vaapi-initialization-fai.patch | 34 ++++++++++ debian/patches/series | 1 src/grd-rdp-renderer.c | 5 + 4 files changed, 53 insertions(+), 1 deletion(-) diff -Nru gnome-remote-desktop-48.1/debian/changelog gnome-remote-desktop-48.1/debian/changelog --- gnome-remote-desktop-48.1/debian/changelog 2025-05-13 15:01:58.000000000 +0100 +++ gnome-remote-desktop-48.1/debian/changelog 2025-07-10 10:04:35.000000000 +0100 @@ -1,3 +1,17 @@ +gnome-remote-desktop (48.1-4) unstable; urgency=medium + + * Team upload + * Upload to unstable + + -- Simon McVittie Thu, 10 Jul 2025 10:04:35 +0100 + +gnome-remote-desktop (48.1-3) experimental; urgency=medium + + * Cherry-pick patch to fix gnome-remote-desktop on arm64 + (at least as seen on Raspberry Pi 5) with mesa 25.07 (LP: #2115956) + + -- Jeremy Bícha Tue, 08 Jul 2025 16:59:33 +0200 + gnome-remote-desktop (48.1-2) unstable; urgency=medium [ Jeremy Bícha ] diff -Nru gnome-remote-desktop-48.1/debian/patches/rdp-renderer-Clear-VkDevice-when-vaapi-initialization-fai.patch gnome-remote-desktop-48.1/debian/patches/rdp-renderer-Clear-VkDevice-when-vaapi-initialization-fai.patch --- gnome-remote-desktop-48.1/debian/patches/rdp-renderer-Clear-VkDevice-when-vaapi-initialization-fai.patch 1970-01-01 01:00:00.000000000 +0100 +++ gnome-remote-desktop-48.1/debian/patches/rdp-renderer-Clear-VkDevice-when-vaapi-initialization-fai.patch 2025-07-10 10:04:35.000000000 +0100 @@ -0,0 +1,34 @@ +From: =?utf-8?q?Jonas_=C3=85dahl?= +Date: Tue, 17 Jun 2025 11:39:29 +0200 +Subject: rdp/renderer: Clear VkDevice when vaapi initialization fails + +We're not going to use the VkDevice in this case, and it may cause +issues if it exposes a different set of format modifiers, as we'd check +format modifier support on the VkDevice, even if we won't be using +it. + +https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/323 + +(cherry picked from commit cd5c0d008329565838e047130385b52b8a261fa6) + +Origin: upstream gnome-48 branch after 48.1 +--- + src/grd-rdp-renderer.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/grd-rdp-renderer.c b/src/grd-rdp-renderer.c +index 0efffa1..c9ffa95 100644 +--- a/src/grd-rdp-renderer.c ++++ b/src/grd-rdp-renderer.c +@@ -187,7 +187,10 @@ maybe_initialize_hardware_acceleration (GrdRdpRenderer *renderer, + renderer->hwaccel_vaapi = grd_hwaccel_vaapi_new (renderer->vk_device, + &error); + if (!renderer->hwaccel_vaapi) +- g_message ("[RDP] Did not initialize VAAPI: %s", error->message); ++ { ++ g_message ("[RDP] Did not initialize VAAPI: %s", error->message); ++ g_clear_object (&renderer->vk_device); ++ } + + return TRUE; + } diff -Nru gnome-remote-desktop-48.1/debian/patches/series gnome-remote-desktop-48.1/debian/patches/series --- gnome-remote-desktop-48.1/debian/patches/series 2025-05-13 15:01:58.000000000 +0100 +++ gnome-remote-desktop-48.1/debian/patches/series 2025-07-10 10:04:35.000000000 +0100 @@ -1 +1,2 @@ fdkaac.patch +rdp-renderer-Clear-VkDevice-when-vaapi-initialization-fai.patch diff -Nru gnome-remote-desktop-48.1/src/grd-rdp-renderer.c gnome-remote-desktop-48.1/src/grd-rdp-renderer.c --- gnome-remote-desktop-48.1/src/grd-rdp-renderer.c 2025-04-14 10:27:19.000000000 +0100 +++ gnome-remote-desktop-48.1/src/grd-rdp-renderer.c 2025-07-10 10:10:16.000000000 +0100 @@ -187,7 +187,10 @@ renderer->hwaccel_vaapi = grd_hwaccel_vaapi_new (renderer->vk_device, &error); if (!renderer->hwaccel_vaapi) - g_message ("[RDP] Did not initialize VAAPI: %s", error->message); + { + g_message ("[RDP] Did not initialize VAAPI: %s", error->message); + g_clear_object (&renderer->vk_device); + } return TRUE; }