* [PATCH] qt4: add missing libglu dependency
@ 2012-11-05 10:31 Ross Burton
2012-11-05 17:09 ` Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Ross Burton @ 2012-11-05 10:31 UTC (permalink / raw)
To: openembedded-core
Qt4 needs to explicitly depend on libglu now that it's been split out of the
Mesa recipe.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 20ad30c..ef3ff81 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -3,11 +3,11 @@ require qt4.inc
DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
-DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
+DEPENDS += "virtual/libgl libglu virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
PROVIDES += "qt4-x11"
QT4DEPENDS = ""
-INC_PR = "r47"
+INC_PR = "r48"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
--
1.7.10
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] qt4: add missing libglu dependency
2012-11-05 10:31 [PATCH] qt4: add missing libglu dependency Ross Burton
@ 2012-11-05 17:09 ` Martin Jansa
2012-11-05 23:36 ` [PATCH] qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2012-11-05 17:09 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1691 bytes --]
On Mon, Nov 05, 2012 at 10:31:51AM +0000, Ross Burton wrote:
> Qt4 needs to explicitly depend on libglu now that it's been split out of the
> Mesa recipe.
I'll try to remove -lGLU from our linux.conf which seems to be only
reason why we depend on it.
./linux.conf:QMAKE_LIBS_OPENGL = -lGLU -lGL
Upstream has only -lGL in QMAKE_LIBS_OPENGL.
Cheers,
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-qt/qt4/qt4-x11-free.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index 20ad30c..ef3ff81 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -3,11 +3,11 @@ require qt4.inc
> DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
> HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> -DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
> +DEPENDS += "virtual/libgl libglu virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
> PROVIDES += "qt4-x11"
> QT4DEPENDS = ""
>
> -INC_PR = "r47"
> +INC_PR = "r48"
>
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
> QT_GLFLAGS_qemux86 = "-opengl"
> --
> 1.7.10
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf
2012-11-05 17:09 ` Martin Jansa
@ 2012-11-05 23:36 ` Martin Jansa
0 siblings, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2012-11-05 23:36 UTC (permalink / raw)
To: openembedded-core
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-qt/qt4/qt4-4.8.1/linux.conf | 2 +-
meta/recipes-qt/qt4/qt4-4.8.3/linux.conf | 2 +-
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-native.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
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 a541355..8670381 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)
QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_EGL = -lEGL
-QMAKE_LIBS_OPENGL = -lGLU -lGL
+QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
QMAKE_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 a541355..8670381 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)
QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_EGL = -lEGL
-QMAKE_LIBS_OPENGL = -lGLU -lGL
+QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index afca7f8..fbd8c28 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
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r49"
+INC_PR = "r50"
QT4EDEPENDS = ""
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 5f0fce1..ad20723 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 \
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-INC_PR = "r17"
+INC_PR = "r18"
inherit native
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 20ad30c..a50b0c7 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
PROVIDES += "qt4-x11"
QT4DEPENDS = ""
-INC_PR = "r47"
+INC_PR = "r48"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
--
1.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-05 23:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-05 10:31 [PATCH] qt4: add missing libglu dependency Ross Burton
2012-11-05 17:09 ` Martin Jansa
2012-11-05 23:36 ` [PATCH] qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox