summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-07-05 16:40:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-07 13:45:29 +0100
commitd988cfbb472e9246f7a8020877da773e7601c119 (patch)
treeb71845f388b1ad69aaebaa45d07a262f2e0ec791 /meta
parent9569e2b3471e0c61f2f105f8d611a1ba71cd93d0 (diff)
downloadpoky-d988cfbb472e9246f7a8020877da773e7601c119.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] (From OE-Core rev: f478f90821f5b6a5e5d5dd53708de008bc607a11) 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.bb18
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
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 = "\
173 gtk+ \ 173 gtk+ \
174 atk \ 174 atk \
175 libasound \ 175 libasound \
176" 176 ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
177
178RDEPENDS_task-core-lsb-graphic-add_qemux86 = "\
179 libqtopengl4 \
180"
181RDEPENDS_task-core-lsb-graphic-add_atom-pc = "\
182 libqtopengl4 \
183"
184RDEPENDS_task-core-lsb-graphic-add_qemuppc = "\
185 libqtopengl4 \
186"
187RDEPENDS_task-core-lsb-graphic-add_emenlow = "\
188 libqtopengl4 \
189"
190
191RDEPENDS_task-core-lsb-graphic-add_mpc8315e-rdb = "\
192 libqtopengl4 \
193" 177"
194 178
195# mesa-dri 179# 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
7 7
8INC_PR = "r24" 8INC_PR = "r24"
9 9
10QT_GLFLAGS ?= "-no-opengl" 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
12QT_GLFLAGS_qemuppc = "-opengl" 12QT_GLFLAGS_qemuppc = "-opengl"
13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" 13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"