spaced30/freerdp
SHA256
1
0
Fork 0
forked from pool/freerdp
Code Pull Requests Activity

Accepting request 1043598 from X11:RemoteDesktop

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1043598
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freerdp?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2022-12-18 16:22:25 +00:00 committed by Git OBS Bridge
commit af48282876
4 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
freerdp-builtin-channels-off-link-fix.diff
View File

@ -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")

22
freerdp-fix-rpath-settings.diff Normal file
View File

@ -0,0 +1,22 @@
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)

7
freerdp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 16 12:11:10 UTC 2022 - Hans-Peter Jansen <hpj@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.
-------------------------------------------------------------------
Sun Dec 11 06:01:28 UTC 2022 - Konstantin Voinov <kv@kott.no-ip.biz>

4
freerdp.spec
View File

@ -51,6 +51,8 @@ Source1: freerdp-rpmlintrc
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 @@ export CFLAGS="%{optflags} -fPIE -pie"
%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} \