diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-28 08:06:48 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-28 08:06:48 +0000 |
commit | b7546e3f46c52c23ab2cfbf0a0b1e13597cd20ef (patch) | |
tree | 1a90eec6d43d7bf4b7f12f2d3de3e8de24097152 /packages/xorg-xserver | |
parent | 937675435a1f0e44511bdc8ff6ef1d5d4029d5b8 (diff) | |
parent | 2c7c8e8d65c63b9492ccc6f754fed2a4307908cd (diff) |
merge of '36133f7d8e7f5d20b7036c64abff8ec2452f0282'
and 'cec9ba770f42c95b32a71550f948c06c6fdf7e48'
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r-- | packages/xorg-xserver/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/xorg-xserver/files/xorg-avr32-support.diff | 19 | ||||
-rw-r--r-- | packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 4 | ||||
-rw-r--r-- | packages/xorg-xserver/xserver-kdrive_1.4.bb | 3 |
4 files changed, 25 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 50b103495b..f2d9810ec4 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb @@ -19,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}" |