diff mbox series

[meta-oe,8/8] freerdp3: upgrade 3.30.0 -> 3.32.1

Message ID 20260928175656.3501512-8-ankur.tyagi85@gmail.com
State New
Headers show
Series [meta-oe,1/8] imagemagick: upgrade 7.1.2-30 -> 7.1.2-32 | expand

Commit Message

Ankur Tyagi Sept. 28, 2026, 5:56 p.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Changelog:
https://github.com/FreeRDP/FreeRDP/releases/tag/3.31.0
https://github.com/FreeRDP/FreeRDP/releases/tag/3.31.1
https://github.com/FreeRDP/FreeRDP/releases/tag/3.32.0
https://github.com/FreeRDP/FreeRDP/releases/tag/3.32.1

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...1-winpr-tools-link-only-winpr-public.patch | 76 +++++++++++++++++++
 ...{freerdp3_3.30.0.bb => freerdp3_3.32.1.bb} |  3 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/freerdp/freerdp3/0001-winpr-tools-link-only-winpr-public.patch
 rename meta-oe/recipes-support/freerdp/{freerdp3_3.30.0.bb => freerdp3_3.32.1.bb} (98%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/freerdp/freerdp3/0001-winpr-tools-link-only-winpr-public.patch b/meta-oe/recipes-support/freerdp/freerdp3/0001-winpr-tools-link-only-winpr-public.patch
new file mode 100644
index 0000000000..2dea69c3c4
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp3/0001-winpr-tools-link-only-winpr-public.patch
@@ -0,0 +1,76 @@ 
+From 6682e9ca667271b8ba148a301b4a2f9ac78be2b9 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Mon, 28 Sep 2026 11:57:22 +0200
+Subject: [PATCH] [winpr,tools] link only winpr public
+
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/6682e9ca667271b8ba148a301b4a2f9ac78be2b9]
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ winpr/tools/CMakeLists.txt          | 18 +++++++++++++-----
+ winpr/tools/makecert/CMakeLists.txt |  6 +++---
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
+index 5719c1c65..225b70744 100644
+--- a/winpr/tools/CMakeLists.txt
++++ b/winpr/tools/CMakeLists.txt
+@@ -28,7 +28,8 @@ set(WINPR_TOOLS_API_VERSION "${WINPR_TOOLS_VERSION_MAJOR}")
+ 
+ set(WINPR_TOOLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ set(WINPR_TOOLS_SRCS "")
+-set(WINPR_TOOLS_LIBS "")
++set(WINPR_TOOLS_PUBLIC_LIBS "")
++set(WINPR_TOOLS_PRIVATE_LIBS "")
+ set(WINPR_TOOLS_INCLUDES "")
+ set(WINPR_TOOLS_DEFINITIONS "")
+ 
+@@ -64,11 +65,18 @@ macro(winpr_tools_include_directory_add)
+   endif()
+ endmacro()
+ 
+-macro(winpr_tools_library_add)
++macro(winpr_tools_library_public_add)
+   foreach(_lib ${ARGN})
+-    list(APPEND WINPR_TOOLS_LIBS "${_lib}")
++    list(APPEND WINPR_TOOLS_PUBLIC_LIBS "${_lib}")
+   endforeach()
+-  set(WINPR_TOOLS_LIBS ${WINPR_TOOLS_LIBS} PARENT_SCOPE)
++  set(WINPR_TOOLS_PUBLIC_LIBS ${WINPR_TOOLS_PUBLIC_LIBS} PARENT_SCOPE)
++endmacro()
++
++macro(winpr_tools_library_private_add)
++  foreach(_lib ${ARGN})
++    list(APPEND WINPR_TOOLS_PRIVATE_LIBS "${_lib}")
++  endforeach()
++  set(WINPR_TOOLS_PRIVATE_LIBS ${WINPR_TOOLS_PRIVATE_LIBS} PARENT_SCOPE)
+ endmacro()
+ 
+ macro(winpr_tools_definition_add)
+@@ -89,7 +97,7 @@ addtargetwithresourcefile(${MODULE_NAME} FALSE "${WINPR_VERSION}" WINPR_TOOLS_SR
+ 
+ add_compile_definitions(${WINPR_DEFINITIONS})
+ target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
+-target_link_libraries(${MODULE_NAME} PUBLIC ${WINPR_TOOLS_LIBS})
++target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_PRIVATE_LIBS} PUBLIC ${WINPR_TOOLS_PUBLIC_LIBS})
+ 
+ installwithrpath(
+   TARGETS
+diff --git a/winpr/tools/makecert/CMakeLists.txt b/winpr/tools/makecert/CMakeLists.txt
+index 37b831125..0af1fcc08 100644
+--- a/winpr/tools/makecert/CMakeLists.txt
++++ b/winpr/tools/makecert/CMakeLists.txt
+@@ -31,11 +31,11 @@ endif()
+ winpr_tools_module_add(${${MODULE_PREFIX}_SRCS})
+ 
+ if(OPENSSL_FOUND)
+-  list(APPEND ${MODULE_PREFIX}_LIBS ${OPENSSL_LIBRARIES})
++  winpr_tools_library_private_add(${OPENSSL_LIBRARIES})
+ endif()
+ 
+ if(MBEDTLS_FOUND)
+-  list(APPEND ${MODULE_PREFIX}_LIBS ${MBEDTLS_LIBRARIES})
++  winpr_tools_library_private_add(${MBEDTLS_LIBRARIES})
+ endif()
+ 
+-winpr_tools_library_add(${${MODULE_PREFIX}_LIBS} winpr)
++winpr_tools_library_public_add(winpr)
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.30.0.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.32.1.bb
similarity index 98%
rename from meta-oe/recipes-support/freerdp/freerdp3_3.30.0.bb
rename to meta-oe/recipes-support/freerdp/freerdp3_3.32.1.bb
index c839f7b7a1..f43c8cc7d2 100644
--- a/meta-oe/recipes-support/freerdp/freerdp3_3.30.0.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp3_3.32.1.bb
@@ -8,8 +8,9 @@  RDEPENDS:${PN}-ptest += "cmake coreutils"
 
 inherit pkgconfig cmake ptest
 
-SRCREV = "6b107f0aadbabc47941c5a5b893b88c01792af6d"
+SRCREV = "bf217a504e54cc719880c228e82353382cd7d4fa"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;nobranch=1;protocol=https;tag=${PV} \
+           file://0001-winpr-tools-link-only-winpr-public.patch \
            file://run-ptest"