summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-06-09 16:15:16 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-06-09 16:15:16 +0000
commit818d628b6fec963041efb767040e44f18c78753d (patch)
treec95730baa9fb441836df9bee43f87e8491d14dec
parentc1526ee6224748ff7482b3d1d943daf9e93b5e61 (diff)
xservers now provide virtual/xserver
gpe and dvb images depend on xserver-kdrive BKrev: 40c73794oNaot1c_1TyXb-gVIUp9Hw
-rw-r--r--meta/gpe-image.oe2
-rw-r--r--meta/task-dvb.oe2
-rw-r--r--xserver/xserver-kdrive_cvs.oe17
-rw-r--r--xserver/xserver-xorg_cvs.oe2
4 files changed, 20 insertions, 3 deletions
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 5a2d6e6ae3..194a2f5f25 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,7 +1,7 @@
export IMAGE_BASENAME = "gpe-image"
DEPENDS = 'task-bootstrap \
- diet-x11 xserver matchbox-wm matchbox-desktop matchbox-panel \
+ diet-x11 xserver-kdrive matchbox-wm matchbox-desktop matchbox-panel \
meta-gpe ttf-bitstream-vera'
export IPKG_INSTALL = 'task-bootstrap xserver-kdrive-fbdev \
diff --git a/meta/task-dvb.oe b/meta/task-dvb.oe
index df1221015f..db1c38ad95 100644
--- a/meta/task-dvb.oe
+++ b/meta/task-dvb.oe
@@ -4,4 +4,4 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
ALLOW_EMPTY = 1
RDEPENDS = "dvbstream dvbtune xserver-kdrive-fbdev tda1004x-firmware gst-plugins"
-DEPENDS = "dvbstream dvbtune xserver tda1004x-firmware"
+DEPENDS = "dvbstream dvbtune xserver-kdrive tda1004x-firmware"
diff --git a/xserver/xserver-kdrive_cvs.oe b/xserver/xserver-kdrive_cvs.oe
index e69de29bb2..022bd03849 100644
--- a/xserver/xserver-kdrive_cvs.oe
+++ b/xserver/xserver-kdrive_cvs.oe
@@ -0,0 +1,17 @@
+PV = "0.0cvs${CVSDATE}"
+DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext randr render xrender libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext"
+PROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-ati ${PN}-doc ${PN}-dev ${PN}-locale"
+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"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-ati = "${bindir}/Xati"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver"
+S = "${WORKDIR}/xserver"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --disable-xinerama"
diff --git a/xserver/xserver-xorg_cvs.oe b/xserver/xserver-xorg_cvs.oe
index e9c5e37185..def9578a31 100644
--- a/xserver/xserver-xorg_cvs.oe
+++ b/xserver/xserver-xorg_cvs.oe
@@ -1,6 +1,6 @@
PV = "0.0cvs${CVSDATE}"
DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext randr render xrender libxrandr fixesext damageext xfont resourceext compositeext"
-PROVIDES = "xserver"
+PROVIDES = "virtual/xserver"
DESCRIPTION = "X server from freedesktop.org"
SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver"