From 4b14dacf555167e792a469fb6de7b35c0b6a884a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 9 May 2024 11:50:48 -0700 Subject: [PATCH] freerdp: Upgrade to 2.11.7 Partially backport a fix to build with gcc-14 Signed-off-by: Khem Raj --- .../0001-Fixed-compilation-warnings.patch | 27 +++++++++++++++++++ .../{freerdp_2.11.2.bb => freerdp_2.11.7.bb} | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch rename meta-oe/recipes-support/freerdp/{freerdp_2.11.2.bb => freerdp_2.11.7.bb} (96%) 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 0000000000..7fae2703f8 --- /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 +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 +--- + 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/freerdp_2.11.2.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb similarity index 96% rename from meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb rename to meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb index 8de0e39ad7..37a28bfecf 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb @@ -13,9 +13,10 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7" +SRCREV = "7f6cc93c21d7f0faad6daacca06f494f29ce882c" 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 \ "