10 files changed, 55 insertions, 17 deletions
diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc
index b00893da6d..fd4b2f6045 100644
--- a/recipes/xorg-xserver/xserver-kdrive-common.inc
+++ b/recipes/xorg-xserver/xserver-kdrive-common.inc
@@ -1,6 +1,7 @@
 LICENSE = "MIT"
 DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto xineramaproto videoproto xextproto xproto \
-	libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans"
+	libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans xextproto-70-includes"
+INC_PR = "r28"
 
 PKGN ?= "xserver-kdrive"
 
@@ -94,6 +95,8 @@ inherit autotools pkgconfig
 
 ARM_INSTRUCTION_SET = "arm"
 
+CFLAGS_prepend = "-I${STAGING_INCDIR}/xextproto-70 "
+
 EXTRA_OECONF = "--enable-composite --enable-kdrive \
                 --disable-dga --disable-dri --disable-xinerama \
                 --disable-xf86misc --disable-xf86vidmode \
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 1b052e7926..34b5c0d05e 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r27"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index b6322769ab..25715a82a8 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r8"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
index e6e791ad4f..d0b7ac17e0 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r3"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 161390179d..187de43996 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -6,7 +6,7 @@ RDEPENDS += "hal"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r4"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
index e792c84ce0..43a07f9a3f 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
index 686826eca3..ab7c594c87 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -6,7 +6,7 @@ RDEPENDS += "hal"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/recipes/xorg-xserver/xserver-kdrive_git.bb b/recipes/xorg-xserver/xserver-kdrive_git.bb
index 2e1da5c977..4de73e8fc1 100644
--- a/recipes/xorg-xserver/xserver-kdrive_git.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_git.bb
@@ -6,7 +6,7 @@ PV = "1.4+git${SRCDATE}"
 DEPENDS += "libxkbfile libxcalibrate pixman"
 
 PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf
index 7f3eb7797f..bdd6d71404 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf
@@ -1,11 +1,46 @@
-Section "ServerLayout"
-    Identifier "default"
-    InputDevice "atmel-ts" "CorePointer"
+#
+# X11 configuration for Ronetix PM9263 device.
+# (C)2009 Koan sas - www.KoanSoftware.com
+#
+
+Section "Monitor"
+        Identifier      "Display"
+EndSection
+
+Section "Device"
+        Identifier      "fbdevice"
+        Driver  	"fbdev"
+	Option 		"fbdev" "/dev/fb0"
+	Option 		"shadowfb" "true"
+EndSection
+
+Section "Screen"
+        Identifier      "fbscreen"
+        Device  	"fbdevice"
+        Monitor 	"Display"
 EndSection
 
 Section "InputDevice"
-    Identifier "atmel-ts"
-    Driver "evdev"
-    Option "SwapAxes" "1"
-    Option "Device" "/dev/input/touchscreen0"
+        Identifier      "atmel-ts"
+        Driver          "evdev"
+        Option          "SwapAxes" "1"
+        Option          "Device" "/dev/input/touchscreen0"
 EndSection
+
+Section "InputDevice"
+        Identifier      "Generic Mouse"
+        Driver          "mouse"   
+        Option          "CorePointer"
+EndSection
+
+Section "ServerLayout"
+        Identifier      "Layout"
+        Screen  	"fbscreen"
+        InputDevice     "Generic Mouse"
+        InputDevice 	"atmel-ts" "CorePointer"
+EndSection
+
+Section "ServerFlags"
+	Option "AutoAddDevices" "false"
+EndSection
+
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
index af01a9024d..edede8b3ff 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
             file://dolt-fix-1.7.0.patch;patch=1 \
@@ -20,7 +20,7 @@ do_install_prepend() {
 # The NVidia driver requires Xinerama support in the X server. Ion uses it.
 XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
 
-EXTRA_OECONF += "--disable-xephyr --disable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
 EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
 
 export LDFLAGS += " -ldl "