summaryrefslogtreecommitdiff
path: root/meta/packages/xorg-xserver
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-10-14 12:55:42 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-10-14 12:55:42 +0000
commit7ec0191a40411c952534f1029b7116459d35e53a (patch)
tree78b1b373c2ca504df965d744419d6fd11f728a8e /meta/packages/xorg-xserver
parent7457fccbb05872e2c02195d8c5305a61b5115435 (diff)
downloadopenembedded-core-7ec0191a40411c952534f1029b7116459d35e53a.tar.gz
openembedded-core-7ec0191a40411c952534f1029b7116459d35e53a.tar.bz2
openembedded-core-7ec0191a40411c952534f1029b7116459d35e53a.tar.xz
openembedded-core-7ec0191a40411c952534f1029b7116459d35e53a.zip
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/packages/xorg-xserver')
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch18
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb5
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 000000000..eb98fb82c
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch
@@ -0,0 +1,18 @@
+---
+ render/glyphstr.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- xorg-server-1.3.0.0.orig/render/glyphstr.h
++++ xorg-server-1.3.0.0/render/glyphstr.h
+@@ -23,10 +23,11 @@
+ */
+
+ #ifndef _GLYPHSTR_H_
+ #define _GLYPHSTR_H_
+
++#include <X11/X.h>
+ #include <X11/extensions/renderproto.h>
+ #include "picture.h"
+ #include "screenint.h"
+ #include "regionstr.h"
+ #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 b1d654b39..54826e44e 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
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r21"
+PR = "r22"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://extra-kmodes.patch;patch=1 \
@@ -21,6 +21,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://hide-cursor-and-ppm-root.patch;patch=1 \
file://xcalibrate_coords.patch;patch=1 \
file://fbdev_xrandr_ioctl.patch;patch=1 \
- file://scheduler.patch;patch=1"
+ file://scheduler.patch;patch=1 \
+ file://fix-newer-xorg-headers.patch;patch=1"
S = "${WORKDIR}/xorg-server-${PV}"