diff options
author | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
commit | cbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch) | |
tree | f7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/packages/xserver/xserver-kdrive_20050624.bb | |
parent | 562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff) | |
download | openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2 openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip |
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/xserver/xserver-kdrive_20050624.bb')
-rw-r--r-- | openembedded/packages/xserver/xserver-kdrive_20050624.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb index 4031db9c2b..78e77a23a5 100644 --- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb +++ b/openembedded/packages/xserver/xserver-kdrive_20050624.bb @@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r10" +PR = "r12" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -34,12 +34,14 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ file://kmode.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" + S = "${WORKDIR}/xserver" inherit autotools pkgconfig |