diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-09-11 17:07:03 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-09-11 08:25:05 -0700 |
commit | 132b4ae76f6f45f520007e6cdf8e29ffa29cf0e8 (patch) | |
tree | 3486b7bff79da5d1caa1cae12d2255c6dc1f2164 /meta-oe | |
parent | 074fb0411d1accfeb28307cf2e2523c045445625 (diff) | |
download | meta-openembedded-contrib-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>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch | 57 | ||||
-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 @@ +From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Mon, 11 Sep 2023 09:00:39 +0000 +Subject: [PATCH] Fix const qualifier error + +Fixes clang error +error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const void *)' [-Wincompatible-function-pointer-types] +| obj->fnObjectNew = uwac_event_clone; +| ^ ~~~~~~~~~~~~~~~~ + +https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8 +Upstream-Status: Backport + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + libfreerdp/codec/rfx.c | 4 ++-- + winpr/include/winpr/collections.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c +index ccbc5af..eec7365 100644 +--- a/libfreerdp/codec/rfx.c ++++ b/libfreerdp/codec/rfx.c +@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj) + } + } + +-static void* rfx_decoder_tile_new(void* val) ++static void* rfx_decoder_tile_new(const void* val) + { + RFX_TILE* tile = NULL; + WINPR_UNUSED(val); +@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj) + } + } + +-static void* rfx_encoder_tile_new(void* val) ++static void* rfx_encoder_tile_new(const void* val) + { + WINPR_UNUSED(val); + return calloc(1, sizeof(RFX_TILE)); +diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h +index 807f011..b8c8d9d 100644 +--- a/winpr/include/winpr/collections.h ++++ b/winpr/include/winpr/collections.h +@@ -36,7 +36,7 @@ extern "C" + { + #endif + +- typedef void* (*OBJECT_NEW_FN)(void* val); ++ typedef void* (*OBJECT_NEW_FN)(const void* val); + typedef void (*OBJECT_INIT_FN)(void* obj); + typedef void (*OBJECT_UNINIT_FN)(void* obj); + typedef void (*OBJECT_FREE_FN)(void* obj); +-- +2.34.1 + 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 PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "7471ae383e7b7a613f275e19f7b54958a193c891" +SRCREV = "1384b3c33b9bd7599633cc54bf20cf20ec6be83c" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fix-const-qualifier-error.patch \ " S = "${WORKDIR}/git" |