diff options
| author |   Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-07-05 16:40:46 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-07 13:32:29 +0100 |
| commit | f478f90821f5b6a5e5d5dd53708de008bc607a11 (patch) | |
| tree | 61a8a882a7f0cbe4697a8b18e1a3e6bc034dd6cb /meta | |
| parent | 8fdea2a1ac8875a42b3a57f0fd7b530f851c20e9 (diff) | |
| download | openembedded-core-contrib-f478f90821f5b6a5e5d5dd53708de008bc607a11.tar.gz | |
libQtOpenGL:Add libQtOpenGL to an lsb image
I make "opengl" as a DISTO_FEATURE for installing libQtOpenGL to image.
Fix Bug [YOCTO #1020]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/tasks/task-core-lsb.bb | 18 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 |
2 files changed, 2 insertions, 18 deletions
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb index 2ec63ccd83..672b487dfc 100644 --- a/meta/recipes-extended/tasks/task-core-lsb.bb +++ b/meta/recipes-extended/tasks/task-core-lsb.bb @@ -173,23 +173,7 @@ RDEPENDS_task-core-lsb-graphic-add = "\ gtk+ \ atk \ libasound \ -" - -RDEPENDS_task-core-lsb-graphic-add_qemux86 = "\ - libqtopengl4 \ -" -RDEPENDS_task-core-lsb-graphic-add_atom-pc = "\ - libqtopengl4 \ -" -RDEPENDS_task-core-lsb-graphic-add_qemuppc = "\ - libqtopengl4 \ -" -RDEPENDS_task-core-lsb-graphic-add_emenlow = "\ - libqtopengl4 \ -" - -RDEPENDS_task-core-lsb-graphic-add_mpc8315e-rdb = "\ - libqtopengl4 \ + ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ " # mesa-dri diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 7a30af6324..e6169f3dcf 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -7,7 +7,7 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender li INC_PR = "r24" -QT_GLFLAGS ?= "-no-opengl" +QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" QT_GLFLAGS_qemuppc = "-opengl" QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" |