diff -Nru mpv-0.26.0/debian/changelog mpv-0.26.0/debian/changelog
--- mpv-0.26.0/debian/changelog	2017-07-27 05:55:30.000000000 +0800
+++ mpv-0.26.0/debian/changelog	2017-08-09 16:38:55.000000000 +0800
@@ -1,3 +1,11 @@
+mpv (0.26.0-3ubuntu1) UNRELEASED; urgency=medium
+
+  * Prefer Wayland over X11, so if both are present (e.g. Xwayland) then
+    VA-API gets a display type that works (LP: #1698287)
+  * Enable hardware acceleration by default (LP: #1708102)
+
+ -- Daniel van Vugt <daniel.van.vugt@canonical.com>  Wed, 09 Aug 2017 16:38:55 +0800
+
 mpv (0.26.0-3) unstable; urgency=medium
 
   * Bump ffmpeg build dependency to >= 3.3.
diff -Nru mpv-0.26.0/debian/mpv.conf.ubuntu mpv-0.26.0/debian/mpv.conf.ubuntu
--- mpv-0.26.0/debian/mpv.conf.ubuntu	1970-01-01 08:00:00.000000000 +0800
+++ mpv-0.26.0/debian/mpv.conf.ubuntu	2017-08-09 16:38:55.000000000 +0800
@@ -0,0 +1 @@
+hwdec=auto
diff -Nru mpv-0.26.0/debian/patches/08_fix-lp1698287.patch mpv-0.26.0/debian/patches/08_fix-lp1698287.patch
--- mpv-0.26.0/debian/patches/08_fix-lp1698287.patch	1970-01-01 08:00:00.000000000 +0800
+++ mpv-0.26.0/debian/patches/08_fix-lp1698287.patch	2017-08-09 16:38:55.000000000 +0800
@@ -0,0 +1,33 @@
+Description: Prefer native Wayland over X11 if both are present
+ In Gnome Shell with Xwayland running, both options are present but only
+ one will work with libva (VA-API). This is because libva only supports DRI2
+ and Xwayland only supports DRI3. So libva fails to initialize using the x11
+ option. So we force mpv to use native Wayland instead, which libva supports
+ properly (albeit without a titlebar). (LP: #1698287)
+Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1698287
+Forwarded: yes
+Last-Update: 2017-08-09
+
+--- a/video/out/opengl/context.c	2017-04-23 07:57:53.000000000 +0800
++++ b/video/out/opengl/context.c	2017-06-28 16:05:12.884011509 +0800
+@@ -65,6 +65,9 @@
+ #if HAVE_GL_DXINTEROP
+     &mpgl_driver_dxinterop,
+ #endif
++#if HAVE_GL_WAYLAND
++    &mpgl_driver_wayland,
++#endif
+ #if HAVE_GL_X11
+     &mpgl_driver_x11_probe,
+ #endif
+@@ -74,9 +77,6 @@
+ #if HAVE_GL_X11
+     &mpgl_driver_x11,
+ #endif
+-#if HAVE_GL_WAYLAND
+-    &mpgl_driver_wayland,
+-#endif
+ #if HAVE_EGL_DRM
+     &mpgl_driver_drm,
+     &mpgl_driver_drm_egl,
diff -Nru mpv-0.26.0/debian/patches/series mpv-0.26.0/debian/patches/series
--- mpv-0.26.0/debian/patches/series	2017-07-27 05:53:55.000000000 +0800
+++ mpv-0.26.0/debian/patches/series	2017-08-09 16:38:55.000000000 +0800
@@ -4,3 +4,4 @@
 05_add-keywords.patch
 06_ffmpeg-abi.patch
 07_io-stdin-used.patch
+08_fix-lp1698287.patch
diff -Nru mpv-0.26.0/debian/rules mpv-0.26.0/debian/rules
--- mpv-0.26.0/debian/rules	2017-07-27 05:53:55.000000000 +0800
+++ mpv-0.26.0/debian/rules	2017-08-09 16:38:31.000000000 +0800
@@ -29,6 +29,7 @@
 
 override_dh_auto_install:
 	python ./waf -v install --destdir=debian/tmp
+	cp -f debian/mpv.conf.ubuntu debian/tmp/etc/mpv/mpv.conf
 
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE_NOTES