libfreerdp/codec/codec_internal.h | 14 14 + 0 - 0 !
libfreerdp/codec/nsc_sse2.h | 3 2 + 1 - 0 !
libfreerdp/codec/rfx_neon.c | 4 2 + 2 - 0 !
libfreerdp/codec/rfx_neon.h | 3 2 + 1 - 0 !
libfreerdp/codec/rfx_sse2.h | 3 2 + 1 - 0 !
libfreerdp/primitives/prim_alphaComp_opt.c | 4 2 + 2 - 0 !
libfreerdp/primitives/prim_colors_opt.c | 8 4 + 4 - 0 !
libfreerdp/primitives/prim_internal.h | 5 5 + 0 - 0 !
libfreerdp/primitives/prim_set_opt.c | 8 4 + 4 - 0 !
libfreerdp/primitives/prim_sign_opt.c | 2 1 + 1 - 0 !
libfreerdp/primitives/prim_templates.h | 8 5 + 3 - 0 !
11 files changed, 43 insertions(+), 19 deletions(-)

 hide internal functions
 They are only used in the test suite and via function pointers. There is no
 need to expose them via the public ABI of libfreerdp-primitives and
 libfreerdp-codec.

freerdp.pc.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 add missing -lfreerdp-client

CMakeLists.txt | 2 2 + 0 - 0 !
include/CMakeLists.txt | 24 12 + 12 - 0 !
winpr/include/CMakeLists.txt | 2 1 + 1 - 0 !
3 files changed, 15 insertions(+), 13 deletions(-)

 make include path configurable for multi-arch installation targets

winpr/include/winpr/wtypes.h | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

---

client/common/file.c | 33 31 + 2 - 0 !
1 file changed, 31 insertions(+), 2 deletions(-)

---

winpr/libwinpr/crt/test/TestUnicodeConversion.c | 39 39 + 0 - 0 !
1 file changed, 39 insertions(+)

---

cmake/ConfigOptions.cmake | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 detect arm architecture correctly

CMakeLists.txt | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 cpu types arm64 and armhf need to be linked with -fpic.

cmake/FindFFmpeg.cmake | 6 4 + 2 - 0 !
1 file changed, 4 insertions(+), 2 deletions(-)

 use pkg-config to determine ffmpeg linker flags

client/common/cmdline.c | 12 8 + 4 - 0 !
client/common/compatibility.c | 70 53 + 17 - 0 !
client/common/test/CMakeLists.txt | 9 8 + 1 - 0 !
client/common/test/TestClientCmdLine.c | 113 113 + 0 - 0 !
4 files changed, 182 insertions(+), 22 deletions(-)

 command line parser fixes.

client/common/test/TestClientCmdLine.c | 5 5 + 0 - 0 !
libfreerdp/common/settings.c | 9 9 + 0 - 0 !
2 files changed, 14 insertions(+)

 [patch] settings: handle collection_add in detection case

Command line detection is run with dummy settings where not everything
is allocated. Collections (device, dynamic channel and static
channel) didn't handle this case properly.

(cherry picked from commit e9985c20938954f7df8f57b43c30c74c9d480dde)

Conflicts:
    client/common/test/TestClientCmdLine.c

libfreerdp/cache/glyph.c | 15 5 + 10 - 0 !
libfreerdp/core/orders.c | 4 2 + 2 - 0 !
libfreerdp/core/update.c | 2 2 + 0 - 0 !
3 files changed, 9 insertions(+), 12 deletions(-)

 [patch] core/glyph: copy data when adding glyph to cache

fixes #2439

(cherry picked from commit c99d9ee72bae06d19a15cce46eb4f3230a97f296)