Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package freerdp for openSUSE:Factory checked in at 2022-12-18 17:22:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freerdp (Old) and /work/SRC/openSUSE:Factory/.freerdp.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freerdp" Sun Dec 18 17:22:25 2022 rev:63 rq:1043598 version:2.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/freerdp/freerdp.changes 2022-12-12 17:37:09.700411920 +0100 +++ /work/SRC/openSUSE:Factory/.freerdp.new.1835/freerdp.changes 2022-12-18 17:22:29.289298177 +0100 @@ -1,0 +2,7 @@ +Fri Dec 16 12:11:10 UTC 2022 - Hans-Peter Jansen <h...@urpla.net> + +- Complement fix for -DBUILTIN_CHANNELS=OFF to fix freerdp-proxy + accessing librdpgfx-client.so: freerdp-fix-rpath-settings.diff + Fixes second part of bnc#1205595. + +------------------------------------------------------------------- New: ---- freerdp-fix-rpath-settings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freerdp.spec ++++++ --- /var/tmp/diff_new_pack.0gnqgA/_old 2022-12-18 17:22:29.957302037 +0100 +++ /var/tmp/diff_new_pack.0gnqgA/_new 2022-12-18 17:22:29.961302060 +0100 @@ -51,6 +51,8 @@ Patch0: freerdp-builtin-channels-off-link-fix.diff # PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/pull/7476 Patch1: 0001-Make-H.264-codec-optional-during-runtime.patch +# PATCH-FIX-UPSTREAM https://github.com/FreeRDP/FreeRDP/pull/8551 -- slightly modified: see -DWITH_PLUGIN_RPATH_ONLY +Patch2: freerdp-fix-rpath-settings.diff BuildRequires: chrpath BuildRequires: cmake >= 2.8 BuildRequires: cups-devel @@ -209,12 +211,12 @@ %cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ - -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DWITH_ALSA=ON \ -DWITH_CAIRO=ON \ -DWITH_CUPS=ON \ -DWITH_CHANNELS=ON -DBUILTIN_CHANNELS=OFF \ + -DWITH_PLUGIN_RPATH_ONLY=ON \ -DWITH_CLIENT=ON \ -DWITH_DIRECTFB=OFF \ -DWITH_FFMPEG=%{?_with_ffmpeg:ON}%{?!_with_ffmpeg:OFF} \ ++++++ freerdp-builtin-channels-off-link-fix.diff ++++++ --- /var/tmp/diff_new_pack.0gnqgA/_old 2022-12-18 17:22:29.997302268 +0100 +++ /var/tmp/diff_new_pack.0gnqgA/_new 2022-12-18 17:22:30.001302292 +0100 @@ -1,27 +1,37 @@ ---- FreeRDP-2.4.0/channels/video/client/CMakeLists.txt~ 2021-07-27 11:58:27.000000000 +0200 -+++ FreeRDP-2.4.0/channels/video/client/CMakeLists.txt 2021-08-20 10:35:04.496719927 +0200 -@@ -26,7 +26,8 @@ include_directories(..) +Index: b/channels/video/client/CMakeLists.txt +=================================================================== +--- a/channels/video/client/CMakeLists.txt ++++ b/channels/video/client/CMakeLists.txt +@@ -26,7 +26,10 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") - -+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client) -+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpgfx-client) ++if (NOT BUILTIN_CHANNELS) ++ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client) ++ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpgfx-client) ++endif() set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) ---- FreeRDP-2.4.0/channels/rdpsnd/client/proxy/CMakeLists.txt~ 2021-07-27 11:58:27.000000000 +0200 -+++ FreeRDP-2.4.0/channels/rdpsnd/client/proxy/CMakeLists.txt 2021-08-20 13:45:38.459395909 +0200 -@@ -25,6 +25,7 @@ include_directories(..) +Index: b/channels/rdpsnd/client/proxy/CMakeLists.txt +=================================================================== +--- a/channels/rdpsnd/client/proxy/CMakeLists.txt ++++ b/channels/rdpsnd/client/proxy/CMakeLists.txt +@@ -25,6 +25,9 @@ include_directories(..) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -+list(APPEND ${MODULE_PREFIX}_LIBS freerdp-client) ++if (NOT BUILTIN_CHANNELS) ++ list(APPEND ${MODULE_PREFIX}_LIBS freerdp-client) ++endif() list(APPEND ${MODULE_PREFIX}_LIBS freerdp) list(APPEND ${MODULE_PREFIX}_LIBS winpr) ---- FreeRDP-2.4.0/channels/rdp2tcp/client/CMakeLists.txt~ 2021-07-27 11:58:27.000000000 +0200 -+++ FreeRDP-2.4.0/channels/rdp2tcp/client/CMakeLists.txt 2021-08-21 13:15:02.847667180 +0200 +Index: b/channels/rdp2tcp/client/CMakeLists.txt +=================================================================== +--- a/channels/rdp2tcp/client/CMakeLists.txt ++++ b/channels/rdp2tcp/client/CMakeLists.txt @@ -22,6 +22,6 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "VirtualChannelEntryEx") ++++++ freerdp-fix-rpath-settings.diff ++++++ Index: b/CMakeLists.txt =================================================================== --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -990,7 +990,16 @@ if (APPLE) else (APPLE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) if (NOT FREEBSD) - set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..") + if (NOT BUILTIN_CHANNELS) + if (NOT DEFINED WITH_PLUGIN_RPATH_ONLY) + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../${FREERDP_PLUGIN_PATH}") + else() + # we need to install this run path, even if not using RPATH in general + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${FREERDP_PLUGIN_PATH}") + endif() + else() + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..") + endif() endif() endif(APPLE)
