From 8231fc119b4e0f9d041da810f2aeb0bd77e7dfc5 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 29 Oct 2008 17:18:38 +0000 Subject: [netbook.conf] removes MACHINE_DRI_MODULES, use xf86-video-intel (not dri2) default MACHINE_DRI_MODULES is no longer used in the mesa recipe and the dri2 driver depends on dri2.h which depends on the xserver being built for dri2. Since the mesa package now splits up the dri drivers into seperate packages this adds mesa-dri-driver-i915 to XSERVER --- meta-moblin/conf/machine/netbook.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-moblin/conf/machine/netbook.conf b/meta-moblin/conf/machine/netbook.conf index 316545740..25dd551a2 100644 --- a/meta-moblin/conf/machine/netbook.conf +++ b/meta-moblin/conf/machine/netbook.conf @@ -17,12 +17,13 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" XSERVER ?= "xserver-xf86-dri-lite \ xf86-input-mouse \ xf86-input-keyboard \ xf86-input-synaptics \ - xf86-video-intel-dri2" -MACHINE_DRI_MODULES = "i915" + xf86-video-intel \ + mesa-dri-driver-i915" MACHINE_EXTRA_RDEPENDS = "rt2860" -- cgit v1.2.3