From 57a52f7882678d0cc0112cd1c764da108ac0583f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 30 Sep 2007 15:32:37 +0000
Subject: xserver-kdrive: make 1.3.0.0 and 1.4 build

---
 packages/xorg-xserver/files/.mtn2git_empty          |  0
 packages/xorg-xserver/files/xorg-avr32-support.diff | 19 +++++++++++++++++++
 packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb     |  5 +++--
 packages/xorg-xserver/xserver-kdrive_1.4.bb         |  4 +++-
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 packages/xorg-xserver/files/.mtn2git_empty
 create mode 100644 packages/xorg-xserver/files/xorg-avr32-support.diff

(limited to 'packages/xorg-xserver')

diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xorg-xserver/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/xorg-xserver/files/xorg-avr32-support.diff b/packages/xorg-xserver/files/xorg-avr32-support.diff
new file mode 100644
index 0000000000..dd7d379010
--- /dev/null
+++ b/packages/xorg-xserver/files/xorg-avr32-support.diff
@@ -0,0 +1,19 @@
+--- /tmp/servermd.h	2007-09-30 17:27:22.310911628 +0200
++++ xorg-server-1.4/include/servermd.h	2007-09-30 17:28:25.297799199 +0200
+@@ -130,6 +130,16 @@
+ 
+ #endif /* vax */
+ 
++#ifdef __avr32__
++
++#define IMAGE_BYTE_ORDER        MSBFirst
++#define BITMAP_BIT_ORDER        MSBFirst
++#define GLYPHPADBYTES           4
++#define GETLEFTBITS_ALIGNMENT   1
++#define AVOID_MEMORY_READ
++
++#endif /* __avr32__ */ 
++
+ #ifdef __arm32__
+ 
+ #define IMAGE_BYTE_ORDER        LSBFirst
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 5f0896f3ed..e49650dc61 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -19,7 +19,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://w100.patch;patch=1 \
 	file://w100-autofoo.patch;patch=1 \
 	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	"
+	file://xorg-avr32-support.diff;patch=1 \
+        "
 
 S = "${WORKDIR}/xorg-server-${PV}"
 
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb
index 87880c9ef8..8d91e3b8f3 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb
@@ -3,6 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate pixman"
 
 PE = "1"
+PR = "r1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -18,7 +19,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://xcalibrate-new-input-world-order.patch;patch=1 \
 	file://tslib-default-device.patch;patch=1 \
 	file://fbdev-evdev.patch;patch=1 \
-	"
+	file://xorg-avr32-support.diff;patch=1 \
+        "
 
 S = "${WORKDIR}/xorg-server-${PV}"
 
-- 
cgit 1.2.3-korg