weston: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 1 +
debian/libweston-1-0.install | 1 +
debian/patches/01-freerdp2.patch | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 3 ++-
debian/weston.install | 1 +
7 files changed, 37 insertions(+), 1 deletion(-)
New commits:
commit eaefb37ded0e7ce619f40f66fc4a964392078a15
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Jan 16 23:46:56 2017 +0100
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index 7fa7e8c..9814962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-weston (1.12.0-2) UNRELEASED; urgency=medium
+weston (1.12.0-2) unstable; urgency=medium
* Enable RDP compositor and screen sharing. Closes: #775855, #850658.
* Fix build with freerdp2. Patch based on one from John Moser in #850658.
- -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 16 Jan 2017 19:45:58 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 16 Jan 2017 23:46:48 +0100
weston (1.12.0-1) unstable; urgency=medium
commit 12ed05987ceb7e160a66fed82b3a53400ed72db5
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Jan 16 20:01:29 2017 +0100
Fix build with freerdp2
diff --git a/debian/changelog b/debian/changelog
index 62eb7c1..7fa7e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
weston (1.12.0-2) UNRELEASED; urgency=medium
* Enable RDP compositor and screen sharing. Closes: #775855, #850658.
+ * Fix build with freerdp2. Patch based on one from John Moser in #850658.
-- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 16 Jan 2017 19:45:58 +0100
diff --git a/debian/patches/01-freerdp2.patch b/debian/patches/01-freerdp2.patch
new file mode 100644
index 0000000..dd94521
--- /dev/null
+++ b/debian/patches/01-freerdp2.patch
@@ -0,0 +1,24 @@
+--- a/libweston/compositor-rdp.c
++++ b/libweston/compositor-rdp.c
+@@ -618,13 +618,21 @@
+ context->rfx_context->mode = RLGR3;
+ context->rfx_context->width = client->settings->DesktopWidth;
+ context->rfx_context->height = client->settings->DesktopHeight;
++#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR == 1
+ rfx_context_set_pixel_format(context->rfx_context, RDP_PIXEL_FORMAT_B8G8R8A8);
++#else
++ rfx_context_set_pixel_format(context->rfx_context, PIXEL_FORMAT_BGRA32);
++#endif
+
+ context->nsc_context = nsc_context_new();
+ if (!context->nsc_context)
+ goto out_error_nsc;
+
++#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR == 1
+ nsc_context_set_pixel_format(context->nsc_context, RDP_PIXEL_FORMAT_B8G8R8A8);
++#else
++ nsc_context_set_pixel_format(context->nsc_context, PIXEL_FORMAT_BGRA32);
++#endif
+
+ context->encode_stream = Stream_New(NULL, 65536);
+ if (!context->encode_stream)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4549b5f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-freerdp2.patch
commit b416b343a07f099e02abad3cb598cbdf3eca2007
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Jan 16 19:47:04 2017 +0100
Enable RDP compositor
diff --git a/debian/changelog b/debian/changelog
index 0259650..62eb7c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+weston (1.12.0-2) UNRELEASED; urgency=medium
+
+ * Enable RDP compositor and screen sharing. Closes: #775855, #850658.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 16 Jan 2017 19:45:58 +0100
+
weston (1.12.0-1) unstable; urgency=medium
* New upstream release. Closes: #841735.
diff --git a/debian/control b/debian/control
index 60cade0..546e544 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,7 @@ Build-Depends:
libvpx-dev,
libsystemd-dev,
libinput-dev (>= 0.8.0),
+ freerdp2-dev,
wayland-protocols (>= 1.7),
Standards-Version: 3.9.8
Homepage: http://wayland.freedesktop.org/
diff --git a/debian/libweston-1-0.install b/debian/libweston-1-0.install
index 77518c3..a0c75cd 100644
--- a/debian/libweston-1-0.install
+++ b/debian/libweston-1-0.install
@@ -4,6 +4,7 @@ usr/lib/*/libweston-1/drm-backend.so
usr/lib/*/libweston-1/fbdev-backend.so
usr/lib/*/libweston-1/gl-renderer.so
usr/lib/*/libweston-1/headless-backend.so
+usr/lib/*/libweston-1/rdp-backend.so
usr/lib/*/libweston-1/wayland-backend.so
usr/lib/*/libweston-1/x11-backend.so
usr/lib/*/libweston-1/xwayland.so
diff --git a/debian/rules b/debian/rules
index bc4869b..e74d9af 100755
--- a/debian/rules
+++ b/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 --enable-screen-sharing
override_dh_auto_test:
# the test suite does not 100% pass in headless mode
diff --git a/debian/weston.install b/debian/weston.install
index d8b623b..7c6faa3 100644
--- a/debian/weston.install
+++ b/debian/weston.install
@@ -16,6 +16,7 @@ usr/lib/*/weston/desktop-shell.so
usr/lib/*/weston/fullscreen-shell.so
usr/lib/*/weston/hmi-controller.so
usr/lib/*/weston/ivi-shell.so
+usr/lib/*/weston/screen-share.so
usr/share/man/man1/weston.1
usr/share/man/man5/weston.ini.5
usr/share/man/man7/weston-drm.7
Reply to: