]> git.openpandora.org Git - openembedded.git/commitdiff
qt4: bump PR for package.bbclass strip problem
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Mar 2010 09:58:41 +0000 (10:58 +0100)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Mar 2010 09:58:41 +0000 (10:58 +0100)
recipes/qt4/qt4-embedded.inc
recipes/qt4/qt4-x11-free-gles/linux.conf
recipes/qt4/qt4-x11-free-gles_4.6.2.bb
recipes/qt4/qt4-x11-free.inc

index e8184e772d65105f98686d93763674119b33739d..0ffd2fa629d3e98f4bfba200da11cac7b21aef46 100644 (file)
@@ -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"
index b5741574b8cb5144c91f9fd49c4ffd99b1b554bd..b825e5dc16a5ebd3028d6ac2b45fbf8c57b3088b 100644 (file)
@@ -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
index 8f2adf4b87c95fa0cb91b2e3d192150db25a9386..669cbf651e4030ecf667b9438a76aa8f226e5d2f 100644 (file)
@@ -1,5 +1,5 @@
 require qt4-x11-free.inc
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 QT_GLFLAGS = "-opengl es2 -no-openvg"
 
index dffe3a0d1764a6c7f974e9d6405a2e041b09c9a0..8879c90bafc4681218dab56cd775bd4011839935 100644 (file)
@@ -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 \