summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp/0001-Fix-compilation-error.patch101
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch57
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch72
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch27
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb (renamed from meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb)6
5 files changed, 103 insertions, 160 deletions
diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-compilation-error.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-compilation-error.patch
new file mode 100644
index 0000000000..c2c093bc47
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-compilation-error.patch
@@ -0,0 +1,101 @@
1From 0d48a9cb6e25afa10e76de75232ad32a82806aae Mon Sep 17 00:00:00 2001
2From: Ankur Tyagi <ankur.tyagi85@gmail.com>
3Date: Wed, 25 Mar 2026 00:04:42 +1300
4Subject: [PATCH] Fix compilation error
5
6Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/b78cb455cbe847da934c777189b6e7f25267502e]
7
8Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
9---
10 winpr/include/winpr/collections.h | 2 +-
11 winpr/libwinpr/utils/collections/Queue.c | 28 ++++++++++++++++++------
12 2 files changed, 22 insertions(+), 8 deletions(-)
13
14diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h
15index b8c8d9d66..64705751e 100644
16--- a/winpr/include/winpr/collections.h
17+++ b/winpr/include/winpr/collections.h
18@@ -63,7 +63,7 @@ extern "C"
19 int head;
20 int tail;
21 int size;
22- void** array;
23+ uintptr_t* array;
24 CRITICAL_SECTION lock;
25 HANDLE event;
26
27diff --git a/winpr/libwinpr/utils/collections/Queue.c b/winpr/libwinpr/utils/collections/Queue.c
28index bb789b658..6b86f7ab7 100644
29--- a/winpr/libwinpr/utils/collections/Queue.c
30+++ b/winpr/libwinpr/utils/collections/Queue.c
31@@ -34,6 +34,16 @@
32 * Properties
33 */
34
35+static inline void* uptr2void(uintptr_t ptr)
36+{
37+ return (void*)ptr;
38+}
39+
40+static inline uintptr_t void2uptr(const void* ptr)
41+{
42+ return (uintptr_t)ptr;
43+}
44+
45 /**
46 * Gets the number of elements contained in the Queue.
47 */
48@@ -98,9 +108,12 @@ void Queue_Clear(wQueue* queue)
49 for (index = queue->head; index != queue->tail; index = (index + 1) % queue->capacity)
50 {
51 if (queue->object.fnObjectFree)
52- queue->object.fnObjectFree(queue->array[index]);
53+ {
54+ void* obj = uptr2void(queue->array[index]);
55+ queue->object.fnObjectFree(obj);
56+ }
57
58- queue->array[index] = NULL;
59+ queue->array[index] = 0;
60 }
61
62 queue->size = 0;
63@@ -124,7 +137,8 @@ BOOL Queue_Contains(wQueue* queue, void* obj)
64
65 for (index = 0; index < queue->tail; index++)
66 {
67- if (queue->object.fnObjectEquals(queue->array[index], obj))
68+ void* ptr = uptr2void(queue->array[index]);
69+ if (queue->object.fnObjectEquals(ptr, obj))
70 {
71 found = TRUE;
72 break;
73@@ -217,7 +231,7 @@ BOOL Queue_Enqueue(wQueue* queue, void* obj)
74 if (!Queue_EnsureCapacity(queue, 1))
75 goto out;
76
77- queue->array[queue->tail] = obj;
78+ queue->array[queue->tail] = void2uptr(obj);
79 queue->tail = (queue->tail + 1) % queue->capacity;
80 queue->size++;
81 SetEvent(queue->event);
82@@ -242,8 +256,8 @@ void* Queue_Dequeue(wQueue* queue)
83
84 if (queue->size > 0)
85 {
86- obj = queue->array[queue->head];
87- queue->array[queue->head] = NULL;
88+ obj = uptr2void(queue->array[queue->head]);
89+ queue->array[queue->head] = 0;
90 queue->head = (queue->head + 1) % queue->capacity;
91 queue->size--;
92 }
93@@ -269,7 +283,7 @@ void* Queue_Peek(wQueue* queue)
94 EnterCriticalSection(&queue->lock);
95
96 if (queue->size > 0)
97- obj = queue->array[queue->head];
98+ obj = uptr2void(queue->array[queue->head]);
99
100 if (queue->synchronized)
101 LeaveCriticalSection(&queue->lock);
diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
deleted file mode 100644
index 87a456d16d..0000000000
--- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@fujitsu.com>
3Date: Mon, 11 Sep 2023 09:00:39 +0000
4Subject: [PATCH] Fix const qualifier error
5
6Fixes clang error
7error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const void *)' [-Wincompatible-function-pointer-types]
8| obj->fnObjectNew = uwac_event_clone;
9| ^ ~~~~~~~~~~~~~~~~
10
11https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8
12Upstream-Status: Backport
13
14Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
15---
16 libfreerdp/codec/rfx.c | 4 ++--
17 winpr/include/winpr/collections.h | 2 +-
18 2 files changed, 3 insertions(+), 3 deletions(-)
19
20diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
21index ccbc5af..eec7365 100644
22--- a/libfreerdp/codec/rfx.c
23+++ b/libfreerdp/codec/rfx.c
24@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj)
25 }
26 }
27
28-static void* rfx_decoder_tile_new(void* val)
29+static void* rfx_decoder_tile_new(const void* val)
30 {
31 RFX_TILE* tile = NULL;
32 WINPR_UNUSED(val);
33@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj)
34 }
35 }
36
37-static void* rfx_encoder_tile_new(void* val)
38+static void* rfx_encoder_tile_new(const void* val)
39 {
40 WINPR_UNUSED(val);
41 return calloc(1, sizeof(RFX_TILE));
42diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h
43index 807f011..b8c8d9d 100644
44--- a/winpr/include/winpr/collections.h
45+++ b/winpr/include/winpr/collections.h
46@@ -36,7 +36,7 @@ extern "C"
47 {
48 #endif
49
50- typedef void* (*OBJECT_NEW_FN)(void* val);
51+ typedef void* (*OBJECT_NEW_FN)(const void* val);
52 typedef void (*OBJECT_INIT_FN)(void* obj);
53 typedef void (*OBJECT_UNINIT_FN)(void* obj);
54 typedef void (*OBJECT_FREE_FN)(void* obj);
55--
562.34.1
57
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
deleted file mode 100644
index 62600cddab..0000000000
--- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001
2From: Armin Novak <armin.novak@thincast.com>
3Date: Tue, 22 Feb 2022 12:05:08 +0100
4Subject: [PATCH] Fixed compilation warnings in ainput channel
5
6Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel]
7Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
8---
9 channels/ainput/server/ainput_main.c | 18 ++++++++++++------
10 1 file changed, 12 insertions(+), 6 deletions(-)
11
12diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c
13index bc1737ee1..17d2ec681 100644
14--- a/channels/ainput/server/ainput_main.c
15+++ b/channels/ainput/server/ainput_main.c
16@@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s)
17
18 static HANDLE ainput_server_get_channel_handle(ainput_server* ainput)
19 {
20- BYTE* buffer = NULL;
21+ void* buffer = NULL;
22 DWORD BytesReturned = 0;
23 HANDLE ChannelEvent = NULL;
24
25@@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm)
26 goto fail;
27 return &ainput->context;
28 fail:
29- ainput_server_context_free(ainput);
30+ ainput_server_context_free(&ainput->context);
31 return NULL;
32 }
33
34@@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context)
35 break;
36 case AINPUT_OPENED:
37 {
38- BYTE* buffer = NULL;
39+ union
40+ {
41+ BYTE* pb;
42+ void* pv;
43+ } buffer;
44 DWORD BytesReturned = 0;
45
46- if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer,
47+ buffer.pv = NULL;
48+
49+ if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv,
50 &BytesReturned) != TRUE)
51 {
52 WLog_ERR(TAG, "WTSVirtualChannelReady failed,");
53 }
54 else
55 {
56- if (*buffer != 0)
57+ if (*buffer.pb != 0)
58 {
59 error = ainput_server_send_version(ainput);
60 if (error)
61@@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context)
62 else
63 error = CHANNEL_RC_OK;
64 }
65- WTSFreeMemory(buffer);
66+ WTSFreeMemory(buffer.pv);
67 }
68 break;
69 case AINPUT_VERSION_SENT:
70--
712.43.0
72
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
deleted file mode 100644
index 7fae2703f8..0000000000
--- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 75fa1fa5bd5ef2350390564245fd0984209ac092 Mon Sep 17 00:00:00 2001
2From: akallabeth <akallabeth@posteo.net>
3Date: Mon, 4 Jul 2022 14:34:46 +0200
4Subject: [PATCH] Fixed compilation warnings
5
6Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2da280b8a1748052b70b3f5a1ef0d8e932c33adc]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 client/X11/xf_graphics.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
13index 5aa1fd48b..fe81e0ed9 100644
14--- a/client/X11/xf_graphics.c
15+++ b/client/X11/xf_graphics.c
16@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer)
17
18 #endif
19 fail:
20- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1);
21+ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL);
22 return rc;
23 }
24
25--
262.45.0
27
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
index dff3f6dafe..2cc8dc6cf2 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
@@ -15,14 +15,12 @@ RDEPENDS:${PN}-ptest += "coreutils pcsc-lite-lib"
15PE = "1" 15PE = "1"
16PKGV = "${GITPKGVTAG}" 16PKGV = "${GITPKGVTAG}"
17 17
18SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f" 18SRCREV = "9b678b6d5a40ce01607d8c3b1b1416437c8416c4"
19SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ 19SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
20 file://run-ptest \ 20 file://run-ptest \
21 file://winpr-makecert-Build-with-install-RPATH.patch \ 21 file://winpr-makecert-Build-with-install-RPATH.patch \
22 file://0001-Fixed-compilation-warnings.patch \
23 file://0001-Fix-const-qualifier-error.patch \
24 file://0002-Do-not-install-tools-a-CMake-targets.patch \ 22 file://0002-Do-not-install-tools-a-CMake-targets.patch \
25 file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ 23 file://0001-Fix-compilation-error.patch \
26 file://CVE-2024-32661.patch \ 24 file://CVE-2024-32661.patch \
27 file://CVE-2026-22854.patch \ 25 file://CVE-2026-22854.patch \
28 file://CVE-2026-22855.patch \ 26 file://CVE-2026-22855.patch \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-03-29 22:10:06 +0000