From 22c7a3a1c4d09eccd7d1276c3bf7499d6f90c758 Mon Sep 17 00:00:00 2001 From: Mei Lei Date: Mon, 4 Apr 2011 17:17:25 +0800 Subject: qemuppc: add libqtopengl4 for ppc Modify some configs for ppc to enable the libqtopengl4 support. This fixes [YOCTO #848] (From OE-Core rev: cc6763b81fafddcb112a6126373c594e3ec4b140) Signed-off-by: Mei Lei Signed-off-by: Richard Purdie --- meta/conf/machine/qemuppc.conf | 2 ++ meta/recipes-extended/tasks/task-poky-lsb.bb | 3 +++ meta/recipes-qt/qt4/qt4-x11-free.inc | 1 + 3 files changed, 6 insertions(+) (limited to 'meta') diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 83d0841159..bfbcc7f1aa 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf @@ -4,6 +4,8 @@ TARGET_ARCH = "powerpc" +PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib" + require conf/machine/include/qemu.inc require conf/machine/include/tune-ppc603e.inc diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-poky-lsb.bb index 7b3c41a85c..6fea613cc0 100644 --- a/meta/recipes-extended/tasks/task-poky-lsb.bb +++ b/meta/recipes-extended/tasks/task-poky-lsb.bb @@ -172,6 +172,9 @@ RDEPENDS_task-poky-lsb-graphic-add_qemux86 = "\ RDEPENDS_task-poky-lsb-graphic-add_atom-pc = "\ libqtopengl4 \ " +RDEPENDS_task-poky-lsb-graphic-add_qemuppc = "\ + libqtopengl4 \ +" # mesa-dri diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 057a129ecf..306adb9d2e 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -12,6 +12,7 @@ QT_GLFLAGS ?= "-no-opengl" QT_GLFLAGS_qemux86 = "-opengl" QT_GLFLAGS_emenlow = "-opengl" QT_GLFLAGS_atom-pc = "-opengl" +QT_GLFLAGS_qemuppc = "-opengl" QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" QT_BASE_NAME ?= "qt4" QT_BASE_LIB ?= "libqt" -- cgit v1.2.3-54-g00ecf