summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bragg <bob@openedhand.com>2008-09-22 23:40:14 +0000
committerRobert Bragg <bob@openedhand.com>2008-09-22 23:40:14 +0000
commit0caca44655da6c20d8647f5adf3f0d96da7bdb95 (patch)
tree7e40f38d24f27bc5439e9a2d9a6f045016c4f1b1
parentbc88c3a81b9c831dfd87e921063bc796f0a77b35 (diff)
downloadpoky-0caca44655da6c20d8647f5adf3f0d96da7bdb95.tar.gz
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
-rw-r--r--meta/conf/distro/poky.conf1
-rw-r--r--meta/conf/machine/eee901.conf1
-rw-r--r--meta/packages/clutter/clutter.inc6
-rw-r--r--meta/packages/mesa/mesa-common.inc2
4 files changed, 9 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 87ee7ce4f0..b0980bc6c9 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -66,6 +66,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
66PREFERRED_PROVIDER_virtual/db-native ?= "db-native" 66PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
67PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" 67PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
68PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 68PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
69PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
69PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" 70PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
70PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" 71PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
71PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" 72PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/meta/conf/machine/eee901.conf b/meta/conf/machine/eee901.conf
index 0fe7e06ce6..54d75c2c0a 100644
--- a/meta/conf/machine/eee901.conf
+++ b/meta/conf/machine/eee901.conf
@@ -14,6 +14,7 @@ KERNEL_IMAGETYPE = "bzImage"
14 14
15PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2" 15PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2"
16PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" 16PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
17PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
17PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite" 18PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite"
18XSERVER = "xserver-xf86-dri-lite \ 19XSERVER = "xserver-xf86-dri-lite \
19 xf86-input-mouse \ 20 xf86-input-mouse \
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 67e52ef672..7a3ad7b636 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter graphics library"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch)" 5COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch|eee901)"
6 6
7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+" 7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" 8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
@@ -34,6 +34,10 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
34PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" 34PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
35LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " 35LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
36 36
37DEPENDS_eee901 = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
38EXTRA_OECONF_eee901 = "${BASE_CONF} --with-flavour=glx"
39PACKAGE_ARCH_eee901 = "${MACHINE_ARCH}"
40
37inherit autotools pkgconfig gtk-doc 41inherit autotools pkgconfig gtk-doc
38 42
39PACKAGES =+ "clutter-examples" 43PACKAGES =+ "clutter-examples"
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index 51b8f4644a..b28d5b43e5 100644
--- a/meta/packages/mesa/mesa-common.inc
+++ b/meta/packages/mesa/mesa-common.inc
@@ -7,6 +7,8 @@ LICENSE = "MIT"
7SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2" 7SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2"
8S = "${WORKDIR}/Mesa-${PV}" 8S = "${WORKDIR}/Mesa-${PV}"
9 9
10PROVIDES = "virtual/libgl"
11
10inherit autotools pkgconfig 12inherit autotools pkgconfig
11 13
12EXTRA_OECONF = "--disable-glu \ 14EXTRA_OECONF = "--disable-glu \