1
=== modified file 'doc/installing_prebuilt_on_pc.md'
2
--- doc/installing_prebuilt_on_pc.md	2013-06-25 13:37:19 +0000
3
+++ doc/installing_prebuilt_on_pc.md	2013-06-26 22:18:24 +0000
4
@@ -1,21 +1,20 @@
5
1
Installing pre-built packages on a PC {#installing_prebuilt_on_pc}
1
Installing pre-built packages on a PC {#installing_prebuilt_on_pc}
6
2
=====================================
2
=====================================
7
3
3
10
4
1. Install raring if you haven' t done so already.  Uninstall any proprietary
4
Install raring if you haven' t done so already.  Uninstall any proprietary
11
5
   drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
5
drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
12
6
6
16
7
2. Add the ppa:mir-team/system-compositor-testing. Note that besides mir
7
Add the ppa:mir-team/system-compositor-testing. Note that besides Mir itself,
17
8
itself, the PPA includes
8
the PPA includes custom builds of Mesa and Xorg drivers with support for Mir:
15
9
   custom builds of Mesa and Xorg drivers with support for mir:
18
10
9
19
11
       sudo add-apt-repository ppa:mir-team/system-compositor-testing
10
       sudo add-apt-repository ppa:mir-team/system-compositor-testing
20
12
11
22
13
3. Update your package list:
12
Update your package list:
23
14
13
24
15
       sudo apt-get update
14
       sudo apt-get update
25
16
15
28
17
4. Create the `/etc/apt/preferences.d/50-pin-mir.pref` file with the
16
Create the `/etc/apt/preferences.d/50-pin-mir.pref` file with the following
29
18
following contents:
17
contents:
30
19
18
31
20
       Package: *
19
       Package: *
32
21
       Pin: origin "private-ppa.launchpad.net"
20
       Pin: origin "private-ppa.launchpad.net"
33
@@ -25,7 +24,7 @@
34
25
       Pin: release o=LP-PPA-mir-team-system-compositor-testing
24
       Pin: release o=LP-PPA-mir-team-system-compositor-testing
35
26
       Pin-Priority: 1002
25
       Pin-Priority: 1002
36
27
26
38
28
5. Install mir and dist-upgrade:
27
Install Mir and dist-upgrade:
39
29
28
40
30
       sudo apt-get install mir-demos
29
       sudo apt-get install mir-demos
41
31
       sudo apt-get dist-upgrade
30
       sudo apt-get dist-upgrade
42
32
31
43
=== modified file 'doc/using_mir_on_pc.md'
44
--- doc/using_mir_on_pc.md	2013-06-25 13:37:19 +0000
45
+++ doc/using_mir_on_pc.md	2013-06-26 22:18:24 +0000
46
@@ -5,9 +5,8 @@
47
5
----------------
5
----------------
48
6
6
49
7
Make sure your hardware is supported. That means you're using a Mesa driver,
7
Make sure your hardware is supported. That means you're using a Mesa driver,
53
8
of which intel, radeon, and nouveau families are supported. If you're
8
of which intel, radeon, and nouveau families are supported. If you're logged
54
9
logged in to X then run this command to verify an appropriate DRI driver
9
in to X then run this command to verify an appropriate DRI driver is active:
52
10
is active:
55
11
10
56
12
    sudo pmap `pidof X` | grep dri.so
11
    sudo pmap `pidof X` | grep dri.so
57
13
12
58
@@ -15,17 +14,16 @@
59
15
14
60
16
    lsmod | grep drm
15
    lsmod | grep drm
61
17
16
66
18
Before you can use Mir you need to ensure you have the proper custom Mesa build
17
Before you can use Mir you need to ensure you have the proper custom Mesa
67
19
installed. If you installed Mir using the packages from mir-team
18
build installed. If you installed Mir using the packages from mir-team
68
20
system-compositor-testing PPA
19
system-compositor-testing PPA (see \ref installing_prebuilt_on_pc), you
69
21
(see \ref installing_prebuilt_on_pc), you should be good to go.
20
should be good to go.
70
22
21
73
23
If you built Mir from source code (see \ref building_source_for_pc), you need
22
If you built Mir from source code (see \ref building_source_for_pc), you
74
24
to ensure you are using the proper Mesa at runtime. You can do that by
23
nee to ensure you are using the proper Mesa at runtime. You can do that by
75
25
installing the Mesa packages manually from the system-compositor-testing PPA,
24
installing the Mesa packages manually from the system-compositor-testing PPA,
79
26
or by building the
25
or by building the custom Mesa yourself and ensuring it can be found by Mir,
80
27
custom Mesa yourself and ensuring it can be found by Mir, e.g., by using
26
e.g., by using LD_LIBRARY_PATH.
78
28
LD_LIBRARY_PATH.
81
29
27
82
30
Using Mir as system compositor with X
28
Using Mir as system compositor with X
83
31
-------------------------------------
29
-------------------------------------
84
@@ -34,18 +32,23 @@
85
34
include lightdm, Mesa and the Xorg drivers). The easiest way is to install
32
include lightdm, Mesa and the Xorg drivers). The easiest way is to install
86
35
pre-built packages from the system-compositor-testing PPA.
33
pre-built packages from the system-compositor-testing PPA.
87
36
34
90
37
To run X sessions under Mir, with Mir acting as the system compositor, edit
35
If you have installed the unity-system-compositor from
91
38
your /etc/lightdm/lightdm.conf to look to look like this:
36
the system-compositor-testing PPA, it will have created a file in
92
37
/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf to run XMir. If you
93
38
have build from source, to run X sessions under Mir, with Mir acting as the
94
39
system compositor, create the file
95
40
/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf to look to look like
96
41
this:
97
39
42
98
40
    [SeatDefaults]
