[SCM] vlc/master: Revert "Disable freerdp plugin"

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9822c0ca528d17765297c8fd84ab14246b5dfc15
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Oct 21 06:30:47 2014 +0200

    Revert "Disable freerdp plugin"
    
    This reverts commit 707628bd4545ea58752b59bdc8b3f4117dbf8a19.
    
    Closes: #764294

diff --git a/debian/control b/debian/control
index 9c39390..8c0615b 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Build-Depends: autopoint,
                libfaad-dev,
                libflac-dev (>= 1.1.2-3),
                libfluidsynth-dev (>= 1.1.2),
+               libfreerdp-dev (>= 1.0.1),
                libfreetype6-dev,
                libfribidi-dev,
                libgl1-mesa-dev,
diff --git a/debian/rules b/debian/rules
index e8d7ab6..247bfdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ confflags += \
 	--enable-faad \
 	--enable-flac \
 	--enable-fluidsynth \
+	--enable-freerdp \
 	--enable-freetype \
 	--enable-fribidi \
 	--enable-gles1 \
@@ -108,7 +109,6 @@ confflags += \
 # decklink -> not in Debian
 # dxva2 -> Windows only
 # fdkaac -> in Debian non-free
-# freerdp -> currently broken (#757605, #762591 and others)
 # gnomevfs -> poorly maintained
 # goom -> not in Debian
 # libtar -> security issue (#737534)
@@ -125,7 +125,6 @@ confflags += \
 	--disable-decklink \
 	--disable-dxva2 \
 	--disable-fdkaac \
-	--disable-freerdp \
 	--disable-gnomevfs \
 	--disable-goom \
 	--disable-libtar \
diff --git a/debian/vlc.install.in b/debian/vlc.install.in
index 022c603..0990576 100644
--- a/debian/vlc.install.in
+++ b/debian/vlc.install.in
@@ -2,6 +2,7 @@ usr/bin/qvlc
 usr/bin/svlc
 usr/lib/vlc/libvlc_vdpau.so*
 usr/lib/vlc/plugins/access/libpulsesrc_plugin.so
+usr/lib/vlc/plugins/access/librdp_plugin.so
 usr/lib/vlc/plugins/access/libvnc_plugin.so
 usr/lib/vlc/plugins/access/libxcb_screen_plugin.so
 usr/lib/vlc/plugins/audio_output/libpulse_plugin.so

-- 
VLC media player packaging