summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-11-06 00:36:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-12 13:36:38 +0000
commit7ee2410825cb30b7f073c69d8c32a498835f0eec (patch)
treeeecba73559774eb26623d731af2817672ae3332e
parente828faf027540bc5def8b7371a959884caad9557 (diff)
downloadpoky-7ee2410825cb30b7f073c69d8c32a498835f0eec.tar.gz
qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf
upstream does not need GLU since: commit e7eed096a0c33607a7a37baaf06e5952dc9d556b Author: Bj<C3><B8>rn Erik Nilsen <bjorn.nilsen@nokia.com> Date: Mon Aug 9 14:07:01 2010 +0200 Remove dependency of OpenGL Utility Library (GLU). GLU is not part of standard OpenGL and is not used internally in Qt, so we should not depend on it. Task-number: QT-12227 Reviewed-by: kim (From OE-Core rev: 181874ba8033535bb4ce2b36725ae0a71c27b3bd) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/linux.conf2
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.3/linux.conf2
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
index a54135513b..86703813ca 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
@@ -29,7 +29,7 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) 29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
30QMAKE_LIBS_NIS = -lnsl 30QMAKE_LIBS_NIS = -lnsl
31QMAKE_LIBS_EGL = -lEGL 31QMAKE_LIBS_EGL = -lEGL
32QMAKE_LIBS_OPENGL = -lGLU -lGL 32QMAKE_LIBS_OPENGL = -lGL
33QMAKE_LIBS_OPENGL_QT = -lGL 33QMAKE_LIBS_OPENGL_QT = -lGL
34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM 34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
index a54135513b..86703813ca 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
@@ -29,7 +29,7 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) 29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
30QMAKE_LIBS_NIS = -lnsl 30QMAKE_LIBS_NIS = -lnsl
31QMAKE_LIBS_EGL = -lEGL 31QMAKE_LIBS_EGL = -lEGL
32QMAKE_LIBS_OPENGL = -lGLU -lGL 32QMAKE_LIBS_OPENGL = -lGL
33QMAKE_LIBS_OPENGL_QT = -lGL 33QMAKE_LIBS_OPENGL_QT = -lGL
34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM 34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index afca7f881f..fbd8c28f77 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
2SECTION = "libs" 2SECTION = "libs"
3HOMEPAGE = "http://qt.nokia.com" 3HOMEPAGE = "http://qt.nokia.com"
4DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
5INC_PR = "r49" 5INC_PR = "r50"
6 6
7QT4EDEPENDS = "" 7QT4EDEPENDS = ""
8QT_BASE_LIB ?= "libqt-embedded" 8QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 5f0fce16f7..ad207231c7 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
11 11
12INC_PR = "r17" 12INC_PR = "r18"
13 13
14inherit native 14inherit native
15 15
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 20ad30c579..a50b0c7760 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
7PROVIDES += "qt4-x11" 7PROVIDES += "qt4-x11"
8QT4DEPENDS = "" 8QT4DEPENDS = ""
9 9
10INC_PR = "r47" 10INC_PR = "r48"
11 11
12QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 12QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
13QT_GLFLAGS_qemux86 = "-opengl" 13QT_GLFLAGS_qemux86 = "-opengl"