diff options
| -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 @@ | |||
| 1 | From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
| 3 | Date: Mon, 11 Sep 2023 09:00:39 +0000 | ||
| 4 | Subject: [PATCH] Fix const qualifier error | ||
| 5 | |||
| 6 | Fixes clang error | ||
| 7 | error: 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 | |||
| 11 | https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8 | ||
| 12 | Upstream-Status: Backport | ||
| 13 | |||
| 14 | Signed-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 | |||
| 20 | diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c | ||
| 21 | index 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)); | ||
| 42 | diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h | ||
| 43 | index 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 | -- | ||
| 56 | 2.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 | |||
| 13 | PE = "1" | 13 | PE = "1" |
| 14 | PKGV = "${GITPKGVTAG}" | 14 | PKGV = "${GITPKGVTAG}" |
| 15 | 15 | ||
| 16 | SRCREV = "7471ae383e7b7a613f275e19f7b54958a193c891" | 16 | SRCREV = "1384b3c33b9bd7599633cc54bf20cf20ec6be83c" |
| 17 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ | 17 | SRC_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 | ||
| 21 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
