diff options
| author | Robert Bragg <bob@openedhand.com> | 2008-09-22 23:40:14 +0000 |
|---|---|---|
| committer | Robert Bragg <bob@openedhand.com> | 2008-09-22 23:40:14 +0000 |
| commit | 0caca44655da6c20d8647f5adf3f0d96da7bdb95 (patch) | |
| tree | 7e40f38d24f27bc5439e9a2d9a6f045016c4f1b1 /meta | |
| parent | bc88c3a81b9c831dfd87e921063bc796f0a77b35 (diff) | |
| download | openembedded-core-0caca44655da6c20d8647f5adf3f0d96da7bdb95.tar.gz openembedded-core-0caca44655da6c20d8647f5adf3f0d96da7bdb95.tar.bz2 openembedded-core-0caca44655da6c20d8647f5adf3f0d96da7bdb95.tar.xz openembedded-core-0caca44655da6c20d8647f5adf3f0d96da7bdb95.zip | |
Adds eee901 specific support into clutter.inc and adds a new virtual/libgl
for clutter to depend on which all mesa build variants provide.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5229 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/poky.conf | 1 | ||||
| -rw-r--r-- | meta/conf/machine/eee901.conf | 1 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter.inc | 6 | ||||
| -rw-r--r-- | meta/packages/mesa/mesa-common.inc | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 87ee7ce4f..b0980bc6c 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -66,6 +66,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/meta/conf/machine/eee901.conf b/meta/conf/machine/eee901.conf index 0fe7e06ce..54d75c2c0 100644 --- a/meta/conf/machine/eee901.conf +++ b/meta/conf/machine/eee901.conf @@ -14,6 +14,7 @@ KERNEL_IMAGETYPE = "bzImage" PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2" PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite" XSERVER = "xserver-xf86-dri-lite \ xf86-input-mouse \ diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc index 67e52ef67..7a3ad7b63 100644 --- a/meta/packages/clutter/clutter.inc +++ b/meta/packages/clutter/clutter.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Clutter graphics library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch)" +COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch|eee901)" STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+" BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" @@ -34,6 +34,10 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " +DEPENDS_eee901 = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl" +EXTRA_OECONF_eee901 = "${BASE_CONF} --with-flavour=glx" +PACKAGE_ARCH_eee901 = "${MACHINE_ARCH}" + inherit autotools pkgconfig gtk-doc PACKAGES =+ "clutter-examples" diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc index 51b8f4644..b28d5b43e 100644 --- a/meta/packages/mesa/mesa-common.inc +++ b/meta/packages/mesa/mesa-common.inc @@ -7,6 +7,8 @@ LICENSE = "MIT" SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2" S = "${WORKDIR}/Mesa-${PV}" +PROVIDES = "virtual/libgl" + inherit autotools pkgconfig EXTRA_OECONF = "--disable-glu \ |