diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-08-02 07:15:30 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-08-02 07:15:30 +0000 |
| commit | b3e110eff605bd2361ea92bd748f59e48d508f33 (patch) | |
| tree | 585a741d28885236452581e718ba458c6fd02c3d /packages/xorg-xserver/xserver-kdrive_git.bb | |
| parent | 81ded5cd087778af9e1a13e7a207b55b5448e07b (diff) | |
xorg mega commit: merge in change from poky
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive_git.bb')
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 50 |
1 files changed, 40 insertions, 10 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 74d0aed432..74323cd320 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,18 +1,48 @@ +PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -require xserver-kdrive-common.inc +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto" -DEPENDS += "libxkbfile libxcalibrate" +PROVIDES = "virtual/xserver" +RPROVIDES = "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" -PE = "1" -PV = "1.2.0+git${SRCDATE}" -PR = "r8" +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ - ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://build-fix-panoramix.patch;patch=1 \ - " + 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" S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +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" |