diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-11-29 13:46:08 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-11-29 13:46:08 +0000 |
| commit | fb66e592cba4e91fdb85570cfb51e4110ea75b28 (patch) | |
| tree | 018f99af09b92a1ec7734192984798db855ccac7 /packages/xorg-xserver | |
| parent | 82ef14e73032b4364c7ef2b372f9868f5ceed793 (diff) | |
| parent | 8c1a5e33bf439c0274b795cc580a30c5de951df7 (diff) | |
propagate from branch 'org.openembedded.dev' (head 0238eff8862126ac83c3f05d7a6fb094feff89e9)
to branch 'org.openembedded.dev.avr32' (head afeaa97ba6962d277699aab10b0b6a8089342824)
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 | 11 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_1.4.bb | 4 |
4 files changed, 28 insertions, 6 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 f78bef05ae..98dfb0ae67 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 = "r21" +PR = "r22" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -19,10 +19,11 @@ 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://kdrive-1.3-18bpp.patch;patch=1 \ - file://gumstix-kmode.patch;patch=1 \ - file://smedia-glamo.patch;patch=1 \ - file://build-glamo.patch;patch=1 \ + file://xorg-avr32-support.diff;patch=1 \ + file://kdrive-1.3-18bpp.patch;patch=1 \ + file://gumstix-kmode.patch;patch=1 \ + file://smedia-glamo.patch;patch=1 \ + file://build-glamo.patch;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}" |