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"
 RDEPENDS_${PN} = "xserver-kdrive"
 PROVIDES = "virtual/xserver"
 PE = "1"
-PR = "r6"
+PR = "r7"
 PV = "1.3.0.0+git${SRCREV}"
 
 SRC_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
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         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"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         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
 PACKAGES =+ "${PN}-utils"
 
 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"
-FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so /etc/X11 "
+FILES_${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 "
 FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
 
 FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
@@ -46,8 +46,7 @@ do_stage() {
 
 do_install_append () {
         install -d ${D}/${sysconfdir}/X11
-#       install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+        install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
         ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
-
 }
 
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"
 EndSection
 
 Section "InputDevice"
-        Identifier      "Synaptics Touchpad"
-        Driver          "synaptics"
-        Option          "SendCoreEvents"        "true"
-        Option          "Device"                "/dev/psaux"
-        Option          "Protocol"              "auto-dev"
-        Option          "HorizEdgeScroll"       "0"
+    Identifier    "Generic Keyboard"
+    Driver        "kbd"
+    Option        "CoreKeyboard"
+    Option        "XkbRules"    "xorg"
+    Option        "XkbModel"    "pc105"
+    Option        "XkbLayout"    "us"
 EndSection
 
 Section "InputDevice"
-        Driver          "wacom"
-        Identifier      "stylus"
-        Option          "Device"        "/dev/input/wacom"
-        Option          "Type"          "stylus"
-        Option          "ForceDevice"   "ISDV4"         # Tablet PC ONLY
+    Identifier    "Configured Mouse"
+    Driver        "mouse"
+    Option        "CorePointer"
+    Option        "Device"        "/dev/input/mice"
+    Option        "Protocol"        "ImPS/2"
+    Option        "ZAxisMapping"        "4 5"
+    Option        "Emulate3Buttons"    "true"
 EndSection
 
 Section "InputDevice"
-        Driver          "wacom"
-        Identifier      "eraser"
-        Option          "Device"        "/dev/input/wacom"
-        Option          "Type"          "eraser"
-        Option          "ForceDevice"   "ISDV4"         # Tablet PC ONLY
+    Identifier    "Synaptics Touchpad"
+    Driver        "synaptics"
+    Option        "SendCoreEvents"    "true"
+    Option        "Device"        "/dev/psaux"
+    Option        "Protocol"        "auto-dev"
+    Option        "HorizEdgeScroll"    "0"
 EndSection
 
 Section "InputDevice"
-        Driver          "wacom"
-        Identifier      "cursor"
-        Option          "Device"        "/dev/input/wacom"
-        Option          "Type"          "cursor"
-        Option          "ForceDevice"   "ISDV4"         # Tablet PC ONLY
+    Driver        "wacom"
+    Identifier    "stylus"
+    Option        "Device"    "/dev/input/wacom"
+    Option        "Type"        "stylus"
+    Option        "ForceDevice"    "ISDV4"        # Tablet PC ONLY
+EndSection
+
+Section "InputDevice"
+    Driver        "wacom"
+    Identifier    "eraser"
+    Option        "Device"    "/dev/input/wacom"
+    Option        "Type"        "eraser"
+    Option        "ForceDevice"    "ISDV4"        # Tablet PC ONLY
+EndSection
+
+Section "InputDevice"
+    Driver        "wacom"
+    Identifier    "cursor"
+    Option        "Device"    "/dev/input/wacom"
+    Option        "Type"        "cursor"
+    Option        "ForceDevice"    "ISDV4"        # Tablet PC ONLY
 EndSection
 
 Section "Device"
-        Identifier      "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller"
-        Driver          "intel"
-        BusID           "PCI:0:2:0"
-        Option "AccelMethod" "EXA"
+    Identifier    "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
+    Driver        "intel"
+    BusID        "PCI:0:2:0"
 EndSection
 
 Section "Monitor"
-        Identifier      "Generic Monitor"
-        Option          "DPMS"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
 EndSection
 
 Section "Screen"
-        Identifier      "Default Screen"
-        Device          "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller"
-        Monitor         "Generic Monitor"
-        DefaultDepth    24
-        SubSection "Display"
-                Modes           "1024x768" "720x400" "640x480"
-                Virtual         3000 2048
-        EndSubSection
+    Identifier    "Default Screen"
+    Device        "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
+    Monitor        "Generic Monitor"
+    DefaultDepth    24
+    SubSection "Display"
+        Modes        "800x480"
+    EndSubSection
 EndSection
 
 Section "ServerLayout"
-        Identifier      "Default Layout"
-        Screen          "Default Screen"
-        InputDevice     "Generic Keyboard"
-        InputDevice     "Configured Mouse"
+    Identifier    "Default Layout"
+    Screen        "Default Screen"
+    InputDevice    "Generic Keyboard"
+    InputDevice    "Configured Mouse"
 
 # Uncomment if you have a wacom tablet
-#       InputDevice     "stylus"        "SendCoreEvents"
-#       InputDevice     "cursor"        "SendCoreEvents"
-#       InputDevice     "eraser"        "SendCoreEvents"
-        InputDevice     "Synaptics Touchpad"
+#    InputDevice     "stylus"    "SendCoreEvents"
+#    InputDevice     "cursor"    "SendCoreEvents"
+#    InputDevice     "eraser"    "SendCoreEvents"
+    InputDevice    "Synaptics Touchpad"
 EndSection
 
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 @@
 require xserver-xf86-dri-lite.inc
 
 PE = "1"
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://drmfix.patch;patch=1"
 
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 @@
 require xserver-xf86-dri-lite.inc
 
 PE = "1"
-PR = "r1"
+PR = "r2"
 PV = "1.5.0+git${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"