summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-09-11 17:07:03 +0800
committerKhem Raj <raj.khem@gmail.com>2023-09-11 08:25:05 -0700
commit132b4ae76f6f45f520007e6cdf8e29ffa29cf0e8 (patch)
tree3486b7bff79da5d1caa1cae12d2255c6dc1f2164
parent074fb0411d1accfeb28307cf2e2523c045445625 (diff)
downloadmeta-openembedded-132b4ae76f6f45f520007e6cdf8e29ffa29cf0e8.tar.gz
freerdp: upgrade 2.10.0 -> 2.11.0
0001-Fix-const-qualifier-error.patch added to fix error with clang Changelog: =========== Noteworthy changes: * Various input validation fixes * Added various CMake options #9317 * LibreSSL build fixes #8709 Fixed issues: * Backported #9233: Big endian support * Backported #9099: Mouse grabbing support * Backported #6851: wayland scrolling fix * Backported #8690: Update h264 to use new FFMPEG API * Backported #7306: early bail from update_read_window_state_order breaks protocol * Backported #8903: rdpecam/server: Remove wrong assertion * Backported #8994: bounds checks for gdi/gfx rectangles * Backported #9023: enforce rdpdr client side state checks * Backported #6331: deactivate mouse grabbing by default * Cherry-pick out of #9172: channels/cliprdr: Fix writing incorrect PDU type for unlock PDUs Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch57
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp_2.11.0.bb (renamed from meta-oe/recipes-support/freerdp/freerdp_2.10.0.bb)3
2 files changed, 59 insertions, 1 deletions
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
new file mode 100644
index 0000000000..87a456d16d
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
@@ -0,0 +1,57 @@
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_2.10.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.0.bb
index 4cb452608e..4a5a763c8e 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.10.0.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.0.bb
@@ -13,9 +13,10 @@ inherit pkgconfig cmake gitpkgv
13PE = "1" 13PE = "1"
14PKGV = "${GITPKGVTAG}" 14PKGV = "${GITPKGVTAG}"
15 15
16SRCREV = "7471ae383e7b7a613f275e19f7b54958a193c891" 16SRCREV = "1384b3c33b9bd7599633cc54bf20cf20ec6be83c"
17SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ 17SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
18 file://winpr-makecert-Build-with-install-RPATH.patch \ 18 file://winpr-makecert-Build-with-install-RPATH.patch \
19 file://0001-Fix-const-qualifier-error.patch \
19 " 20 "
20 21
21S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"