summaryrefslogtreecommitdiff
path: root/xserver
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2004-07-12 22:48:19 +0000
committerHolger Freyther <zecke@selfish.org>2004-07-12 22:48:19 +0000
commit816816b775ec83475d9f4e7e2d7464a8cb3c6803 (patch)
tree22555ad796581da11bded0698664131fe8064856 /xserver
parent795f240d2d514a68fb5ce754eed4bf162963167a (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported 2004/07/13 00:47:42+02:00 handhelds.org!zecke xserver-kdrive upstream src got a configure.ac which tries to use xkbfile. For us this makes the do_configure step fail. Patch configure.ac to not use xkbfile Patch included to do so Still kdrive depends on compositeext_cvs BKrev: 40f31533qDM8Nxh7vUZTeVsA9gk9WQ
Diffstat (limited to 'xserver')
-rw-r--r--xserver/xserver-cvs/xkbfile.patch0
-rw-r--r--xserver/xserver-kdrive_cvs.oe9
2 files changed, 8 insertions, 1 deletions
diff --git a/xserver/xserver-cvs/xkbfile.patch b/xserver/xserver-cvs/xkbfile.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/xserver/xserver-cvs/xkbfile.patch
diff --git a/xserver/xserver-kdrive_cvs.oe b/xserver/xserver-kdrive_cvs.oe
index ab9249a0ac..938ecd0a93 100644
--- a/xserver/xserver-kdrive_cvs.oe
+++ b/xserver/xserver-kdrive_cvs.oe
@@ -6,12 +6,19 @@ DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/xserver-cvs"
+
+PR = "r1"
+
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
FILES_xserver-kdrive-ati = "${bindir}/Xati"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver \
+ file://xkbfile.patch;patch=1 "
S = "${WORKDIR}/xserver"
+
+
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-composite --disable-xinerama"