diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-graphics/xorg-xserver | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
18 files changed, 933 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf new file mode 100644 index 0000000000..e6c8b514e3 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf | |||
@@ -0,0 +1,70 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | DefaultDepth 16 | ||
58 | SubSection "Display" | ||
59 | Modes "640x480" | ||
60 | EndSubSection | ||
61 | EndSection | ||
62 | |||
63 | Section "ServerLayout" | ||
64 | Identifier "Default Layout" | ||
65 | Screen "Default Screen" | ||
66 | InputDevice "Generic Keyboard" | ||
67 | # InputDevice "Configured Mouse" | ||
68 | InputDevice "QEMU Tablet" | ||
69 | Option "AllowEmptyInput" "no" | ||
70 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf new file mode 100644 index 0000000000..bbda9eaa63 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf | |||
@@ -0,0 +1,64 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "vmmouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Monitor" | ||
34 | Identifier "Generic Monitor" | ||
35 | Option "DPMS" | ||
36 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
37 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
38 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
39 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
40 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
41 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
42 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
43 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
44 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
45 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
46 | EndSection | ||
47 | |||
48 | Section "Screen" | ||
49 | Identifier "Default Screen" | ||
50 | Device "Graphics Controller" | ||
51 | Monitor "Generic Monitor" | ||
52 | SubSection "Display" | ||
53 | Modes "640x480" | ||
54 | EndSubSection | ||
55 | EndSection | ||
56 | |||
57 | Section "ServerLayout" | ||
58 | Identifier "Default Layout" | ||
59 | Screen "Default Screen" | ||
60 | InputDevice "Generic Keyboard" | ||
61 | # InputDevice "Configured Mouse" | ||
62 | InputDevice "QEMU Tablet" | ||
63 | Option "AllowEmptyInput" "no" | ||
64 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf new file mode 100644 index 0000000000..bbda9eaa63 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf | |||
@@ -0,0 +1,64 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "vmmouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Monitor" | ||
34 | Identifier "Generic Monitor" | ||
35 | Option "DPMS" | ||
36 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
37 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
38 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
39 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
40 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
41 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
42 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
43 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
44 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
45 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
46 | EndSection | ||
47 | |||
48 | Section "Screen" | ||
49 | Identifier "Default Screen" | ||
50 | Device "Graphics Controller" | ||
51 | Monitor "Generic Monitor" | ||
52 | SubSection "Display" | ||
53 | Modes "640x480" | ||
54 | EndSubSection | ||
55 | EndSection | ||
56 | |||
57 | Section "ServerLayout" | ||
58 | Identifier "Default Layout" | ||
59 | Screen "Default Screen" | ||
60 | InputDevice "Generic Keyboard" | ||
61 | # InputDevice "Configured Mouse" | ||
62 | InputDevice "QEMU Tablet" | ||
63 | Option "AllowEmptyInput" "no" | ||
64 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb new file mode 100644 index 0000000000..549c7c89bf --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "X.Org X server configuration file" | ||
2 | HOMEPAGE = "http://www.x.org" | ||
3 | SECTION = "x11/base" | ||
4 | LICENSE = "MIT-X" | ||
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
6 | PR = "r33" | ||
7 | |||
8 | SRC_URI = "file://xorg.conf" | ||
9 | |||
10 | CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" | ||
11 | |||
12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
13 | ALLOW_EMPTY_${PN} = "1" | ||
14 | |||
15 | do_install () { | ||
16 | if test -s ${WORKDIR}/xorg.conf; then | ||
17 | install -d ${D}/${sysconfdir}/X11 | ||
18 | install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ | ||
19 | fi | ||
20 | } | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc new file mode 100644 index 0000000000..dd60884992 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -0,0 +1,159 @@ | |||
1 | SUMMARY = "The X.Org X server" | ||
2 | HOMEPAGE = "http://www.x.org" | ||
3 | SECTION = "x11/base" | ||
4 | LICENSE = "MIT-X" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=15b5bf9327341c81089137aec4830bfd" | ||
6 | |||
7 | # xf86-*-* packages depend on an X server built with the xfree86 DDX | ||
8 | # so we have a virtual to represent that: | ||
9 | # deprecated, we should use virtual/xserver instead | ||
10 | PROVIDES = "virtual/xserver-xf86" | ||
11 | |||
12 | # Other packages tend to just care that there is *an* X server: | ||
13 | PROVIDES += "virtual/xserver" | ||
14 | |||
15 | PE = "2" | ||
16 | INC_PR = "r8" | ||
17 | |||
18 | XORG_PN = "xorg-server" | ||
19 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" | ||
20 | SRC_URI += "file://macro_tweak.patch" | ||
21 | |||
22 | S = "${WORKDIR}/${XORG_PN}-${PV}" | ||
23 | |||
24 | inherit autotools pkgconfig | ||
25 | |||
26 | PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" | ||
27 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" | ||
28 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" | ||
29 | |||
30 | # Split out some modules and extensions from the main package | ||
31 | # These aren't needed for basic operations and only take up space: | ||
32 | # 32.0k libdri.so | ||
33 | # 91.0k libexa.so | ||
34 | # 336.0k libglx.so | ||
35 | # 1360k libint10.so | ||
36 | # 180.0k libwfb.so | ||
37 | # 320.0k libxaa.so | ||
38 | # 124.0k libxf1bpp.so | ||
39 | # 84.0k libxf4bpp.so | ||
40 | # librecord.so | ||
41 | # libextmod.so | ||
42 | # libdbe.so | ||
43 | |||
44 | PACKAGES =+ "${PN}-security-policy \ | ||
45 | ${PN}-sdl \ | ||
46 | ${PN}-fbdev \ | ||
47 | ${PN}-xvfb \ | ||
48 | ${PN}-utils \ | ||
49 | ${PN}-xephyr \ | ||
50 | ${PN}-multimedia-modules \ | ||
51 | ${PN}-extension-dri \ | ||
52 | ${PN}-extension-dri2 \ | ||
53 | ${PN}-extension-glx \ | ||
54 | ${PN}-extension-record \ | ||
55 | ${PN}-extension-extmod \ | ||
56 | ${PN}-extension-dbe \ | ||
57 | ${PN}-module-libint10 \ | ||
58 | ${PN}-module-libafb \ | ||
59 | ${PN}-module-libwfb \ | ||
60 | ${PN}-module-libmfb \ | ||
61 | ${PN}-module-libcfb \ | ||
62 | ${PN}-module-exa \ | ||
63 | ${PN}-module-xaa \ | ||
64 | ${PN}-module-libxf1bpp \ | ||
65 | ${PN}-module-libxf4bpp" | ||
66 | |||
67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" | ||
68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | ||
69 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" | ||
70 | |||
71 | FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" | ||
72 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" | ||
73 | FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" | ||
74 | FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ | ||
75 | ${libdir}/xorg/modules/*/.debug \ | ||
76 | ${libdir}/xorg/modules/*/*/.debug \ | ||
77 | " | ||
78 | FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" | ||
79 | FILES_${PN}-sdl = "${bindir}/Xsdl" | ||
80 | FILES_${PN}-fbdev = "${bindir}/Xfbdev" | ||
81 | FILES_${PN}-xvfb = "${bindir}/Xvfb" | ||
82 | FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" | ||
83 | FILES_${PN}-xephyr = "${bindir}/Xephyr" | ||
84 | FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" | ||
85 | FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" | ||
86 | FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" | ||
87 | FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" | ||
88 | FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" | ||
89 | FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" | ||
90 | FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" | ||
91 | FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" | ||
92 | FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" | ||
93 | FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" | ||
94 | FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" | ||
95 | FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" | ||
96 | FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" | ||
97 | FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" | ||
98 | FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" | ||
99 | FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" | ||
100 | |||
101 | EXTRA_OECONF += "--with-fop=no \ | ||
102 | --with-pic \ | ||
103 | --disable-static \ | ||
104 | --disable-xinerama \ | ||
105 | --disable-record \ | ||
106 | --disable-dmx \ | ||
107 | --disable-xnest \ | ||
108 | --enable-xvfb \ | ||
109 | --enable-composite \ | ||
110 | --without-dtrace \ | ||
111 | --with-int10=x86emu \ | ||
112 | --sysconfdir=/etc/X11 \ | ||
113 | --localstatedir=/var \ | ||
114 | --with-xkb-output=/var/lib/xkb \ | ||
115 | --with-sha1=libcrypto \ | ||
116 | ac_cv_file__usr_share_sgml_X11_defs_ent=no \ | ||
117 | " | ||
118 | |||
119 | PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" | ||
120 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | ||
121 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" | ||
122 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" | ||
123 | # DRI3 requires xshmfence to also be enabled | ||
124 | PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" | ||
125 | PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" | ||
126 | PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" | ||
127 | PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" | ||
128 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | ||
129 | |||
130 | do_install_append () { | ||
131 | # Its assumed base-files creates this for us | ||
132 | rmdir ${D}${localstatedir}/log/ | ||
133 | } | ||
134 | |||
135 | # Add runtime provides for the ABI versions of the video and input subsystems, | ||
136 | # so that drivers can depend on the relevant version. | ||
137 | python populate_packages_prepend() { | ||
138 | import subprocess | ||
139 | |||
140 | # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going | ||
141 | # into the new package, not the staged ones. | ||
142 | newenv = dict(os.environ) | ||
143 | newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/") | ||
144 | |||
145 | def get_abi(name): | ||
146 | abis = { | ||
147 | "video": "abi_videodrv", | ||
148 | "input": "abi_xinput" | ||
149 | } | ||
150 | p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], | ||
151 | shell=True, env=newenv, stdout=subprocess.PIPE) | ||
152 | output = p.communicate()[0] | ||
153 | mlprefix = d.getVar('MLPREFIX', True) or '' | ||
154 | return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) | ||
155 | |||
156 | pn = d.getVar("PN", True) | ||
157 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) | ||
158 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) | ||
159 | } | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch new file mode 100644 index 0000000000..2f98bb8c89 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff --git a/configure.ac b/configure.ac | ||
4 | index b3b752c..600500b 100644 | ||
5 | --- a/configure.ac | ||
6 | +++ b/configure.ac | ||
7 | @@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, | ||
8 | dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross | ||
9 | dnl compiling, assume default font path uses standard FONTROOTDIR directories. | ||
10 | DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" | ||
11 | -if test "$cross_compiling" != yes; then | ||
12 | - AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], | ||
13 | - [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], | ||
14 | - [case $host_os in | ||
15 | + case $host_os in | ||
16 | darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; | ||
17 | - esac]) | ||
18 | -fi | ||
19 | + esac | ||
20 | AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), | ||
21 | [ FONTPATH="$withval" ], | ||
22 | [ FONTPATH="${DEFAULT_FONT_PATH}" ]) | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch new file mode 100644 index 0000000000..2f629724c9 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: git/os/osdep.h | ||
4 | =================================================================== | ||
5 | --- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 | ||
6 | +++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 | ||
7 | @@ -92,7 +92,7 @@ | ||
8 | * like sysconf(_SC_OPEN_MAX) is not supported. | ||
9 | */ | ||
10 | |||
11 | -#if OPEN_MAX <= 256 | ||
12 | +#if 0 | ||
13 | #define MAXSOCKS (OPEN_MAX - 1) | ||
14 | #else | ||
15 | #define MAXSOCKS 256 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch new file mode 100644 index 0000000000..ec0eea6ca2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | This is the revised version of files/macro_tweak.patch for | ||
2 | xorg-server 1.8.99.904 and newer. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
7 | |||
8 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
9 | index bdecf62..040fdb8 100644 | ||
10 | --- a/xorg-server.m4 | ||
11 | +++ b/xorg-server.m4 | ||
12 | @@ -28,10 +28,12 @@ dnl | ||
13 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
14 | # is defined, then add $1 to $REQUIRED_MODULES. | ||
15 | |||
16 | +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) | ||
17 | + | ||
18 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
19 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
20 | SAVE_CFLAGS="$CFLAGS" | ||
21 | - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
22 | + CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
23 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
24 | #include "xorg-server.h" | ||
25 | #if !defined $1 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch new file mode 100644 index 0000000000..168368e6c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well | ||
2 | so we end up with incompatible conversion errors | ||
3 | |||
4 | This patch choses the right values for mips64 | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h | ||
10 | =================================================================== | ||
11 | --- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 | ||
12 | +++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 | ||
13 | @@ -101,6 +101,7 @@ | ||
14 | #if defined(NO_INLINE) || defined(DO_PROTOTYPES) | ||
15 | #if !defined(__arm__) | ||
16 | #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ | ||
17 | + && !defined(__mips64) \ | ||
18 | && !(defined(__alpha__) && defined(linux)) \ | ||
19 | && !(defined(__ia64__) && defined(linux)) \ | ||
20 | |||
21 | @@ -721,7 +722,7 @@ | ||
22 | } | ||
23 | |||
24 | #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) | ||
25 | -#ifdef __arm32__ | ||
26 | +#if defined (__arm32__) || defined (__mips64) | ||
27 | #define PORT_SIZE long | ||
28 | #else | ||
29 | #define PORT_SIZE short | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch new file mode 100644 index 0000000000..13f3caf768 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | [ YOCTO #6583 ] | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001 | ||
7 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
8 | Date: Wed, 28 May 2014 08:13:59 +0100 | ||
9 | Subject: xfree86: Report DRI3 as a built-in module | ||
10 | |||
11 | This is so that drivers can do a runtime check that DRI3 is available, | ||
12 | similar to existing runtime checks performed by the drivers for DRI and | ||
13 | DRI2. | ||
14 | |||
15 | v2: Only add DRI3 to the list if the module was actually built into the | ||
16 | server (Mark Kettenis). | ||
17 | |||
18 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
19 | Cc: Mark Kettenis <mark.kettenis@xs4all.nl> | ||
20 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
21 | |||
22 | diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c | ||
23 | index 092bf57..f92ad8d 100644 | ||
24 | --- a/hw/xfree86/loader/loadmod.c | ||
25 | +++ b/hw/xfree86/loader/loadmod.c | ||
26 | @@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = { | ||
27 | "extmod", | ||
28 | "dri", | ||
29 | "dri2", | ||
30 | +#if DRI3 | ||
31 | + "dri3", | ||
32 | +#endif | ||
33 | NULL | ||
34 | }; | ||
35 | |||
36 | -- | ||
37 | cgit v0.10.2 | ||
38 | |||
39 | |||
40 | From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001 | ||
41 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
42 | Date: Wed, 28 May 2014 08:14:00 +0100 | ||
43 | Subject: xfree86: Report Present as a built-in module | ||
44 | |||
45 | This is so that drivers can do a runtime check that Present is available, | ||
46 | similar to existing runtime checks performed by the drivers for DRI. | ||
47 | |||
48 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
49 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
50 | |||
51 | diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c | ||
52 | index f92ad8d..e1f649a 100644 | ||
53 | --- a/hw/xfree86/loader/loadmod.c | ||
54 | +++ b/hw/xfree86/loader/loadmod.c | ||
55 | @@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = { | ||
56 | #if DRI3 | ||
57 | "dri3", | ||
58 | #endif | ||
59 | +#if PRESENT | ||
60 | + "present", | ||
61 | +#endif | ||
62 | NULL | ||
63 | }; | ||
64 | |||
65 | -- | ||
66 | cgit v0.10.2 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch new file mode 100644 index 0000000000..7c6153022f --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | This patch comes from: | ||
2 | http://lists.x.org/archives/xorg-devel/2013-October/037996.html | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | |||
6 | Signed-off-by: Baogen shang <baogen.shang@windriver.com> | ||
7 | diff -Naur xorg-server-1.14.0-orig/exa/exa_render.c xorg-server-1.14.0/exa/exa_render.c | ||
8 | --- xorg-server-1.14.0-orig/exa/exa_render.c 2014-02-27 14:32:38.000000000 +0800 | ||
9 | +++ xorg-server-1.14.0/exa/exa_render.c 2014-02-27 15:46:59.000000000 +0800 | ||
10 | @@ -1141,7 +1141,8 @@ | ||
11 | |||
12 | exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); | ||
13 | for (; ntrap; ntrap--, traps++) | ||
14 | - (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); | ||
15 | + if (xTrapezoidValid(traps)) | ||
16 | + (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); | ||
17 | exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); | ||
18 | |||
19 | xRel = bounds.x1 + xSrc - xDst; | ||
20 | diff -Naur xorg-server-1.14.0-orig/render/picture.h xorg-server-1.14.0/render/picture.h | ||
21 | --- xorg-server-1.14.0-orig/render/picture.h 2014-02-27 14:32:26.000000000 +0800 | ||
22 | +++ xorg-server-1.14.0/render/picture.h 2014-02-27 15:48:13.000000000 +0800 | ||
23 | @@ -211,7 +211,7 @@ | ||
24 | /* whether 't' is a well defined not obviously empty trapezoid */ | ||
25 | #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ | ||
26 | (t)->right.p1.y != (t)->right.p2.y && \ | ||
27 | - (int) ((t)->bottom - (t)->top) > 0) | ||
28 | + ((t)->bottom > (t)->top)) | ||
29 | |||
30 | /* | ||
31 | * Standard NTSC luminance conversions: | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch new file mode 100644 index 0000000000..682ddf7006 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | commit ca29a9f3e689f3840426897f58aaa3974932ae78 | ||
5 | Author: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Mon Jul 7 12:53:35 2014 +0100 | ||
7 | |||
8 | configure.ac: add option for xshmfence | ||
9 | |||
10 | xshmfence is usable outside of DRI3, and is currently autodetected which isn't | ||
11 | good for distributions where deterministic builds are aspired to. | ||
12 | |||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index c214638..a1ca9ec 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d | ||
20 | AC_ARG_ENABLE(kdrive-mouse, AS_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto]) | ||
21 | AC_ARG_ENABLE(kdrive-evdev, AS_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto]) | ||
22 | AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) | ||
23 | +AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [WANT_XSHMFENCE="$enableval"], [WANT_XSHMFENCE="auto"]) | ||
24 | |||
25 | |||
26 | dnl chown/chmod to be setuid root as part of build | ||
27 | @@ -1235,18 +1236,21 @@ esac | ||
28 | |||
29 | AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes) | ||
30 | |||
31 | -PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, | ||
32 | - [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) | ||
33 | |||
34 | -AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes) | ||
35 | +PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) | ||
36 | +if test "x$WANT_XSHMFENCE" = "xauto"; then | ||
37 | + WANT_XSHMFENCE="$HAVE_XSHMFENCE" | ||
38 | +fi | ||
39 | |||
40 | -case x"$HAVE_XSHMFENCE" in | ||
41 | - xyes) | ||
42 | - AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library]) | ||
43 | - REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" | ||
44 | - ;; | ||
45 | -esac | ||
46 | +if test "x$WANT_XSHMFENCE" = "xyes"; then | ||
47 | + if test "x$HAVE_XSHMFENCE" != "xyes"; then | ||
48 | + AC_MSG_ERROR([xshmfence requested but not installed.]) | ||
49 | + fi | ||
50 | + AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support]) | ||
51 | + REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" | ||
52 | +fi | ||
53 | |||
54 | +AM_CONDITIONAL(XSHMFENCE, [test "x$WANT_XSHMFENCE" = xyes]) | ||
55 | |||
56 | case "$DRI3,$HAVE_XSHMFENCE" in | ||
57 | yes,yes | auto,yes) | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb new file mode 100644 index 0000000000..3bba3ce0bf --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | require xserver-xorg.inc | ||
2 | |||
3 | # Misc build failure for master HEAD | ||
4 | SRC_URI += "file://crosscompile.patch \ | ||
5 | file://fix_open_max_preprocessor_error.patch \ | ||
6 | file://mips64-compiler.patch \ | ||
7 | file://xorg-CVE-2013-6424.patch \ | ||
8 | file://xshmfence-option.patch \ | ||
9 | file://present-module.patch \ | ||
10 | " | ||
11 | |||
12 | SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" | ||
13 | SRC_URI[sha256sum] = "626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2" | ||
14 | |||
15 | # These extensions are now integrated into the server, so declare the migration | ||
16 | # path for in-place upgrades. | ||
17 | |||
18 | RREPLACES_${PN} = "${PN}-extension-dri \ | ||
19 | ${PN}-extension-dri2 \ | ||
20 | ${PN}-extension-record \ | ||
21 | ${PN}-extension-extmod \ | ||
22 | ${PN}-extension-dbe \ | ||
23 | " | ||
24 | RPROVIDES_${PN} = "${PN}-extension-dri \ | ||
25 | ${PN}-extension-dri2 \ | ||
26 | ${PN}-extension-record \ | ||
27 | ${PN}-extension-extmod \ | ||
28 | ${PN}-extension-dbe \ | ||
29 | " | ||
30 | RCONFLICTS_${PN} = "${PN}-extension-dri \ | ||
31 | ${PN}-extension-dri2 \ | ||
32 | ${PN}-extension-record \ | ||
33 | ${PN}-extension-extmod \ | ||
34 | ${PN}-extension-dbe \ | ||
35 | " | ||