diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-09-08 21:12:15 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-09-08 21:12:15 +0000 |
| commit | 167c48ff43fa579f156c0cb906df2f1f17ad7b7e (patch) | |
| tree | 129a2abf6d611865213d91e824adf7a778d8eef4 /packages/xorg-xserver/xserver-kdrive_git.bb | |
| parent | d052d266644b8c23e966e8f3d3c761ff19877127 (diff) | |
xserver-kdrive-git: fixup
* convert to use xserver-kdrive-common.inc
* make patches apply
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive_git.bb')
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 58 |
1 files changed, 21 insertions, 37 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 4e511fe694..fd81ea54a5 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,47 +1,31 @@ -PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto" +require xserver-kdrive-common.inc +PV = "1.4+git${SRCDATE}" -PROVIDES = "virtual/xserver" -PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DEPENDS += "libxkbfile libxcalibrate pixman" -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +PE = "1" +FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ -# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://enable-tslib.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" + ${KDRIVE_COMMON_PATCHES} \ + file://fix_default_mode.patch;patch=1 \ + file://enable-xcalibrate.patch;patch=1 \ + file://hide-cursor-and-ppm-root.patch;patch=1 \ + file://xcalibrate_coords.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://w100-autofoo.patch;patch=1 \ + file://w100-fix-offscreen-bmp.patch;patch=1 \ + file://w100-new-input-world-order.patch;patch=1 \ + file://xcalibrate-new-input-world-order.patch;patch=1 \ + file://tslib-default-device.patch;patch=1 \ + file://fbdev-evdev.patch;patch=1 \ + " S = "${WORKDIR}/git" -inherit autotools pkgconfig +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx \ - --with-default-font-path=built-ins \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" +EXTRA_OECONF += "--enable-builtin-fonts --enable-kdrive-vesa" |