weston: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++++
debian/control | 2 --
debian/libweston-1-0.install | 1 -
debian/patches/01-freerdp2.patch | 24 ------------------------
debian/patches/series | 1 -
debian/rules | 3 +--
6 files changed, 11 insertions(+), 30 deletions(-)
New commits:
commit ae7fa5ef45401cc0f642fd90c6dbe997b42bf24d
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sun Feb 5 10:57:57 2017 +0100
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index c154329..2190393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-weston (1.12.0-3) UNRELEASED; urgency=medium
+weston (1.12.0-3) unstable; urgency=medium
* Remove useless dependency on libegl1-mesa-drivers.
* Disable the freerdp backend for stretch. freerdp2 doesn't build
@@ -6,7 +6,7 @@ weston (1.12.0-3) UNRELEASED; urgency=medium
against our snapshot of freerdp 1.
* Drop obsolete --enable-libinput-backend configure switch.
- -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 05 Feb 2017 10:35:47 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 05 Feb 2017 10:57:54 +0100
weston (1.12.0-2) unstable; urgency=medium
commit bbb971f7eafb48eeba9d4d2a7020faf15cf04494
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sun Feb 5 10:45:03 2017 +0100
Drop obsolete --enable-libinput-backend configure switch
diff --git a/debian/changelog b/debian/changelog
index 3795e5d..c154329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ weston (1.12.0-3) UNRELEASED; urgency=medium
* Disable the freerdp backend for stretch. freerdp2 doesn't build
everywhere and is not in testing, and the backend fails to build
against our snapshot of freerdp 1.
+ * Drop obsolete --enable-libinput-backend configure switch.
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 05 Feb 2017 10:35:47 +0100
diff --git a/debian/rules b/debian/rules
index 05a24d0..c819ef3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,7 @@
override_dh_auto_configure:
dh_auto_configure -- --disable-libunwind --libexec=/usr/lib/weston \
- --with-cairo=image --enable-libinput-backend \
- --enable-screen-sharing
+ --with-cairo=image --enable-screen-sharing
override_dh_auto_test:
# the test suite does not 100% pass in headless mode
commit bbf8ade031082fc999f0eb0e9c29dfc5a65ca280
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sun Feb 5 10:46:37 2017 +0100
Drop freerdp2 patch
We don't need it anymore, and it has been fixed upstream so we won't
need it when we re-enable the backend.
diff --git a/debian/patches/01-freerdp2.patch b/debian/patches/01-freerdp2.patch
deleted file mode 100644
index dd94521..0000000
--- a/debian/patches/01-freerdp2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 4549b5f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-freerdp2.patch
commit 25a0a57455d8d82a13768cd1669377d1fccbf2b0
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sun Feb 5 10:38:15 2017 +0100
Disable the freerdp backend for stretch
diff --git a/debian/changelog b/debian/changelog
index 22b041d..3795e5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
weston (1.12.0-3) UNRELEASED; urgency=medium
* Remove useless dependency on libegl1-mesa-drivers.
+ * Disable the freerdp backend for stretch. freerdp2 doesn't build
+ everywhere and is not in testing, and the backend fails to build
+ against our snapshot of freerdp 1.
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 05 Feb 2017 10:35:47 +0100
diff --git a/debian/control b/debian/control
index f0488b9..1d1f55d 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,6 @@ 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 a0c75cd..77518c3 100644
--- a/debian/libweston-1-0.install
+++ b/debian/libweston-1-0.install
@@ -4,7 +4,6 @@ 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 e74d9af..05a24d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
override_dh_auto_configure:
dh_auto_configure -- --disable-libunwind --libexec=/usr/lib/weston \
--with-cairo=image --enable-libinput-backend \
- --enable-rdp-compositor --enable-screen-sharing
+ --enable-screen-sharing
override_dh_auto_test:
# the test suite does not 100% pass in headless mode
commit 13ae53699b18a7246b0559478757c9762961441c
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sun Feb 5 10:36:11 2017 +0100
Remove useless dependency on libegl1-mesa-drivers
diff --git a/debian/changelog b/debian/changelog
index 9814962..22b041d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+weston (1.12.0-3) UNRELEASED; urgency=medium
+
+ * Remove useless dependency on libegl1-mesa-drivers.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 05 Feb 2017 10:35:47 +0100
+
weston (1.12.0-2) unstable; urgency=medium
* Enable RDP compositor and screen sharing. Closes: #775855, #850658.
diff --git a/debian/control b/debian/control
index 546e544..f0488b9 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
mesa-common-dev,
libglu1-mesa-dev,
libegl1-mesa-dev (>= 9.0~),
- libegl1-mesa-drivers (>= 9.0~),
libgles2-mesa-dev (>= 9.0~),
libwayland-dev (>= 1.11.91),
libxcb1-dev,
Reply to: