Bug#850658: Build weston RDP compositor in Sid

[john.r.moser@gmail.com]

Package:  weston

This debdiff enables building of the Weston rdp compositor in Sid.  It
produces a separate package, as that has dependencies on freerdp2.

Originally produced on Ubuntu Zesty, re launchpad:

https://bugs.launchpad.net/ubuntu/+source/weston/+bug/1654864

diff -u weston-1.12.0/debian/changelog weston-1.12.0/debian/changelog
--- weston-1.12.0/debian/changelog
+++ weston-1.12.0/debian/changelog
@@ -1,3 +1,12 @@
+weston (1.12.0-2) unstable; urgency=medium
+
+  * d/control:
+    + Create weston-rdp-backend package
+    + Add freerdp2-dev to build depends
+  * Build rdp compositor
+
+ -- John Moser <john.r.moser@gmail.com>  Sun, 08 Jan 2017 09:02:17 -0500
+
 weston (1.12.0-1) unstable; urgency=medium
 
   * New upstream release. Closes: #841735.
diff -u weston-1.12.0/debian/control weston-1.12.0/debian/control
--- weston-1.12.0/debian/control
+++ weston-1.12.0/debian/control
@@ -39,6 +39,7 @@
  libsystemd-dev,
  libinput-dev (>= 0.8.0),
  wayland-protocols (>= 1.7),
+ freerdp2-dev,
 Standards-Version: 3.9.8
 Homepage: http://wayland.freedesktop.org/
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/weston
@@ -102,0 +104,16 @@
+
+Package: weston-rdp-compositor
+Architecture: linux-any
+Depends:
+ weston,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Recommends:
+Description: reference implementation of a wayland compositor
+ Part of the Wayland project is also the Weston reference implementation
+ of a Wayland compositor. Weston can run as an X client or under Linux
+ KMS and ships with a few demo clients. The Weston compositor is a minimal
+ and fast compositor and is suitable for many embedded and mobile use
+ cases. 
+ .
+ This package contains the RDP compositor for Wayland.
diff -u weston-1.12.0/debian/rules weston-1.12.0/debian/rules
--- weston-1.12.0/debian/rules
+++ weston-1.12.0/debian/rules
@@ -2,7 +2,8 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-libunwind --libexec=/usr/lib/weston \
-		--with-cairo=image --enable-libinput-backend
+		--with-cairo=image --enable-libinput-backend \
+		--enable-rdp-compositor
 
 override_dh_auto_test:
 	# the test suite does not 100% pass in headless mode
only in patch2:
unchanged:
--- weston-1.12.0.orig/debian/weston-rdp-compositor.install
+++ weston-1.12.0/debian/weston-rdp-compositor.install
@@ -0,0 +1 @@
+usr/lib/*/libweston-1/rdp-backend.so
only in patch2:
unchanged:
--- weston-1.12.0.orig/libweston/compositor-rdp.c
+++ weston-1.12.0/libweston/compositor-rdp.c
@@ -618,13 +618,13 @@
 	context->rfx_context->mode = RLGR3;
 	context->rfx_context->width = client->settings->DesktopWidth;
 	context->rfx_context->height = client->settings->DesktopHeight;
-	rfx_context_set_pixel_format(context->rfx_context, RDP_PIXEL_FORMAT_B8G8R8A8);
+	rfx_context_set_pixel_format(context->rfx_context, PIXEL_FORMAT_BGRA32);
 
 	context->nsc_context = nsc_context_new();
 	if (!context->nsc_context)
 		goto out_error_nsc;
 
-	nsc_context_set_pixel_format(context->nsc_context, RDP_PIXEL_FORMAT_B8G8R8A8);
+	nsc_context_set_pixel_format(context->nsc_context, PIXEL_FORMAT_BGRA32);
 
 	context->encode_stream = Stream_New(NULL, 65536);
 	if (!context->encode_stream)