SHA256
1
0
forked from pool/freerdp

- added freerdp-fix-linking-with-libpulse.patch in order to link

correctly with libpulse
  (https://github.com/FreeRDP/FreeRDP/issues/418, bnc#785437)

OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=25
This commit is contained in:
Guido Berhoerster 2012-10-17 15:09:00 +00:00 committed by Git OBS Bridge
parent 38014a345e
commit ccb2e858e0
3 changed files with 63 additions and 0 deletions

View File

@ -0,0 +1,53 @@
From c10866db66c0d462ea7c2c38bb01740bcfb4fcb4 Mon Sep 17 00:00:00 2001
From: Slava Dubrovskiy <dubrsl@altlinux.org>
Date: Tue, 14 Feb 2012 13:44:00 -0500
Subject: [PATCH 002/939] Fix not linked with libpulse (issue 418)
Signed-off-by: Slava Dubrovskiy <dubrsl@altlinux.org>
---
channels/drdynvc/audin/pulse/CMakeLists.txt | 2 +-
channels/drdynvc/tsmf/pulse/CMakeLists.txt | 2 +-
channels/rdpsnd/pulse/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/channels/drdynvc/audin/pulse/CMakeLists.txt b/channels/drdynvc/audin/pulse/CMakeLists.txt
index 10d6afe..fd6e25e 100644
--- a/channels/drdynvc/audin/pulse/CMakeLists.txt
+++ b/channels/drdynvc/audin/pulse/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(audin_pulse ${AUDIN_PULSE_SRCS})
set_target_properties(audin_pulse PROPERTIES PREFIX "")
target_link_libraries(audin_pulse freerdp-utils)
-target_link_libraries(audin_pulse ${PULSE_LIBRARIES})
+target_link_libraries(audin_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS audin_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
diff --git a/channels/drdynvc/tsmf/pulse/CMakeLists.txt b/channels/drdynvc/tsmf/pulse/CMakeLists.txt
index 373d4d3..144b5ff 100644
--- a/channels/drdynvc/tsmf/pulse/CMakeLists.txt
+++ b/channels/drdynvc/tsmf/pulse/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(tsmf_pulse ${TSMF_PULSE_SRCS})
set_target_properties(tsmf_pulse PROPERTIES PREFIX "")
target_link_libraries(tsmf_pulse freerdp-utils)
-target_link_libraries(tsmf_pulse ${PULSE_LIBRARIES})
+target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS tsmf_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
diff --git a/channels/rdpsnd/pulse/CMakeLists.txt b/channels/rdpsnd/pulse/CMakeLists.txt
index 4460daf..bac3e51 100644
--- a/channels/rdpsnd/pulse/CMakeLists.txt
+++ b/channels/rdpsnd/pulse/CMakeLists.txt
@@ -28,6 +28,6 @@ add_library(rdpsnd_pulse ${RDPSND_PULSE_SRCS})
set_target_properties(rdpsnd_pulse PROPERTIES PREFIX "")
target_link_libraries(rdpsnd_pulse freerdp-utils)
-target_link_libraries(rdpsnd_pulse ${PULSE_LIBRARIES})
+target_link_libraries(rdpsnd_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS rdpsnd_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
--
1.7.10.4

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 17 15:04:32 UTC 2012 - gber@opensuse.org
- added freerdp-fix-linking-with-libpulse.patch in order to link
correctly with libpulse
(https://github.com/FreeRDP/FreeRDP/issues/418, bnc#785437)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 29 14:01:04 UTC 2012 - zawertun@gmail.com Sun Apr 29 14:01:04 UTC 2012 - zawertun@gmail.com

View File

@ -32,6 +32,8 @@ Patch0: freerdp-fix-bitmap-cache.patch
Patch1: freerdp-fix-FindPCSC-macro.patch Patch1: freerdp-fix-FindPCSC-macro.patch
# PATCH-FIX-UPSTREAM freerdp-fix-numlock-behavior.patch https://github.com/FreeRDP/FreeRDP/pull/564 zawertun@gmail.com -- Fix incorrect num lock state when connecting # PATCH-FIX-UPSTREAM freerdp-fix-numlock-behavior.patch https://github.com/FreeRDP/FreeRDP/pull/564 zawertun@gmail.com -- Fix incorrect num lock state when connecting
Patch2: freerdp-fix-incorrect-numlock-state.patch Patch2: freerdp-fix-incorrect-numlock-state.patch
# PATCH-FIX-UPSTREAM freerdp-fix-linking-with-libpulse.patch https://github.com/FreeRDP/FreeRDP/issues/418 gber@opensuse.org -- Link the pulseaudio plugins with libpulse
Patch3: freerdp-fix-linking-with-libpulse.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: ed BuildRequires: ed
@ -82,6 +84,7 @@ based on libfreerdp.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# use a versioned subdirectory for plugins in order to comply with the shared # use a versioned subdirectory for plugins in order to comply with the shared
# library policy # library policy
ed -s CMakeLists.txt 2>/dev/null <<'EOF' ed -s CMakeLists.txt 2>/dev/null <<'EOF'