summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-12-30 15:26:55 +0000
committerKoen Kooi <koen@openembedded.org>2007-12-30 15:26:55 +0000
commitc491b0c9b2c06239f268cb309083eb21c53e4286 (patch)
tree0ba93ab4a238fdcd18ff0629201d819dae3326cb /packages/xorg-xserver
parentf0ade73c77036bea989835d91e38af494a1b26d9 (diff)
parente49ed8da00b7a5d874fd92a806c6b036a726069c (diff)
propagate from branch 'org.openembedded.dev' (head 968e6781dca5ee420f8b36434c88d54cafe77f35)
to branch 'org.openembedded.dev.avr32' (head facce641a6e2c90f8a2171880eafb72136895681)
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r--packages/xorg-xserver/files/.mtn2git_empty0
-rw-r--r--packages/xorg-xserver/files/xorg-avr32-support.diff19
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb4
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.4.bb4
4 files changed, 26 insertions, 1 deletions
diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xorg-xserver/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/files/.mtn2git_empty
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 4367e40adf..71d0eccba8 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -29,6 +29,10 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://03-xglamo-no-vesa.patch;patch=1 \
"
+SRC_URI_append_avr32 = " \
+ file://xorg-avr32-support.diff;patch=1 \
+"
+
SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1"
PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}"
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}"