summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb2
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb2
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb2
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-common.inc5
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf103
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb2
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb2
7 files changed, 67 insertions, 51 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/meta/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
index 6fce2bd5ca..35237bbcf5 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
@@ -9,7 +9,7 @@ DEPENDS += "libxkbfile libxcalibrate"
9RDEPENDS_${PN} = "xserver-kdrive" 9RDEPENDS_${PN} = "xserver-kdrive"
10PROVIDES = "virtual/xserver" 10PROVIDES = "virtual/xserver"
11PE = "1" 11PE = "1"
12PR = "r6" 12PR = "r7"
13PV = "1.3.0.0+git${SRCREV}" 13PV = "1.3.0.0+git${SRCREV}"
14 14
15SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \ 15SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 6b494d3e45..bdc3a1f6f7 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive.inc
3DEPENDS += "libxkbfile libxcalibrate" 3DEPENDS += "libxkbfile libxcalibrate"
4 4
5PE = "1" 5PE = "1"
6PR = "r18" 6PR = "r19"
7 7
8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
9 file://extra-kmodes.patch;patch=1 \ 9 file://extra-kmodes.patch;patch=1 \
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 755b7c97f7..9b6ee537c2 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -5,7 +5,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
5DEFAULT_PREFERENCE = "-99" 5DEFAULT_PREFERENCE = "-99"
6 6
7PE = "1" 7PE = "1"
8PR = "r3" 8PR = "r4"
9 9
10SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 10SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
11 file://extra-kmodes.patch;patch=1 \ 11 file://extra-kmodes.patch;patch=1 \
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc
index ea296e001d..17d88bb17e 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc
@@ -21,7 +21,7 @@ inherit autotools pkgconfig
21PACKAGES =+ "${PN}-utils" 21PACKAGES =+ "${PN}-utils"
22 22
23FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" 23FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
24FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so /etc/X11 " 24FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
25FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" 25FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
26 26
27FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ 27FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
@@ -46,8 +46,7 @@ do_stage() {
46 46
47do_install_append () { 47do_install_append () {
48 install -d ${D}/${sysconfdir}/X11 48 install -d ${D}/${sysconfdir}/X11
49# install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ 49 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
50 ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts 50 ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
51
52} 51}
53 52
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf
index e3ffbe6ed3..c320612367 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf
@@ -3,71 +3,88 @@ Section "Files"
3EndSection 3EndSection
4 4
5Section "InputDevice" 5Section "InputDevice"
6 Identifier "Synaptics Touchpad" 6 Identifier "Generic Keyboard"
7 Driver "synaptics" 7 Driver "kbd"
8 Option "SendCoreEvents" "true" 8 Option "CoreKeyboard"
9 Option "Device" "/dev/psaux" 9 Option "XkbRules" "xorg"
10 Option "Protocol" "auto-dev" 10 Option "XkbModel" "pc105"
11 Option "HorizEdgeScroll" "0" 11 Option "XkbLayout" "us"
12EndSection 12EndSection
13 13
14Section "InputDevice" 14Section "InputDevice"
15 Driver "wacom" 15 Identifier "Configured Mouse"
16 Identifier "stylus" 16 Driver "mouse"
17 Option "Device" "/dev/input/wacom" 17 Option "CorePointer"
18 Option "Type" "stylus" 18 Option "Device" "/dev/input/mice"
19 Option "ForceDevice" "ISDV4" # Tablet PC ONLY 19 Option "Protocol" "ImPS/2"
20 Option "ZAxisMapping" "4 5"
21 Option "Emulate3Buttons" "true"
20EndSection 22EndSection
21 23
22Section "InputDevice" 24Section "InputDevice"
23 Driver "wacom" 25 Identifier "Synaptics Touchpad"
24 Identifier "eraser" 26 Driver "synaptics"
25 Option "Device" "/dev/input/wacom" 27 Option "SendCoreEvents" "true"
26 Option "Type" "eraser" 28 Option "Device" "/dev/psaux"
27 Option "ForceDevice" "ISDV4" # Tablet PC ONLY 29 Option "Protocol" "auto-dev"
30 Option "HorizEdgeScroll" "0"
28EndSection 31EndSection
29 32
30Section "InputDevice" 33Section "InputDevice"
31 Driver "wacom" 34 Driver "wacom"
32 Identifier "cursor" 35 Identifier "stylus"
33 Option "Device" "/dev/input/wacom" 36 Option "Device" "/dev/input/wacom"
34 Option "Type" "cursor" 37 Option "Type" "stylus"
35 Option "ForceDevice" "ISDV4" # Tablet PC ONLY 38 Option "ForceDevice" "ISDV4" # Tablet PC ONLY
39EndSection
40
41Section "InputDevice"
42 Driver "wacom"
43 Identifier "eraser"
44 Option "Device" "/dev/input/wacom"
45 Option "Type" "eraser"
46 Option "ForceDevice" "ISDV4" # Tablet PC ONLY
47EndSection
48
49Section "InputDevice"
50 Driver "wacom"
51 Identifier "cursor"
52 Option "Device" "/dev/input/wacom"
53 Option "Type" "cursor"
54 Option "ForceDevice" "ISDV4" # Tablet PC ONLY
36EndSection 55EndSection
37 56
38Section "Device" 57Section "Device"
39 Identifier "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" 58 Identifier "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
40 Driver "intel" 59 Driver "intel"
41 BusID "PCI:0:2:0" 60 BusID "PCI:0:2:0"
42 Option "AccelMethod" "EXA"
43EndSection 61EndSection
44 62
45Section "Monitor" 63Section "Monitor"
46 Identifier "Generic Monitor" 64 Identifier "Generic Monitor"
47 Option "DPMS" 65 Option "DPMS"
48EndSection 66EndSection
49 67
50Section "Screen" 68Section "Screen"
51 Identifier "Default Screen" 69 Identifier "Default Screen"
52 Device "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" 70 Device "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
53 Monitor "Generic Monitor" 71 Monitor "Generic Monitor"
54 DefaultDepth 24 72 DefaultDepth 24
55 SubSection "Display" 73 SubSection "Display"
56 Modes "1024x768" "720x400" "640x480" 74 Modes "800x480"
57 Virtual 3000 2048 75 EndSubSection
58 EndSubSection
59EndSection 76EndSection
60 77
61Section "ServerLayout" 78Section "ServerLayout"
62 Identifier "Default Layout" 79 Identifier "Default Layout"
63 Screen "Default Screen" 80 Screen "Default Screen"
64 InputDevice "Generic Keyboard" 81 InputDevice "Generic Keyboard"
65 InputDevice "Configured Mouse" 82 InputDevice "Configured Mouse"
66 83
67# Uncomment if you have a wacom tablet 84# Uncomment if you have a wacom tablet
68# InputDevice "stylus" "SendCoreEvents" 85# InputDevice "stylus" "SendCoreEvents"
69# InputDevice "cursor" "SendCoreEvents" 86# InputDevice "cursor" "SendCoreEvents"
70# InputDevice "eraser" "SendCoreEvents" 87# InputDevice "eraser" "SendCoreEvents"
71 InputDevice "Synaptics Touchpad" 88 InputDevice "Synaptics Touchpad"
72EndSection 89EndSection
73 90
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
index 9f4cb8ec75..7236a2653c 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
@@ -1,7 +1,7 @@
1require xserver-xf86-dri-lite.inc 1require xserver-xf86-dri-lite.inc
2 2
3PE = "1" 3PE = "1"
4PR = "r1" 4PR = "r3"
5 5
6SRC_URI += "file://drmfix.patch;patch=1" 6SRC_URI += "file://drmfix.patch;patch=1"
7 7
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 47be75fdb6..11940dd2c1 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -1,7 +1,7 @@
1require xserver-xf86-dri-lite.inc 1require xserver-xf86-dri-lite.inc
2 2
3PE = "1" 3PE = "1"
4PR = "r1" 4PR = "r2"
5PV = "1.5.0+git${SRCREV}" 5PV = "1.5.0+git${SRCREV}"
6 6
7DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"