Mir

Merge lp:~alan-griffiths/mir/SDL_VIDEODRIVER-wayland into lp:mir

Proposed by Alan Griffiths on 2017-10-13
Status: Merged
Approved by: Brandon Schaefer on 2017-10-13
Approved revision: 4289
Merged at revision: 4288
Proposed branch: lp:~alan-griffiths/mir/SDL_VIDEODRIVER-wayland
Merge into: lp:mir
Diff against target: 68 lines (+6/-6)
5 files modified
examples/miral-shell/miral-app.sh (+1/-1)
examples/miral-shell/miral-desktop.sh (+1/-1)
examples/miral-shell/miral-run.sh (+1/-1)
src/miral/runner.cpp (+2/-2)
src/utils/run.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/SDL_VIDEODRIVER-wayland
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-10-13
Brandon Schaefer (community) Approve on 2017-10-13
Alberto Aguirre (community) 2017-10-13 Approve on 2017-10-13
Review via email: mp+332237@code.launchpad.net

Commit message

Default to using SDL's Wayland support

To post a comment you must log in.
Alberto Aguirre (albaguirre) wrote :

Ok.

review: Approve
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4289
https://mir-jenkins.ubuntu.com/job/mir-ci/3725/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5116/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5354
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5341
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5341
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5341
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5160
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5160/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5160
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5160/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5160
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5160/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5160/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5160
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5160/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5160
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5160/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5160
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5160/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5160
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5160/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3725/rebuild

review: Needs Fixing (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

Nice yeah AFAIK theres only a couple things missing from wayland that mir has (such as raise surface/gamma and i think i saw some issues with pointer confinement) But things i can chase down in SDL2. Overall a good change

review: Approve
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/miral-shell/miral-app.sh'
2--- examples/miral-shell/miral-app.sh 2017-09-25 17:59:37 +0000
3+++ examples/miral-shell/miral-app.sh 2017-10-13 13:27:45 +0000
4@@ -53,6 +53,6 @@
5 while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
6
7 unset QT_QPA_PLATFORMTHEME
8-MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
9+MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
10 killall ${bindir}${miral_server}
11
12
13=== modified file 'examples/miral-shell/miral-desktop.sh'
14--- examples/miral-shell/miral-desktop.sh 2017-09-19 08:52:48 +0000
15+++ examples/miral-shell/miral-desktop.sh 2017-10-13 13:27:45 +0000
16@@ -47,6 +47,6 @@
17 while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
18
19 unset QT_QPA_PLATFORMTHEME
20-MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
21+MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
22 sudo killall ${bindir}${miral_server}
23
24
25=== modified file 'examples/miral-shell/miral-run.sh'
26--- examples/miral-shell/miral-run.sh 2017-08-21 15:58:34 +0000
27+++ examples/miral-shell/miral-run.sh 2017-10-13 13:27:45 +0000
28@@ -14,4 +14,4 @@
29 then extras='--app-id com.canonical.miral.Terminal'
30 fi
31 unset QT_QPA_PLATFORMTHEME
32-MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
33+MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=wayland "$@" ${extras}&
34
35=== modified file 'src/miral/runner.cpp'
36--- src/miral/runner.cpp 2017-08-21 14:18:55 +0000
37+++ src/miral/runner.cpp 2017-10-13 13:27:45 +0000
38@@ -48,7 +48,7 @@
39 int const argc;
40 char const** const argv;
41 std::string const config_file;
42-
43+
44 std::mutex mutex;
45 std::function<void()> start_callback{[]{}};
46 std::function<void()> stop_callback{[this]{ join_client_threads(weak_server.lock().get()); }};
47@@ -103,7 +103,7 @@
48 setenv("GDK_BACKEND", "mir", true); // configure GTK to use Mir
49 setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
50 unsetenv("QT_QPA_PLATFORMTHEME"); // Discourage Qt from unsupported theme
51- setenv("SDL_VIDEODRIVER", "mir", true); // configure SDL to use Mir
52+ setenv("SDL_VIDEODRIVER", "wayland", true); // configure SDL to use Wayland
53
54 // gnome-terminal is the (only known) special case
55 char const* exec_args[] = { "gnome-terminal", "--app-id", "com.canonical.miral.Terminal", nullptr };
56
57=== modified file 'src/utils/run.cpp'
58--- src/utils/run.cpp 2017-07-28 17:00:43 +0000
59+++ src/utils/run.cpp 2017-10-13 13:27:45 +0000
60@@ -85,7 +85,7 @@
61 setenv("GDK_BACKEND", "mir", true); // configure GTK to use Mir
62 setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
63 unsetenv("QT_QPA_PLATFORMTHEME"); // Discourage Qt from unsupported theme
64- setenv("SDL_VIDEODRIVER", "mir", true); // configure SDL to use Mir
65+ setenv("SDL_VIDEODRIVER", "wayland", true); // configure SDL to use Wayland
66
67 if (auto const client_platform = getenv("MIR_CLIENT_PLATFORM_PATH"))
68 setenv("MIR_CLIENT_PLATFORM_PATH", canonicalize(client_platform).c_str(), true);

Subscribers

People subscribed via source and target branches