tags 672604 + fixed-upstream patch
thanks

Package: freerdp-x11
Version: 1.0.1-1.1
Followup-For: Bug #672604

The attached patch enables the explicit selection of PulseAudio and
applies a fix from upstream to correct the PulseAudio detection [1].

The locally built package with this changes applied fixes the issue.

$ ls -l /usr/lib/*/freerdp/rdpsnd_pulse.so
-rw-r--r-- 1 root root 13816 Jul 23 16:25
/usr/lib/i386-linux-gnu/freerdp/rdpsnd_pulse.so

Thanks,
  Philipp

[1] https://github.com/FreeRDP/FreeRDP/issues/418

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'),
(100, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.4-trunk-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) (ignored:
LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages freerdp-x11 depends on:
ii  libc6         2.13-35
ii  libfreerdp1   1.0.1-1.1
ii  libssl1.0.0   1.0.1c-3
ii  libx11-6      2:1.5.0-1
ii  libxcursor1   1:1.1.13-1
ii  libxext6      2:1.3.1-2
ii  libxinerama1  2:1.1.2-1
ii  libxkbfile1   1:1.0.8-1
ii  libxv1        2:1.0.7-1
ii  zlib1g        1:1.2.7.dfsg-13

Versions of packages freerdp-x11 recommends:
ii  libfreerdp-plugins-standard  1.0.1-1.1

freerdp-x11 suggests no packages.

-- no debconf information
diff -Nru freerdp-1.0.1/debian/patches/01-libpulse-fix.patch freerdp-1.0.1/debian/patches/01-libpulse-fix.patch
--- freerdp-1.0.1/debian/patches/01-libpulse-fix.patch	1970-01-01 01:00:00.000000000 +0100
+++ freerdp-1.0.1/debian/patches/01-libpulse-fix.patch	2012-07-23 16:16:25.000000000 +0200
@@ -0,0 +1,46 @@
+Subject: Use PULSEAUDIO_INCLUDE_DIR instead of PULSE_INCLUDE_DIRS
+From: Scott Tsai <scottt...@gmail.com>
+Date: Fri, 27 Apr 2012 01:14:21 +0800
+Origin: upstream, https://github.com/FreeRDP/FreeRDP/commit/36a37cc7525175c18a35ac73734890268bdc9ae6
+Bug: https://github.com/FreeRDP/FreeRDP/issues/418
+Bug-Debian: http://bugs.debian.org/672604
+
+---
+ channels/drdynvc/audin/pulse/CMakeLists.txt |    2 +-
+ channels/drdynvc/tsmf/pulse/CMakeLists.txt  |    2 +-
+ channels/rdpsnd/pulse/CMakeLists.txt        |    2 +-
+ cmake/FindPulseAudio.cmake                  |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/channels/drdynvc/audin/pulse/CMakeLists.txt
++++ b/channels/drdynvc/audin/pulse/CMakeLists.txt
+@@ -28,7 +28,7 @@
+ 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})
+ 
+--- a/channels/drdynvc/tsmf/pulse/CMakeLists.txt
++++ b/channels/drdynvc/tsmf/pulse/CMakeLists.txt
+@@ -28,7 +28,7 @@
+ 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})
+ 
+--- a/channels/rdpsnd/pulse/CMakeLists.txt
++++ b/channels/rdpsnd/pulse/CMakeLists.txt
+@@ -28,6 +28,6 @@
+ 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})
diff -Nru freerdp-1.0.1/debian/patches/series freerdp-1.0.1/debian/patches/series
--- freerdp-1.0.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ freerdp-1.0.1/debian/patches/series	2012-05-22 17:05:01.000000000 +0200
@@ -0,0 +1 @@
+01-libpulse-fix.patch
diff -Nru freerdp-1.0.1/debian/rules freerdp-1.0.1/debian/rules
--- freerdp-1.0.1/debian/rules	2012-02-01 02:50:00.000000000 +0100
+++ freerdp-1.0.1/debian/rules	2012-07-23 16:22:11.000000000 +0200
@@ -3,6 +3,9 @@
 %:
 	dh ${@}
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DWITH_PULSEAUDIO=ON
+
 override_dh_install:
 	# Removing unused files
 	rm -f debian/tmp/usr/lib/*.la

Reply via email to