From cbf3ef91305558fb8a59e19c5987a9e9ca22013a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 10 Oct 2005 10:41:35 +0000 Subject: 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 --- .../packages/xserver/xserver-kdrive_20050207.bb | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'openembedded/packages/xserver/xserver-kdrive_20050207.bb') diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb index 53b704e36..65f142009 100644 --- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb +++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb @@ -20,7 +20,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 = "r2" +PR = "r4" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -35,18 +35,22 @@ 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://fbdev-not-fix.patch;patch=1" + file://fbdev-not-fix.patch;patch=1 " -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ - file://devfs.patch;patch=1 \ - file://disable-apm.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1" -SRC_URI_append_ipaq-pxa270 = " file://disable-apm.patch;patch=1" +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ + file://devfs.patch;patch=1 \ + file://disable-apm.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1" +SRC_URI_append_ipaq-pxa270= " file://disable-apm.patch;patch=1" +SRC_URI_append_h3900 = " file://disable-apm.patch;patch=1" +SRC_URI_append_h2200 = " file://disable-apm.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" PACKAGE_ARCH_c7x0 = "c7x0" PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270" +PACKAGE_ARCH_h3900 = "h3900" +PACKAGE_ARCH_h2200 = "h2200" S = "${WORKDIR}/xserver" -- cgit v1.2.3