4 files changed, 103 insertions, 2 deletions

diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch
new file mode 100644
index 000000000..62600cdda
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch
@@ -0,0 +1,72 @@
+From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Tue, 22 Feb 2022 12:05:08 +0100
+Subject: [PATCH] Fixed compilation warnings in ainput channel
+
+Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ channels/ainput/server/ainput_main.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c
+index bc1737ee1..17d2ec681 100644
+--- a/channels/ainput/server/ainput_main.c
++++ b/channels/ainput/server/ainput_main.c
+@@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s)
+ 
+ static HANDLE ainput_server_get_channel_handle(ainput_server* ainput)
+ {
+-       BYTE* buffer = NULL;
++       void* buffer = NULL;
+        DWORD BytesReturned = 0;
+        HANDLE ChannelEvent = NULL;
+ 
+@@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm)
+                goto fail;
+        return &ainput->context;
+ fail:
+-       ainput_server_context_free(ainput);
++       ainput_server_context_free(&ainput->context);
+        return NULL;
+ }
+ 
+@@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context)
+                        break;
+                case AINPUT_OPENED:
+                {
+-                       BYTE* buffer = NULL;
++                       union
++                       {
++                               BYTE* pb;
++                               void* pv;
++                       } buffer;
+                        DWORD BytesReturned = 0;
+ 
+-                       if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer,
++                       buffer.pv = NULL;
++
++                       if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv,
+                                                   &BytesReturned) != TRUE)
+                        {
+                                WLog_ERR(TAG, "WTSVirtualChannelReady failed,");
+                        }
+                        else
+                        {
+-                               if (*buffer != 0)
++                               if (*buffer.pb != 0)
+                                {
+                                        error = ainput_server_send_version(ainput);
+                                        if (error)
+@@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context)
+                                else
+                                        error = CHANNEL_RC_OK;
+                        }
+-                       WTSFreeMemory(buffer);
++                       WTSFreeMemory(buffer.pv);
+                }
+                break;
+                case AINPUT_VERSION_SENT:
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch
new file mode 100644
index 000000000..7fae2703f
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch
@@ -0,0 +1,27 @@
+From 75fa1fa5bd5ef2350390564245fd0984209ac092 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 4 Jul 2022 14:34:46 +0200
+Subject: [PATCH] Fixed compilation warnings
+
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2da280b8a1748052b70b3f5a1ef0d8e932c33adc]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ client/X11/xf_graphics.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
+index 5aa1fd48b..fe81e0ed9 100644
+--- a/client/X11/xf_graphics.c
++++ b/client/X11/xf_graphics.c
+@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer)
+ 
+ #endif
+ fail:
+-       WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1);
++       WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL);
+        return rc;
+ }
+ 
+-- 
+2.45.0
+
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
index 537d19263..b6974af73 100644
--- a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "openssl libusb1 uriparser cairo icu pkcs11-helper zlib jpeg"
 
 inherit pkgconfig cmake
 
-SRCREV = "708f3764897e06297469a7b0507b3c9ecc041ad7"
+SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
index 8de0e39ad..ee4d4530d 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
@@ -13,11 +13,13 @@ inherit pkgconfig cmake gitpkgv
 PE = "1"
 PKGV = "${GITPKGVTAG}"
 
-SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7"
+SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
            file://winpr-makecert-Build-with-install-RPATH.patch \
+           file://0001-Fixed-compilation-warnings.patch \
            file://0001-Fix-const-qualifier-error.patch \
            file://0002-Do-not-install-tools-a-CMake-targets.patch \
+           file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \
            "
 
 S = "${WORKDIR}/git"