[oe-commits] Koen Kooi : qt4: bump PR for package.bbclass strip problem

git version control git at git.openembedded.org
Mon Mar 1 11:02:07 UTC 2010


Module: openembedded.git
Branch: shr/unstable
Commit: 39e7c169d8ea3f87ffda52fda78a30e47e8e11a2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=39e7c169d8ea3f87ffda52fda78a30e47e8e11a2

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Mar  1 10:58:41 2010 +0100

qt4: bump PR for package.bbclass strip problem

---

 recipes/qt4/qt4-embedded.inc             |    2 +-
 recipes/qt4/qt4-x11-free-gles/linux.conf |    1 -
 recipes/qt4/qt4-x11-free-gles_4.6.2.bb   |    2 +-
 recipes/qt4/qt4-x11-free.inc             |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index e8184e7..0ffd2fa 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r15"
+INC_PR = "r16"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4-x11-free-gles/linux.conf b/recipes/qt4/qt4-x11-free-gles/linux.conf
index b574157..b825e5d 100644
--- a/recipes/qt4/qt4-x11-free-gles/linux.conf
+++ b/recipes/qt4/qt4-x11-free-gles/linux.conf
@@ -25,7 +25,6 @@ QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
 QMAKE_LIBS_NIS        = -lnsl
 QMAKE_LIBS_EGL        = -lEGL -lIMGegl -lsrv_um
 QMAKE_LIBS_OPENGL_QT  = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um
-QMAKE_LIBS_OPENVG     = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um -lOpenVG -lOpenVGU
 QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um 
 
 QMAKE_LIBS_THREAD     = -lpthread
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
index 8f2adf4..669cbf6 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
@@ -1,5 +1,5 @@
 require qt4-x11-free.inc
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 QT_GLFLAGS = "-opengl es2 -no-openvg"
 
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index dffe3a0..8879c90 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r14"
+INC_PR = "r15"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \





More information about the Openembedded-commits mailing list