From c47ade647ad594d93fddc32e0697900d98daefbf Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 30 Sep 2025 13:44:54 +0200 Subject: [PATCH] Silence abidiff Resolves: RHEL-86251 --- Use-default-threadpool.patch | 19 ++++++++++++------- freerdp.spec | 6 +++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Use-default-threadpool.patch b/Use-default-threadpool.patch index 4857328..d3940e3 100644 --- a/Use-default-threadpool.patch +++ b/Use-default-threadpool.patch @@ -158,36 +158,41 @@ diff --git a/libfreerdp/codec/rfx_types.h b/libfreerdp/codec/rfx_types.h index a9cd314da..c5a62259b 100644 --- a/libfreerdp/codec/rfx_types.h +++ b/libfreerdp/codec/rfx_types.h -@@ -69,12 +69,6 @@ struct S_RFX_CONTEXT_PRIV +@@ -69,11 +69,11 @@ struct S_RFX_CONTEXT_PRIV PTP_WORK* workObjects; RFX_TILE_COMPOSE_WORK_PARAM* tileWorkParams; - DWORD MinThreadCount; ++ DWORD MinThreadCount; /* Kept only to silence abidiff */ - DWORD MaxThreadCount; -- ++ DWORD MaxThreadCount; /* Kept only to silence abidiff */ + - PTP_POOL ThreadPool; ++ PTP_POOL ThreadPool; /* Kept only to silence abidiff */ - TP_CALLBACK_ENVIRON ThreadPoolEnv; -- ++ TP_CALLBACK_ENVIRON ThreadPoolEnv; /* Kept only to silence abidiff */ + wBufferPool* BufferPool; - /* profilers */ diff --git a/libfreerdp/codec/yuv.c b/libfreerdp/codec/yuv.c index 75d8a6a89..4025782dd 100644 --- a/libfreerdp/codec/yuv.c +++ b/libfreerdp/codec/yuv.c -@@ -55,12 +55,8 @@ struct S_YUV_CONTEXT +@@ -55,11 +55,11 @@ struct S_YUV_CONTEXT UINT32 width, height; BOOL useThreads; BOOL encoder; - UINT32 nthreads; ++ UINT32 nthreads; /* Kept only to silence abidiff */ UINT32 heightStep; - PTP_POOL threadPool; ++ PTP_POOL threadPool; /* Kept only to silence abidiff */ - TP_CALLBACK_ENVIRON ThreadPoolEnv; -- ++ TP_CALLBACK_ENVIRON ThreadPoolEnv; /* Kept only to silence abidiff */ + UINT32 work_object_count; PTP_WORK* work_objects; - YUV_ENCODE_WORK_PARAM* work_enc_params; @@ -166,16 +162,21 @@ BOOL yuv_context_reset(YUV_CONTEXT* WINPR_RESTRICT context, UINT32 width, UINT32 context->width = width; diff --git a/freerdp.spec b/freerdp.spec index 20a2225..95b9a6a 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -30,7 +30,7 @@ Name: freerdp Epoch: 2 Version: 3.10.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Free implementation of the Remote Desktop Protocol (RDP) # The effective license is Apache-2.0 but: @@ -378,6 +378,10 @@ find %{buildroot} -name "*.a" -delete %{_libdir}/pkgconfig/winpr-tools3.pc %changelog +* Tue Sep 30 2025 Marek Kasik - 2:3.10.3-5 +- Silence abidiff +- Resolves: RHEL-86251 + * Mon Sep 29 2025 Marek Kasik - 2:3.10.3-4 - Limit threadpool to 16 threads - Resolves: RHEL-86251