From 2f6358fffd24715cf4f927874a7b13ef2a58f390 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 10 Dec 2009 12:22:28 +0100 Subject: qt 4.6.0: move common 4.6 stuff to a .inc --- recipes/qt4/qt-4.6.0.inc | 38 ++++++++++++++++++++++++++++++++++++++ recipes/qt4/qt4-embedded_4.6.0.bb | 35 +---------------------------------- recipes/qt4/qt4-x11-free_4.6.0.bb | 37 +------------------------------------ 3 files changed, 40 insertions(+), 70 deletions(-) create mode 100644 recipes/qt4/qt-4.6.0.inc (limited to 'recipes/qt4') diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc new file mode 100644 index 0000000000..aa85facce7 --- /dev/null +++ b/recipes/qt4/qt-4.6.0.inc @@ -0,0 +1,38 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-embedded.inc + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://0009-support-2bpp.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" + +do_configure_prepend() { + sed -i \ + -e /QMAKE_MOC\ /d \ + -e /QMAKE_UIC\ /d \ + -e /QMAKE_UIC3\ /d \ + -e /QMAKE_RCC\ /d \ + ${S}/configure + +# sed -i /tools.pro/d ${S}/src/src.pro +} + +do_install_append() { + install -d ${D}${bindir} + for i in rcc uic moc ; do + install -m 0755 ${S}/bin/$i ${D}${bindir}/ + done +} + +LICENSE = "LGPLv2.1 GPLv3" +SRC_URI += " \ + file://hack-out-pg_config.patch;patch=1" diff --git a/recipes/qt4/qt4-embedded_4.6.0.bb b/recipes/qt4/qt4-embedded_4.6.0.bb index 1bdca87a0d..3bde65014d 100644 --- a/recipes/qt4/qt4-embedded_4.6.0.bb +++ b/recipes/qt4/qt4-embedded_4.6.0.bb @@ -1,38 +1,5 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-embedded.inc PR = "${INC_PR}.0" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://0009-support-2bpp.patch;patch=1 \ - file://fix-config-tests.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -do_configure_prepend() { - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done -} +require qt-4.6.0.inc -LICENSE = "LGPLv2.1 GPLv3" -SRC_URI += " \ - file://hack-out-pg_config.patch;patch=1" diff --git a/recipes/qt4/qt4-x11-free_4.6.0.bb b/recipes/qt4/qt4-x11-free_4.6.0.bb index 4b5eabff5c..1b5b4524c8 100644 --- a/recipes/qt4/qt4-x11-free_4.6.0.bb +++ b/recipes/qt4/qt4-x11-free_4.6.0.bb @@ -1,45 +1,10 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-x11-free.inc -LICENSE = "LGPLv2.1 GPLv3" PR = "${INC_PR}.0" -export MOC = "${OE_QMAKE_MOC}" -export QMAKE_MOC = "${OE_QMAKE_MOC}" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://fix-config-tests.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ -" - -SRC_URI += "file://hack-out-pg_config.patch;patch=1" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" +require qt-4.6.0.inc QT_CONFIG_FLAGS += " \ -no-embedded \ -xrandr \ -x11" -do_configure_prepend() { - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done -} -- cgit v1.2.3 From 37f8d271e8e4e8ce72378b048a27a5c4fce32ffe Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 10 Dec 2009 19:37:29 +0100 Subject: qt 4.6.0: make it build, add GLES versions * recipes still need lots of cleanup and fixes, help welcome --- recipes/qt4/qt-4.6.0.inc | 5 ++ .../0010-no-simpledecoration-example.patch | 12 +++-- recipes/qt4/qt4-embedded-4.6.0/linux.conf | 2 +- recipes/qt4/qt4-embedded-gles/linux.conf | 63 ++++++++++++++++++++++ recipes/qt4/qt4-embedded-gles_4.6.0.bb | 13 +++++ .../0010-no-simpledecoration-example.patch | 11 ++++ recipes/qt4/qt4-x11-free-4.6.0/linux.conf | 2 +- recipes/qt4/qt4-x11-free-gles/linux.conf | 60 +++++++++++++++++++++ recipes/qt4/qt4-x11-free-gles_4.6.0.bb | 17 ++++++ 9 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 recipes/qt4/qt4-embedded-gles/linux.conf create mode 100644 recipes/qt4/qt4-embedded-gles_4.6.0.bb create mode 100644 recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch create mode 100644 recipes/qt4/qt4-x11-free-gles/linux.conf create mode 100644 recipes/qt4/qt4-x11-free-gles_4.6.0.bb (limited to 'recipes/qt4') diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc index aa85facce7..c6694f11ce 100644 --- a/recipes/qt4/qt-4.6.0.inc +++ b/recipes/qt4/qt-4.6.0.inc @@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. file://0006-freetype-host-includes.patch;patch=1 \ file://0008-qt-lib-infix.patch;patch=1 \ file://0009-support-2bpp.patch;patch=1 \ + file://0010-no-simpledecoration-example.patch;patch=1 \ file://fix-config-tests.patch;patch=1 \ file://g++.conf \ file://linux.conf \ @@ -16,6 +17,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" do_configure_prepend() { + sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf sed -i \ -e /QMAKE_MOC\ /d \ -e /QMAKE_UIC\ /d \ @@ -26,6 +28,9 @@ do_configure_prepend() { # sed -i /tools.pro/d ${S}/src/src.pro } +QT_GLFLAGS ?= "" +QT_CONFIG_FLAGS += "${QT_GLFLAGS}" + do_install_append() { install -d ${D}${bindir} for i in rcc uic moc ; do diff --git a/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch index 070b4ac9c1..fce5bba938 100644 --- a/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch +++ b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch @@ -1,9 +1,11 @@ ---- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro 2009-02-25 22:32:34.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro 2009-03-26 19:53:19.000000000 +0100 -@@ -1,5 +1,5 @@ +--- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100 +@@ -1,7 +1,7 @@ TEMPLATE = subdirs --SUBDIRS = framebuffer mousecalibration simpledecoration -+SUBDIRS = framebuffer mousecalibration + # no /dev/fbX + !qnx:!vxworks:SUBDIRS = framebuffer +-SUBDIRS += mousecalibration simpledecoration ++SUBDIRS += mousecalibration # install sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/recipes/qt4/qt4-embedded-4.6.0/linux.conf b/recipes/qt4/qt4-embedded-4.6.0/linux.conf index 2e862407bc..68ae80b929 100644 --- a/recipes/qt4/qt4-embedded-4.6.0/linux.conf +++ b/recipes/qt4/qt4-embedded-4.6.0/linux.conf @@ -15,7 +15,7 @@ QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = -QMAKE_LIBS = -lglib-2.0 +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) diff --git a/recipes/qt4/qt4-embedded-gles/linux.conf b/recipes/qt4/qt4-embedded-gles/linux.conf new file mode 100644 index 0000000000..a530c75913 --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles/linux.conf @@ -0,0 +1,63 @@ +# +# qmake configuration for common linux +# + +QMAKE_CFLAGS_THREAD += -D_REENTRANT +QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_EGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL_ES2 = ${STAGING_INCDIR}/GLES2 +QMAKE_LIBDIR_EGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL_ES2 = ${STAGING_LIBDIR} + +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +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 + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) +QMAKE_UIC3 = $(OE_QMAKE_UIC3) +QMAKE_RCC = $(OE_QMAKE_RCC) +QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) +QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_OBJCOPY = ${OBJCOPY} +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p +QMAKE_INSTALL_FILE = install -m 644 -p +QMAKE_INSTALL_PROGRAM = install -m 755 -p + +#These defines are documented in the powervr README, please read it +DEFINES += QT_QWS_CLIENTBLIT QT_NO_QWS_CURSOR + +include(unix.conf) diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb new file mode 100644 index 0000000000..f988f9828b --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb @@ -0,0 +1,13 @@ + +PR = "${INC_PR}.0" + +QT_GLFLAGS = "-opengl es2 -openvg" + +require qt-4.6.0.inc + + +FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded" + +DEPENDS += "virtual/egl" + + diff --git a/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch new file mode 100644 index 0000000000..fce5bba938 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch @@ -0,0 +1,11 @@ +--- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100 +@@ -1,7 +1,7 @@ + TEMPLATE = subdirs + # no /dev/fbX + !qnx:!vxworks:SUBDIRS = framebuffer +-SUBDIRS += mousecalibration simpledecoration ++SUBDIRS += mousecalibration + + # install + sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/recipes/qt4/qt4-x11-free-4.6.0/linux.conf b/recipes/qt4/qt4-x11-free-4.6.0/linux.conf index 2e862407bc..68ae80b929 100644 --- a/recipes/qt4/qt4-x11-free-4.6.0/linux.conf +++ b/recipes/qt4/qt4-x11-free-4.6.0/linux.conf @@ -15,7 +15,7 @@ QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = -QMAKE_LIBS = -lglib-2.0 +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) diff --git a/recipes/qt4/qt4-x11-free-gles/linux.conf b/recipes/qt4/qt4-x11-free-gles/linux.conf new file mode 100644 index 0000000000..b5741574b8 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-gles/linux.conf @@ -0,0 +1,60 @@ +# +# qmake configuration for common linux +# + +QMAKE_CFLAGS_THREAD += -D_REENTRANT +QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_EGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES2 +QMAKE_INCDIR_OPENGL_ES2 = ${STAGING_INCDIR}/GLES2 +QMAKE_LIBDIR_EGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL = ${STAGING_LIBDIR} +QMAKE_LIBDIR_OPENGL_ES2 = ${STAGING_LIBDIR} + +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +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 + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) +QMAKE_UIC3 = $(OE_QMAKE_UIC3) +QMAKE_RCC = $(OE_QMAKE_RCC) +QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) +QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_OBJCOPY = ${OBJCOPY} +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p +QMAKE_INSTALL_FILE = install -m 644 -p +QMAKE_INSTALL_PROGRAM = install -m 755 -p + +include(unix.conf) diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb new file mode 100644 index 0000000000..36b6ec5a25 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb @@ -0,0 +1,17 @@ + +PR = "${INC_PR}.0" + +QT_GLFLAGS = "-opengl es2 -openvg" + +require qt-4.6.0.inc + +QT_CONFIG_FLAGS += " \ + -no-embedded \ + -xrandr \ + -x11" + +FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" + +DEPENDS += "virtual/egl" + + -- cgit v1.2.3 From 8424a955b39d55e1f5fc17903507909ba7139dc1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 10 Dec 2009 20:00:01 +0100 Subject: qt 4.6.0: fix packaging a bit * the uic, moc and rcc tools still need to get packages, but we have package all libs now --- recipes/qt4/qt-4.6.0.inc | 5 +++++ recipes/qt4/qt4.inc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'recipes/qt4') diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc index c6694f11ce..97ad6cdd74 100644 --- a/recipes/qt4/qt-4.6.0.inc +++ b/recipes/qt4/qt-4.6.0.inc @@ -31,6 +31,11 @@ do_configure_prepend() { QT_GLFLAGS ?= "" QT_CONFIG_FLAGS += "${QT_GLFLAGS}" +do_compile() { + unset CFLAGS CXXFLAGS + oe_runmake ${EXTRA_ENV} +} + do_install_append() { install -d ${D}${bindir} for i in rcc uic moc ; do diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 50dd1d8760..7d600a825c 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -23,7 +23,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ export QT_CONF_PATH="${WORKDIR}/qt.conf" # Library packages -QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon" +QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon QtMultimedia QtOpenVG" QT_EXTRA_LIBS = "pvrQWSWSEGL" -- cgit v1.2.3