43
    [SeatDefaults]
99
41
    type=unity
44
    type=unity
100
42
    user-session=ubuntu
101
43
    greeter-session=unity-greeter
102
44
45
103
45
Now restart lightdm:
46
Now restart lightdm:
104
46
47
105
47
    $ sudo restart lightdm
48
    $ sudo restart lightdm
106
48
49
107
50
Or you may simply reboot.
108
51
109
49
In theory, you should now find yourself back in Ubuntu and not notice
52
In theory, you should now find yourself back in Ubuntu and not notice
110
50
anything different. You can verify you're in Mir several ways:
53
anything different. You can verify you're in Mir several ways:
111
51
54
112
@@ -53,6 +56,15 @@
113
53
    $ grep -i xmir /var/log/Xorg.0.log
56
    $ grep -i xmir /var/log/Xorg.0.log
114
54
    $ ls -l /var/log/lightdm/unity-system-compositor.log
57
    $ ls -l /var/log/lightdm/unity-system-compositor.log
115
55
58
116
59
117
60
In any case, if you wish to deactivate XMir upon boot, simply comment out
118
61
the type=unity line from
119
62
/etc/lightdm/lightdm.conf.d10-unity-system-compositor.conf, like this:
120
63
121
64
    [SeatDefaults]
122
65
    #type=unity
123
66
124
67
125
56
Running Mir natively
68
Running Mir natively
126
57
--------------------
69
--------------------
127
58
70
Status:	Merged
Approved by:	Robert Ancell on 2013-06-26
Approved revision:	no longer in the source branch.
Merged at revision:	781
Proposed branch:	lp:~kgunn72/mir/instructional_updates
Merge into:	lp:~mir-team/mir/trunk
Diff against target:	126 lines (+36/-25) 2 files modified doc/installing_prebuilt_on_pc.md (+8/-9) doc/using_mir_on_pc.md (+28/-16)
To merge this branch:	bzr merge lp:~kgunn72/mir/instructional_updates
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-06-26
Robert Ancell		2013-06-26	Approve on 2013-06-26
Review via email: mp+171654@code.launchpad.net