diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-14 12:55:42 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-14 12:55:42 +0000 |
commit | 7ec0191a40411c952534f1029b7116459d35e53a (patch) | |
tree | 78b1b373c2ca504df965d744419d6fd11f728a8e /meta | |
parent | 7457fccbb05872e2c02195d8c5305a61b5115435 (diff) | |
download | poky-7ec0191a40411c952534f1029b7116459d35e53a.tar.gz |
xserver-kdrive: added patch for 1.3.0.0 to get it built with x11/git
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5504 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch | 18 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch new file mode 100644 index 0000000000..eb98fb82c7 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | --- | ||
2 | render/glyphstr.h | 1 + | ||
3 | 1 file changed, 1 insertion(+) | ||
4 | |||
5 | --- xorg-server-1.3.0.0.orig/render/glyphstr.h | ||
6 | +++ xorg-server-1.3.0.0/render/glyphstr.h | ||
7 | @@ -23,10 +23,11 @@ | ||
8 | */ | ||
9 | |||
10 | #ifndef _GLYPHSTR_H_ | ||
11 | #define _GLYPHSTR_H_ | ||
12 | |||
13 | +#include <X11/X.h> | ||
14 | #include <X11/extensions/renderproto.h> | ||
15 | #include "picture.h" | ||
16 | #include "screenint.h" | ||
17 | #include "regionstr.h" | ||
18 | #include "miscstruct.h" | ||
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index b1d654b391..54826e44e1 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | |||
@@ -3,7 +3,7 @@ require xserver-kdrive.inc | |||
3 | DEPENDS += "libxkbfile libxcalibrate" | 3 | DEPENDS += "libxkbfile libxcalibrate" |
4 | 4 | ||
5 | PE = "1" | 5 | PE = "1" |
6 | PR = "r21" | 6 | PR = "r22" |
7 | 7 | ||
8 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | 8 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ |
9 | file://extra-kmodes.patch;patch=1 \ | 9 | file://extra-kmodes.patch;patch=1 \ |
@@ -21,6 +21,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | |||
21 | file://hide-cursor-and-ppm-root.patch;patch=1 \ | 21 | file://hide-cursor-and-ppm-root.patch;patch=1 \ |
22 | file://xcalibrate_coords.patch;patch=1 \ | 22 | file://xcalibrate_coords.patch;patch=1 \ |
23 | file://fbdev_xrandr_ioctl.patch;patch=1 \ | 23 | file://fbdev_xrandr_ioctl.patch;patch=1 \ |
24 | file://scheduler.patch;patch=1" | 24 | file://scheduler.patch;patch=1 \ |
25 | file://fix-newer-xorg-headers.patch;patch=1" | ||
25 | 26 | ||
26 | S = "${WORKDIR}/xorg-server-${PV}" | 27 | S = "${WORKDIR}/xorg-server-${PV}" |