Patchwork [1/1] libQtOpenGL:Add libQtOpenGL to an lsb image

login
register
mail settings
Submitter Xiaofeng Yan
Date July 5, 2011, 8:40 a.m.
Message ID <033bcedc144922a1187ed4e9b6e8f480390f817f.1309785892.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/6955/
State New, archived
Headers show

Comments

Xiaofeng Yan - July 5, 2011, 8:40 a.m.
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>
---
 meta/recipes-extended/tasks/task-core-lsb.bb |   18 +-----------------
 meta/recipes-qt/qt4/qt4-x11-free.inc         |    2 +-
 2 files changed, 2 insertions(+), 18 deletions(-)
Richard Purdie - July 7, 2011, 12:32 p.m.
On Tue, 2011-07-05 at 16:40 +0800, Xiaofeng Yan wrote:
> 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>

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index 2ec63cc..672b487 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 87145a3..aed2ef5 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 = "r23"
 
-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}"