* Update qt to 4.7.3
@ 2011-05-11 20:29 Eric Bénard
2011-05-11 20:30 ` [PATCH 1/6] qt4: introduce version 4.7.3 Eric Bénard
` (8 more replies)
0 siblings, 9 replies; 21+ messages in thread
From: Eric Bénard @ 2011-05-11 20:29 UTC (permalink / raw)
To: openembedded-devel
Hi,
Please test these recipes you are interested in as for now I only compile
tested qt4-embedded & qt4-native.
Thanks
Eric
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/6] qt4: introduce version 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
@ 2011-05-11 20:30 ` Eric Bénard
2011-05-12 8:47 ` Martin Jansa
2011-05-11 20:30 ` [PATCH 2/6] minimal: prefer qt 4.7.3 Eric Bénard
` (7 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Eric Bénard @ 2011-05-11 20:30 UTC (permalink / raw)
To: openembedded-devel
only qt4-embedded and qt4-native recipe were tested
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/qt4/qt-4.7.3.inc | 72 ++++++++++++++++++++
.../0001-Added-Openembedded-crossarch-option.patch | 44 ++++++++++++
.../0010-phonon-gstreamer-rgb-endianess.patch | 23 ++++++
recipes/qt4/qt-4.7.3/g++.conf | 60 ++++++++++++++++
recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | 19 +++++
recipes/qt4/qt-4.7.3/linux.conf | 66 ++++++++++++++++++
recipes/qt4/qt4-embedded-gles_4.7.3.bb | 19 +++++
recipes/qt4/qt4-embedded_4.7.3.bb | 14 ++++
recipes/qt4/qt4-native_4.7.3.bb | 19 +++++
recipes/qt4/qt4-tools-sdk_4.7.3.bb | 8 ++
recipes/qt4/qt4-x11-free-gles_4.7.3.bb | 19 +++++
recipes/qt4/qt4-x11-free_4.7.3.bb | 15 ++++
12 files changed, 378 insertions(+), 0 deletions(-)
create mode 100644 recipes/qt4/qt-4.7.3.inc
create mode 100644 recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
create mode 100644 recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch
create mode 100644 recipes/qt4/qt-4.7.3/g++.conf
create mode 100644 recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
create mode 100644 recipes/qt4/qt-4.7.3/linux.conf
create mode 100644 recipes/qt4/qt4-embedded-gles_4.7.3.bb
create mode 100644 recipes/qt4/qt4-embedded_4.7.3.bb
create mode 100644 recipes/qt4/qt4-native_4.7.3.bb
create mode 100644 recipes/qt4/qt4-tools-sdk_4.7.3.bb
create mode 100644 recipes/qt4/qt4-x11-free-gles_4.7.3.bb
create mode 100644 recipes/qt4/qt4-x11-free_4.7.3.bb
diff --git a/recipes/qt4/qt-4.7.3.inc b/recipes/qt4/qt-4.7.3.inc
new file mode 100644
index 0000000..4e9c96a
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3.inc
@@ -0,0 +1,72 @@
+DEFAULT_PREFERENCE = "-1"
+LICENSE = "LGPLv2.1 GPLv3"
+
+FILESPATHPKG =. "qt-${PV}:"
+
+SRC_URI = "\
+ ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://0004-no-qmake.patch \
+ file://hack-out-pg2-4.7.0.patch \
+ file://0006-freetype-host-includes.patch \
+ file://0001-Added-Openembedded-crossarch-option.patch \
+ file://0010-phonon-gstreamer-rgb-endianess.patch \
+ file://g++.conf \
+ file://linux.conf \
+ "
+# Set necessary variables in the profile
+SRC_URI += "file://qte.sh"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
+
+do_configure_prepend() {
+ for pro in $(find ${S} -name "*.pro") ; do
+ sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+ done
+
+ sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
+ sed -i \
+ -e /QMAKE_MOC\ /d \
+ -e /QMAKE_UIC\ /d \
+ -e /QMAKE_UIC3\ /d \
+ -e /QMAKE_RCC\ /d \
+ ${S}/configure
+}
+
+do_configure_append() {
+ sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
+}
+
+QT_GLFLAGS ?= ""
+QT_CONFIG_FLAGS += " -javascript-jit -script -scripttools -declarative -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
+
+do_compile() {
+ # Fixup missing wsegl header in some SGX SDKs
+ if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
+ cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
+ fi
+
+ unset CFLAGS CXXFLAGS
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
+
+ oe_runmake ${EXTRA_ENV}
+}
+
+do_install_append() {
+ install -d ${D}${bindir}
+ for i in rcc uic moc ; do
+ install -m 0755 ${S}/bin/$i ${D}${bindir}/
+ done
+
+ #Append an E to the qtdemo file
+ if [ -n "${QT_LIBINFIX}" ] ; then
+ mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+ fi
+}
+
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
new file mode 100644
index 0000000..71a04a5
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
@@ -0,0 +1,44 @@
+From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com>
+Date: Wed, 12 May 2010 16:52:45 +0200
+Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
+
+---
+ configure | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index facd192..9d15136 100755
+--- a/configure
++++ b/configure
+@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
+ shift
+ VAL=$1
+ ;;
+- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
+ VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+ shift
+ VAL="$1"
+@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
+ xplatform)
+ XPLATFORM="$VAL"
+ ;;
++ crossarch)
++ CROSSARCH="$VAL"
++ ;;
+ debug-and-release)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_DEBUG_RELEASE="$VAL"
+@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
+ CFG_ARCH=$CFG_HOST_ARCH
+ fi
+
++CFG_ARCH="$CROSSARCH"
++
+ if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " '$CFG_ARCH' is supported"
+--
+1.7.0.4
+
diff --git a/recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch b/recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch
new file mode 100644
index 0000000..d43366c
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch
@@ -0,0 +1,23 @@
+--- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
++++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
+@@ -18,6 +18,7 @@
+ #include <QApplication>
+ #include "videowidget.h"
+ #include "qwidgetvideosink.h"
++#include <gst/video/video.h>
+
+ QT_BEGIN_NAMESPACE
+
+@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb =
+ GST_STATIC_PAD_TEMPLATE("sink",
+ GST_PAD_SINK,
+ GST_PAD_ALWAYS,
+- GST_STATIC_CAPS("video/x-raw-rgb, "
+- "framerate = (fraction) [ 0, MAX ], "
+- "width = (int) [ 1, MAX ], "
+- "height = (int) [ 1, MAX ],"
+- "bpp = (int) 32"));
++ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN));
+
+ template <VideoFormat FMT>
+ struct template_factory;
diff --git a/recipes/qt4/qt-4.7.3/g++.conf b/recipes/qt4/qt-4.7.3/g++.conf
new file mode 100644
index 0000000..80f925c
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3/g++.conf
@@ -0,0 +1,60 @@
+#
+# qmake configuration for common gcc
+#
+
+QMAKE_CC = $(OE_QMAKE_CC)
+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
+QMAKE_CFLAGS_DEPS += -M
+QMAKE_CFLAGS_WARN_ON += -Wall -W
+QMAKE_CFLAGS_WARN_OFF += -w
+QMAKE_CFLAGS_RELEASE +=
+QMAKE_CFLAGS_DEBUG += -g
+QMAKE_CFLAGS_SHLIB += -fPIC
+QMAKE_CFLAGS_STATIC_LIB += -fPIC
+QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+QMAKE_CXX = $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_LINK = $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
+QMAKE_LINK_C = $(OE_QMAKE_LINK)
+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
+QMAKE_LFLAGS_RELEASE +=
+QMAKE_LFLAGS_DEBUG +=
+QMAKE_LFLAGS_APP +=
+QMAKE_LFLAGS_SHLIB += -shared
+QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME += -Wl,-soname,
+QMAKE_LFLAGS_THREAD +=
+QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
+QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
+
+QMAKE_PCH_OUTPUT_EXT = .gch
+
+# -Bsymbolic-functions (ld) support
+QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
+QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
+
+# some linking helper...
+CONFIG += rpath_libdirs
+
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
new file mode 100644
index 0000000..5c588ff
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,19 @@
+Index: qt-everywhere-opensource-src-4.7.0/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
++++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
+@@ -4921,10 +4921,10 @@
+ psql)
+ if [ "$CFG_SQL_psql" != "no" ]; then
+ # Be careful not to use native pg_config when cross building.
+- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
+- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+- fi
++# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
++# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
++# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
++# fi
+ [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+ [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+ # But, respect PSQL_LIBS if set
diff --git a/recipes/qt4/qt-4.7.3/linux.conf b/recipes/qt4/qt-4.7.3/linux.conf
new file mode 100644
index 0000000..a541355
--- /dev/null
+++ b/recipes/qt4/qt-4.7.3/linux.conf
@@ -0,0 +1,66 @@
+#
+# 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_OPENGL =
+QMAKE_LIBDIR_OPENGL =
+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_EGL =
+QMAKE_LIBDIR_EGL =
+QMAKE_INCDIR_OPENVG =
+QMAKE_LIBDIR_OPENVG =
+
+
+QMAKE_LIBS =
+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
+QMAKE_LIBS_OPENGL = -lGLU -lGL
+QMAKE_LIBS_OPENGL_QT = -lGL
+QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
+QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+QMAKE_LIBS_OPENVG = -lOpenVG
+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-embedded-gles_4.7.3.bb b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
new file mode 100644
index 0000000..8ab5a6c
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
@@ -0,0 +1,19 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-embedded.inc
+
+PR = "${INC_PR}.10"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+PROVIDES += "qt4-embedded"
+QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
+
+FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
+
+require qt-${PV}.inc
+
+QT_CONFIG_FLAGS += " \
+ -exceptions \
+"
+
diff --git a/recipes/qt4/qt4-embedded_4.7.3.bb b/recipes/qt4/qt4-embedded_4.7.3.bb
new file mode 100644
index 0000000..7e3d4b8
--- /dev/null
+++ b/recipes/qt4/qt4-embedded_4.7.3.bb
@@ -0,0 +1,14 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-embedded.inc
+
+PR = "${INC_PR}.1"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+require qt-${PV}.inc
+
+QT_CONFIG_FLAGS += " \
+ -exceptions \
+"
+
diff --git a/recipes/qt4/qt4-native_4.7.3.bb b/recipes/qt4/qt4-native_4.7.3.bb
new file mode 100644
index 0000000..a6880a6
--- /dev/null
+++ b/recipes/qt4/qt4-native_4.7.3.bb
@@ -0,0 +1,19 @@
+require qt4-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
+
+PR = "${INC_PR}.0"
+
+# Find the g++.conf/linux.conf in the right directory.
+FILESPATHPKG =. "qt-${PV}:"
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://qt-config.patch \
+ file://g++.conf \
+ file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/recipes/qt4/qt4-tools-sdk_4.7.3.bb b/recipes/qt4/qt4-tools-sdk_4.7.3.bb
new file mode 100644
index 0000000..832d389
--- /dev/null
+++ b/recipes/qt4/qt4-tools-sdk_4.7.3.bb
@@ -0,0 +1,8 @@
+require qt4-tools-sdk.inc
+
+PR = "${INC_PR}.0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/recipes/qt4/qt4-x11-free-gles_4.7.3.bb b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
new file mode 100644
index 0000000..c5fd6f3
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
@@ -0,0 +1,19 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-x11-free.inc
+PR = "${INC_PR}.7"
+
+QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
+
+require qt-${PV}.inc
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
+
+FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
+
+DEPENDS += "virtual/egl"
+require recipes/egl/egl.inc
+PROVIDES += "qt4-x11-free"
diff --git a/recipes/qt4/qt4-x11-free_4.7.3.bb b/recipes/qt4/qt4-x11-free_4.7.3.bb
new file mode 100644
index 0000000..79a765e
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free_4.7.3.bb
@@ -0,0 +1,15 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-x11-free.inc
+
+PR = "${INC_PR}.0"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+require qt-${PV}.inc
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 2/6] minimal: prefer qt 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
2011-05-11 20:30 ` [PATCH 1/6] qt4: introduce version 4.7.3 Eric Bénard
@ 2011-05-11 20:30 ` Eric Bénard
2011-05-12 8:32 ` Paul Menzel
2011-05-11 20:30 ` [PATCH 3/6] angstrom-2010: " Eric Bénard
` (6 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Eric Bénard @ 2011-05-11 20:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: Khem Raj <raj.khem@gmail.com>
---
conf/distro/minimal.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 090a4db..18bcfae 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -115,7 +115,7 @@ require conf/distro/include/preferred-opie-versions-1.2.5.inc
PREFERRED_PROVIDER_opkg ?= "opkg"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
-PREFERRED_QT_VERSION ?= "4.7.2"
+PREFERRED_QT_VERSION ?= "4.7.3"
PREFERRED_VERSION_qt4-tools-native = "${PREFERRED_QT_VERSION}"
PREFERRED_VERSION_qt4-tools-sdk = "${PREFERRED_QT_VERSION}"
PREFERRED_VERSION_qt4-embedded = "${PREFERRED_QT_VERSION}"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 3/6] angstrom-2010: prefer qt 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
2011-05-11 20:30 ` [PATCH 1/6] qt4: introduce version 4.7.3 Eric Bénard
2011-05-11 20:30 ` [PATCH 2/6] minimal: prefer qt 4.7.3 Eric Bénard
@ 2011-05-11 20:30 ` Eric Bénard
2011-05-11 22:04 ` Koen Kooi
2011-05-11 20:30 ` [PATCH 4/6] kaeilos-2009: " Eric Bénard
` (5 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Eric Bénard @ 2011-05-11 20:30 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
---
.../include/angstrom-2010-preferred-versions.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
index 611c4e7..87da854 100644
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -1,5 +1,5 @@
ANGSTROM_MESA_VERSION = "7.9.1"
-ANGSTROM_QT_VERSION ?= "4.7.2"
+ANGSTROM_QT_VERSION ?= "4.7.3"
ANGSTROM_LIBTOOL_VERSION = "2.4"
# Use new sysroot feature
LIBTOOL_HAS_SYSROOT = "yes"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 4/6] kaeilos-2009: prefer qt 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
` (2 preceding siblings ...)
2011-05-11 20:30 ` [PATCH 3/6] angstrom-2010: " Eric Bénard
@ 2011-05-11 20:30 ` Eric Bénard
2011-05-12 8:23 ` Marco Cavallini
2011-05-11 20:30 ` [PATCH 5/6] shr: " Eric Bénard
` (4 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Eric Bénard @ 2011-05-11 20:30 UTC (permalink / raw)
To: openembedded-devel; +Cc: Marco Cavallini
Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: Marco Cavallini <m.cavallini@koansoftware.com>
---
.../include/kaeilos-2009-preferred-versions.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 498f5fb..27c78d6 100644
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -61,7 +61,7 @@ PREFERRED_VERSION_python-pycairo = "1.8.0"
KAEILOS_WX_VERSION ?= "2.8.10"
PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}"
-KAEILOS_QT_VERSION ?= "4.7.2"
+KAEILOS_QT_VERSION ?= "4.7.3"
PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 5/6] shr: prefer qt 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
` (3 preceding siblings ...)
2011-05-11 20:30 ` [PATCH 4/6] kaeilos-2009: " Eric Bénard
@ 2011-05-11 20:30 ` Eric Bénard
2011-05-12 8:47 ` Martin Jansa
2011-05-11 20:30 ` [PATCH 6/6] qt4: remove 4.7.2 Eric Bénard
` (3 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Eric Bénard @ 2011-05-11 20:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: Martin Jansa <Martin.Jansa@gmail.com>
---
conf/distro/include/preferred-shr-versions.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 35a4ecd..5cb6e09 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -28,7 +28,7 @@ PREFERRED_VERSION_perl = "5.10.1"
PREFERRED_VERSION_perl-native = "5.10.1"
UDEV_GE_141 = "1"
-ANGSTROM_QT_VERSION ?= "4.7.2"
+ANGSTROM_QT_VERSION ?= "4.7.3"
PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 6/6] qt4: remove 4.7.2
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
` (4 preceding siblings ...)
2011-05-11 20:30 ` [PATCH 5/6] shr: " Eric Bénard
@ 2011-05-11 20:30 ` Eric Bénard
2011-05-12 8:48 ` Martin Jansa
2011-05-12 1:21 ` Update qt to 4.7.3 Otavio Salvador
` (2 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Eric Bénard @ 2011-05-11 20:30 UTC (permalink / raw)
To: openembedded-devel
now that 4.7.3 is prefered for all distributions
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/qt4/qt-4.7.2.inc | 73 --------------------
.../0001-Added-Openembedded-crossarch-option.patch | 44 ------------
.../0010-phonon-gstreamer-rgb-endianess.patch | 23 ------
recipes/qt4/qt-4.7.2/g++.conf | 60 ----------------
recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch | 19 -----
recipes/qt4/qt-4.7.2/linux.conf | 66 ------------------
recipes/qt4/qt4-embedded-gles_4.7.2.bb | 19 -----
recipes/qt4/qt4-embedded_4.7.2.bb | 14 ----
recipes/qt4/qt4-native_4.7.2.bb | 19 -----
recipes/qt4/qt4-tools-sdk_4.7.2.bb | 8 --
recipes/qt4/qt4-x11-free-gles_4.7.2.bb | 19 -----
recipes/qt4/qt4-x11-free_4.7.2.bb | 15 ----
12 files changed, 0 insertions(+), 379 deletions(-)
delete mode 100644 recipes/qt4/qt-4.7.2.inc
delete mode 100644 recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
delete mode 100644 recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch
delete mode 100644 recipes/qt4/qt-4.7.2/g++.conf
delete mode 100644 recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
delete mode 100644 recipes/qt4/qt-4.7.2/linux.conf
delete mode 100644 recipes/qt4/qt4-embedded-gles_4.7.2.bb
delete mode 100644 recipes/qt4/qt4-embedded_4.7.2.bb
delete mode 100644 recipes/qt4/qt4-native_4.7.2.bb
delete mode 100644 recipes/qt4/qt4-tools-sdk_4.7.2.bb
delete mode 100644 recipes/qt4/qt4-x11-free-gles_4.7.2.bb
delete mode 100644 recipes/qt4/qt4-x11-free_4.7.2.bb
diff --git a/recipes/qt4/qt-4.7.2.inc b/recipes/qt4/qt-4.7.2.inc
deleted file mode 100644
index e6a7b90..0000000
--- a/recipes/qt4/qt-4.7.2.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-LICENSE = "LGPLv2.1 GPLv3"
-
-FILESPATHPKG =. "qt-${PV}:"
-
-SRC_URI = "\
- ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://blacklist-fraudulent-comodo-certificates-patch.diff \
- file://0004-no-qmake.patch \
- file://hack-out-pg2-4.7.0.patch \
- file://0006-freetype-host-includes.patch \
- file://0001-Added-Openembedded-crossarch-option.patch \
- file://0010-phonon-gstreamer-rgb-endianess.patch \
- file://g++.conf \
- file://linux.conf \
- "
-# Set necessary variables in the profile
-SRC_URI += "file://qte.sh"
-
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
-
-do_configure_prepend() {
- for pro in $(find ${S} -name "*.pro") ; do
- sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
- done
-
- sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
- sed -i \
- -e /QMAKE_MOC\ /d \
- -e /QMAKE_UIC\ /d \
- -e /QMAKE_UIC3\ /d \
- -e /QMAKE_RCC\ /d \
- ${S}/configure
-}
-
-do_configure_append() {
- sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
-}
-
-QT_GLFLAGS ?= ""
-QT_CONFIG_FLAGS += " -javascript-jit -script -scripttools -declarative -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
-
-do_compile() {
- # Fixup missing wsegl header in some SGX SDKs
- if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
- cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
- fi
-
- unset CFLAGS CXXFLAGS
- install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
- install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
-
- oe_runmake ${EXTRA_ENV}
-}
-
-do_install_append() {
- install -d ${D}${bindir}
- for i in rcc uic moc ; do
- install -m 0755 ${S}/bin/$i ${D}${bindir}/
- done
-
- #Append an E to the qtdemo file
- if [ -n "${QT_LIBINFIX}" ] ; then
- mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
- fi
-}
-
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
deleted file mode 100644
index 71a04a5..0000000
--- a/recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com>
-Date: Wed, 12 May 2010 16:52:45 +0200
-Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
-
----
- configure | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index facd192..9d15136 100755
---- a/configure
-+++ b/configure
-@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
- shift
- VAL=$1
- ;;
-- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
-+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
- VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- shift
- VAL="$1"
-@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
- xplatform)
- XPLATFORM="$VAL"
- ;;
-+ crossarch)
-+ CROSSARCH="$VAL"
-+ ;;
- debug-and-release)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_DEBUG_RELEASE="$VAL"
-@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
- CFG_ARCH=$CFG_HOST_ARCH
- fi
-
-+CFG_ARCH="$CROSSARCH"
-+
- if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$CFG_ARCH' is supported"
---
-1.7.0.4
-
diff --git a/recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch b/recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch
deleted file mode 100644
index d43366c..0000000
--- a/recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
-+++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
-@@ -18,6 +18,7 @@
- #include <QApplication>
- #include "videowidget.h"
- #include "qwidgetvideosink.h"
-+#include <gst/video/video.h>
-
- QT_BEGIN_NAMESPACE
-
-@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb =
- GST_STATIC_PAD_TEMPLATE("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
-- GST_STATIC_CAPS("video/x-raw-rgb, "
-- "framerate = (fraction) [ 0, MAX ], "
-- "width = (int) [ 1, MAX ], "
-- "height = (int) [ 1, MAX ],"
-- "bpp = (int) 32"));
-+ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN));
-
- template <VideoFormat FMT>
- struct template_factory;
diff --git a/recipes/qt4/qt-4.7.2/g++.conf b/recipes/qt4/qt-4.7.2/g++.conf
deleted file mode 100644
index 80f925c..0000000
--- a/recipes/qt4/qt-4.7.2/g++.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# qmake configuration for common gcc
-#
-
-QMAKE_CC = $(OE_QMAKE_CC)
-QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
-QMAKE_CFLAGS_DEPS += -M
-QMAKE_CFLAGS_WARN_ON += -Wall -W
-QMAKE_CFLAGS_WARN_OFF += -w
-QMAKE_CFLAGS_RELEASE +=
-QMAKE_CFLAGS_DEBUG += -g
-QMAKE_CFLAGS_SHLIB += -fPIC
-QMAKE_CFLAGS_STATIC_LIB += -fPIC
-QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
-QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
-
-QMAKE_CXX = $(OE_QMAKE_CXX)
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
-QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
-QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-
-QMAKE_LINK = $(OE_QMAKE_LINK)
-QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
-QMAKE_LINK_C = $(OE_QMAKE_LINK)
-QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
-QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
-QMAKE_LFLAGS_RELEASE +=
-QMAKE_LFLAGS_DEBUG +=
-QMAKE_LFLAGS_APP +=
-QMAKE_LFLAGS_SHLIB += -shared
-QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME += -Wl,-soname,
-QMAKE_LFLAGS_THREAD +=
-QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
-QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
-
-QMAKE_PCH_OUTPUT_EXT = .gch
-
-# -Bsymbolic-functions (ld) support
-QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
-QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
-
-# some linking helper...
-CONFIG += rpath_libdirs
-
-# for the SDK
-isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch b/recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
deleted file mode 100644
index 5c588ff..0000000
--- a/recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: qt-everywhere-opensource-src-4.7.0/configure
-===================================================================
---- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
-+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
-@@ -4921,10 +4921,10 @@
- psql)
- if [ "$CFG_SQL_psql" != "no" ]; then
- # Be careful not to use native pg_config when cross building.
-- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
-- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
-- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-- fi
-+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
-+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
-+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-+# fi
- [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
- [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
- # But, respect PSQL_LIBS if set
diff --git a/recipes/qt4/qt-4.7.2/linux.conf b/recipes/qt4/qt-4.7.2/linux.conf
deleted file mode 100644
index a541355..0000000
--- a/recipes/qt4/qt-4.7.2/linux.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# 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_OPENGL =
-QMAKE_LIBDIR_OPENGL =
-QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL =
-QMAKE_LIBDIR_EGL =
-QMAKE_INCDIR_OPENVG =
-QMAKE_LIBDIR_OPENVG =
-
-
-QMAKE_LIBS =
-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
-QMAKE_LIBS_OPENGL = -lGLU -lGL
-QMAKE_LIBS_OPENGL_QT = -lGL
-QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
-QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
-QMAKE_LIBS_OPENVG = -lOpenVG
-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-embedded-gles_4.7.2.bb b/recipes/qt4/qt4-embedded-gles_4.7.2.bb
deleted file mode 100644
index 8ab5a6c..0000000
--- a/recipes/qt4/qt4-embedded-gles_4.7.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-require qt4-embedded.inc
-
-PR = "${INC_PR}.10"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-
-PROVIDES += "qt4-embedded"
-QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
-
-FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
-
-require qt-${PV}.inc
-
-QT_CONFIG_FLAGS += " \
- -exceptions \
-"
-
diff --git a/recipes/qt4/qt4-embedded_4.7.2.bb b/recipes/qt4/qt4-embedded_4.7.2.bb
deleted file mode 100644
index 7e3d4b8..0000000
--- a/recipes/qt4/qt4-embedded_4.7.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-require qt4-embedded.inc
-
-PR = "${INC_PR}.1"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-
-require qt-${PV}.inc
-
-QT_CONFIG_FLAGS += " \
- -exceptions \
-"
-
diff --git a/recipes/qt4/qt4-native_4.7.2.bb b/recipes/qt4/qt4-native_4.7.2.bb
deleted file mode 100644
index 7e98035..0000000
--- a/recipes/qt4/qt4-native_4.7.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require qt4-native.inc
-LICENSE = "LGPLv2.1 GPLv3"
-
-PR = "${INC_PR}.0"
-
-# Find the g++.conf/linux.conf in the right directory.
-FILESPATHPKG =. "qt-${PV}:"
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://qt-config.patch \
- file://g++.conf \
- file://linux.conf"
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/recipes/qt4/qt4-tools-sdk_4.7.2.bb b/recipes/qt4/qt4-tools-sdk_4.7.2.bb
deleted file mode 100644
index c86ac2a..0000000
--- a/recipes/qt4/qt4-tools-sdk_4.7.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require qt4-tools-sdk.inc
-
-PR = "${INC_PR}.0"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/recipes/qt4/qt4-x11-free-gles_4.7.2.bb b/recipes/qt4/qt4-x11-free-gles_4.7.2.bb
deleted file mode 100644
index c5fd6f3..0000000
--- a/recipes/qt4/qt4-x11-free-gles_4.7.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-require qt4-x11-free.inc
-PR = "${INC_PR}.7"
-
-QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
-
-require qt-${PV}.inc
-
-QT_CONFIG_FLAGS += " \
- -no-embedded \
- -xrandr \
- -x11"
-
-FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
-
-DEPENDS += "virtual/egl"
-require recipes/egl/egl.inc
-PROVIDES += "qt4-x11-free"
diff --git a/recipes/qt4/qt4-x11-free_4.7.2.bb b/recipes/qt4/qt4-x11-free_4.7.2.bb
deleted file mode 100644
index 79a765e..0000000
--- a/recipes/qt4/qt4-x11-free_4.7.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-require qt4-x11-free.inc
-
-PR = "${INC_PR}.0"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-
-require qt-${PV}.inc
-
-QT_CONFIG_FLAGS += " \
- -no-embedded \
- -xrandr \
- -x11"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 3/6] angstrom-2010: prefer qt 4.7.3
2011-05-11 20:30 ` [PATCH 3/6] angstrom-2010: " Eric Bénard
@ 2011-05-11 22:04 ` Koen Kooi
0 siblings, 0 replies; 21+ messages in thread
From: Koen Kooi @ 2011-05-11 22:04 UTC (permalink / raw)
To: Eric Bénard; +Cc: openembedded-devel
Op 11 mei 2011, om 22:30 heeft Eric Bénard het volgende geschreven:
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Cc: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> .../include/angstrom-2010-preferred-versions.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
> index 611c4e7..87da854 100644
> --- a/conf/distro/include/angstrom-2010-preferred-versions.inc
> +++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
> @@ -1,5 +1,5 @@
> ANGSTROM_MESA_VERSION = "7.9.1"
> -ANGSTROM_QT_VERSION ?= "4.7.2"
> +ANGSTROM_QT_VERSION ?= "4.7.3"
> ANGSTROM_LIBTOOL_VERSION = "2.4"
> # Use new sysroot feature
> LIBTOOL_HAS_SYSROOT = "yes"
> --
> 1.7.0.4
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Update qt to 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
` (5 preceding siblings ...)
2011-05-11 20:30 ` [PATCH 6/6] qt4: remove 4.7.2 Eric Bénard
@ 2011-05-12 1:21 ` Otavio Salvador
2011-05-12 7:40 ` Eric Bénard
2011-05-12 8:56 ` Paul Menzel
2011-05-12 15:08 ` Tom Rini
8 siblings, 1 reply; 21+ messages in thread
From: Otavio Salvador @ 2011-05-12 1:21 UTC (permalink / raw)
To: openembedded-devel
On Wed, May 11, 2011 at 17:29, Eric Bénard <eric@eukrea.com> wrote:
> Please test these recipes you are interested in as for now I only compile
> tested qt4-embedded & qt4-native.
Please add translation package back; this is a blocker to me and this
was dropped since last updates (it was available on 4.6 recipes).
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Update qt to 4.7.3
2011-05-12 1:21 ` Update qt to 4.7.3 Otavio Salvador
@ 2011-05-12 7:40 ` Eric Bénard
0 siblings, 0 replies; 21+ messages in thread
From: Eric Bénard @ 2011-05-12 7:40 UTC (permalink / raw)
To: openembedded-devel
Hi Otavio,
On 12/05/2011 03:21, Otavio Salvador wrote:
> On Wed, May 11, 2011 at 17:29, Eric Bénard<eric@eukrea.com> wrote:
>> Please test these recipes you are interested in as for now I only compile
>> tested qt4-embedded& qt4-native.
>
> Please add translation package back; this is a blocker to me and this
> was dropped since last updates (it was available on 4.6 recipes).
>
Yes I saw your previous mail but I slowly come back to OE dev so that's the
next stage. In fact I think translation never made it into 4.7.x recipes. I'm
going to look at it asap.
Eric
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/6] kaeilos-2009: prefer qt 4.7.3
2011-05-11 20:30 ` [PATCH 4/6] kaeilos-2009: " Eric Bénard
@ 2011-05-12 8:23 ` Marco Cavallini
0 siblings, 0 replies; 21+ messages in thread
From: Marco Cavallini @ 2011-05-12 8:23 UTC (permalink / raw)
To: openembedded-devel
Eric Bénard ha scritto, Il 11/05/2011 22:30:
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Cc: Marco Cavallini <m.cavallini@koansoftware.com>
> ---
> .../include/kaeilos-2009-preferred-versions.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
> index 498f5fb..27c78d6 100644
> --- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
> +++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
> @@ -61,7 +61,7 @@ PREFERRED_VERSION_python-pycairo = "1.8.0"
> KAEILOS_WX_VERSION ?= "2.8.10"
> PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}"
>
> -KAEILOS_QT_VERSION ?= "4.7.2"
> +KAEILOS_QT_VERSION ?= "4.7.3"
> PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
> PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
> PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}"
Acked-by: Marco Cavallini <m.cavallini@koansoftware.com>
Thank you
Cordiali Saluti / Kindest Regards / mit freundlichen Grüssen
--
Marco Cavallini | KOAN sas | Bergamo - Italia
embedded and real-time software engineering
Atmel third party certified consultant
Phone:+39-035-255.235 - Fax:+39-178-22.39.748
http://www.KoanSoftware.com
http://www.KaeilOS.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/6] minimal: prefer qt 4.7.3
2011-05-11 20:30 ` [PATCH 2/6] minimal: prefer qt 4.7.3 Eric Bénard
@ 2011-05-12 8:32 ` Paul Menzel
2011-05-12 8:47 ` Michael 'Mickey' Lauer
0 siblings, 1 reply; 21+ messages in thread
From: Paul Menzel @ 2011-05-12 8:32 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]
Dear Khem, dear Eric,
Am Mittwoch, den 11.05.2011, 22:30 +0200 schrieb Eric Bénard:
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Cc: Khem Raj <raj.khem@gmail.com>
> ---
> conf/distro/minimal.conf | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
> index 090a4db..18bcfae 100644
> --- a/conf/distro/minimal.conf
> +++ b/conf/distro/minimal.conf
> @@ -115,7 +115,7 @@ require conf/distro/include/preferred-opie-versions-1.2.5.inc
>
> PREFERRED_PROVIDER_opkg ?= "opkg"
> PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
> -PREFERRED_QT_VERSION ?= "4.7.2"
> +PREFERRED_QT_VERSION ?= "4.7.3"
> PREFERRED_VERSION_qt4-tools-native = "${PREFERRED_QT_VERSION}"
> PREFERRED_VERSION_qt4-tools-sdk = "${PREFERRED_QT_VERSION}"
> PREFERRED_VERSION_qt4-embedded = "${PREFERRED_QT_VERSION}"
sorry for the slight off-topic question. But I how I understand minimal,
it normally takes the latest recipes available. So could setting the Qt
version be actually be dropped in a future patch?
Thanks,
Paul
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/6] qt4: introduce version 4.7.3
2011-05-11 20:30 ` [PATCH 1/6] qt4: introduce version 4.7.3 Eric Bénard
@ 2011-05-12 8:47 ` Martin Jansa
0 siblings, 0 replies; 21+ messages in thread
From: Martin Jansa @ 2011-05-12 8:47 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 18457 bytes --]
On Wed, May 11, 2011 at 10:30:00PM +0200, Eric Bénard wrote:
> only qt4-embedded and qt4-native recipe were tested
I've tested qt4-x11-free on om-gta02
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> recipes/qt4/qt-4.7.3.inc | 72 ++++++++++++++++++++
> .../0001-Added-Openembedded-crossarch-option.patch | 44 ++++++++++++
> .../0010-phonon-gstreamer-rgb-endianess.patch | 23 ++++++
> recipes/qt4/qt-4.7.3/g++.conf | 60 ++++++++++++++++
> recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | 19 +++++
> recipes/qt4/qt-4.7.3/linux.conf | 66 ++++++++++++++++++
> recipes/qt4/qt4-embedded-gles_4.7.3.bb | 19 +++++
> recipes/qt4/qt4-embedded_4.7.3.bb | 14 ++++
> recipes/qt4/qt4-native_4.7.3.bb | 19 +++++
> recipes/qt4/qt4-tools-sdk_4.7.3.bb | 8 ++
> recipes/qt4/qt4-x11-free-gles_4.7.3.bb | 19 +++++
> recipes/qt4/qt4-x11-free_4.7.3.bb | 15 ++++
> 12 files changed, 378 insertions(+), 0 deletions(-)
> create mode 100644 recipes/qt4/qt-4.7.3.inc
> create mode 100644 recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
> create mode 100644 recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch
> create mode 100644 recipes/qt4/qt-4.7.3/g++.conf
> create mode 100644 recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> create mode 100644 recipes/qt4/qt-4.7.3/linux.conf
> create mode 100644 recipes/qt4/qt4-embedded-gles_4.7.3.bb
> create mode 100644 recipes/qt4/qt4-embedded_4.7.3.bb
> create mode 100644 recipes/qt4/qt4-native_4.7.3.bb
> create mode 100644 recipes/qt4/qt4-tools-sdk_4.7.3.bb
> create mode 100644 recipes/qt4/qt4-x11-free-gles_4.7.3.bb
> create mode 100644 recipes/qt4/qt4-x11-free_4.7.3.bb
>
> diff --git a/recipes/qt4/qt-4.7.3.inc b/recipes/qt4/qt-4.7.3.inc
> new file mode 100644
> index 0000000..4e9c96a
> --- /dev/null
> +++ b/recipes/qt4/qt-4.7.3.inc
> @@ -0,0 +1,72 @@
> +DEFAULT_PREFERENCE = "-1"
> +LICENSE = "LGPLv2.1 GPLv3"
> +
> +FILESPATHPKG =. "qt-${PV}:"
> +
> +SRC_URI = "\
> + ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
> + file://0004-no-qmake.patch \
> + file://hack-out-pg2-4.7.0.patch \
> + file://0006-freetype-host-includes.patch \
> + file://0001-Added-Openembedded-crossarch-option.patch \
> + file://0010-phonon-gstreamer-rgb-endianess.patch \
> + file://g++.conf \
> + file://linux.conf \
> + "
> +# Set necessary variables in the profile
> +SRC_URI += "file://qte.sh"
> +
> +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
> +
> +FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
> +
> +do_configure_prepend() {
> + for pro in $(find ${S} -name "*.pro") ; do
> + sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
> + done
> +
> + sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
> + sed -i \
> + -e /QMAKE_MOC\ /d \
> + -e /QMAKE_UIC\ /d \
> + -e /QMAKE_UIC3\ /d \
> + -e /QMAKE_RCC\ /d \
> + ${S}/configure
> +}
> +
> +do_configure_append() {
> + sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
> +}
> +
> +QT_GLFLAGS ?= ""
> +QT_CONFIG_FLAGS += " -javascript-jit -script -scripttools -declarative -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
> +
> +do_compile() {
> + # Fixup missing wsegl header in some SGX SDKs
> + if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
> + cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
> + fi
> +
> + unset CFLAGS CXXFLAGS
> + install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
> + install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
> + install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
> + install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
> +
> + oe_runmake ${EXTRA_ENV}
> +}
> +
> +do_install_append() {
> + install -d ${D}${bindir}
> + for i in rcc uic moc ; do
> + install -m 0755 ${S}/bin/$i ${D}${bindir}/
> + done
> +
> + #Append an E to the qtdemo file
> + if [ -n "${QT_LIBINFIX}" ] ; then
> + mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
> + fi
> +}
> +
> +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
> diff --git a/recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
> new file mode 100644
> index 0000000..71a04a5
> --- /dev/null
> +++ b/recipes/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
> @@ -0,0 +1,44 @@
> +From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com>
> +Date: Wed, 12 May 2010 16:52:45 +0200
> +Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
> +
> +---
> + configure | 7 ++++++-
> + 1 files changed, 6 insertions(+), 1 deletions(-)
> +
> +diff --git a/configure b/configure
> +index facd192..9d15136 100755
> +--- a/configure
> ++++ b/configure
> +@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
> + shift
> + VAL=$1
> + ;;
> +- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
> ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
> + VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
> + shift
> + VAL="$1"
> +@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
> + xplatform)
> + XPLATFORM="$VAL"
> + ;;
> ++ crossarch)
> ++ CROSSARCH="$VAL"
> ++ ;;
> + debug-and-release)
> + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
> + CFG_DEBUG_RELEASE="$VAL"
> +@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
> + CFG_ARCH=$CFG_HOST_ARCH
> + fi
> +
> ++CFG_ARCH="$CROSSARCH"
> ++
> + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
> + if [ "$OPT_VERBOSE" = "yes" ]; then
> + echo " '$CFG_ARCH' is supported"
> +--
> +1.7.0.4
> +
> diff --git a/recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch b/recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch
> new file mode 100644
> index 0000000..d43366c
> --- /dev/null
> +++ b/recipes/qt4/qt-4.7.3/0010-phonon-gstreamer-rgb-endianess.patch
> @@ -0,0 +1,23 @@
> +--- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
> ++++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
> +@@ -18,6 +18,7 @@
> + #include <QApplication>
> + #include "videowidget.h"
> + #include "qwidgetvideosink.h"
> ++#include <gst/video/video.h>
> +
> + QT_BEGIN_NAMESPACE
> +
> +@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb =
> + GST_STATIC_PAD_TEMPLATE("sink",
> + GST_PAD_SINK,
> + GST_PAD_ALWAYS,
> +- GST_STATIC_CAPS("video/x-raw-rgb, "
> +- "framerate = (fraction) [ 0, MAX ], "
> +- "width = (int) [ 1, MAX ], "
> +- "height = (int) [ 1, MAX ],"
> +- "bpp = (int) 32"));
> ++ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN));
> +
> + template <VideoFormat FMT>
> + struct template_factory;
> diff --git a/recipes/qt4/qt-4.7.3/g++.conf b/recipes/qt4/qt-4.7.3/g++.conf
> new file mode 100644
> index 0000000..80f925c
> --- /dev/null
> +++ b/recipes/qt4/qt-4.7.3/g++.conf
> @@ -0,0 +1,60 @@
> +#
> +# qmake configuration for common gcc
> +#
> +
> +QMAKE_CC = $(OE_QMAKE_CC)
> +QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
> +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
> +QMAKE_CFLAGS_DEPS += -M
> +QMAKE_CFLAGS_WARN_ON += -Wall -W
> +QMAKE_CFLAGS_WARN_OFF += -w
> +QMAKE_CFLAGS_RELEASE +=
> +QMAKE_CFLAGS_DEBUG += -g
> +QMAKE_CFLAGS_SHLIB += -fPIC
> +QMAKE_CFLAGS_STATIC_LIB += -fPIC
> +QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
> +QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
> +QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
> +QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
> +
> +QMAKE_CXX = $(OE_QMAKE_CXX)
> +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
> +QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
> +QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
> +QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
> +QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
> +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
> +QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
> +QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
> +QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
> +QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
> +QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
> +QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
> +QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
> +
> +QMAKE_LINK = $(OE_QMAKE_LINK)
> +QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
> +QMAKE_LINK_C = $(OE_QMAKE_LINK)
> +QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
> +QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
> +QMAKE_LFLAGS_RELEASE +=
> +QMAKE_LFLAGS_DEBUG +=
> +QMAKE_LFLAGS_APP +=
> +QMAKE_LFLAGS_SHLIB += -shared
> +QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
> +QMAKE_LFLAGS_SONAME += -Wl,-soname,
> +QMAKE_LFLAGS_THREAD +=
> +QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
> +QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
> +
> +QMAKE_PCH_OUTPUT_EXT = .gch
> +
> +# -Bsymbolic-functions (ld) support
> +QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
> +QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
> +
> +# some linking helper...
> +CONFIG += rpath_libdirs
> +
> +# for the SDK
> +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
> diff --git a/recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> new file mode 100644
> index 0000000..5c588ff
> --- /dev/null
> +++ b/recipes/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> @@ -0,0 +1,19 @@
> +Index: qt-everywhere-opensource-src-4.7.0/configure
> +===================================================================
> +--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
> ++++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
> +@@ -4921,10 +4921,10 @@
> + psql)
> + if [ "$CFG_SQL_psql" != "no" ]; then
> + # Be careful not to use native pg_config when cross building.
> +- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
> +- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
> +- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
> +- fi
> ++# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
> ++# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
> ++# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
> ++# fi
> + [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
> + [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
> + # But, respect PSQL_LIBS if set
> diff --git a/recipes/qt4/qt-4.7.3/linux.conf b/recipes/qt4/qt-4.7.3/linux.conf
> new file mode 100644
> index 0000000..a541355
> --- /dev/null
> +++ b/recipes/qt4/qt-4.7.3/linux.conf
> @@ -0,0 +1,66 @@
> +#
> +# 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_OPENGL =
> +QMAKE_LIBDIR_OPENGL =
> +QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
> +QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
> +QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
> +QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
> +QMAKE_INCDIR_EGL =
> +QMAKE_LIBDIR_EGL =
> +QMAKE_INCDIR_OPENVG =
> +QMAKE_LIBDIR_OPENVG =
> +
> +
> +QMAKE_LIBS =
> +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
> +QMAKE_LIBS_OPENGL = -lGLU -lGL
> +QMAKE_LIBS_OPENGL_QT = -lGL
> +QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
> +QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
> +QMAKE_LIBS_OPENVG = -lOpenVG
> +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-embedded-gles_4.7.3.bb b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
> new file mode 100644
> index 0000000..8ab5a6c
> --- /dev/null
> +++ b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
> @@ -0,0 +1,19 @@
> +DEFAULT_PREFERENCE = "-1"
> +
> +require qt4-embedded.inc
> +
> +PR = "${INC_PR}.10"
> +
> +QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
> +
> +PROVIDES += "qt4-embedded"
> +QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
> +
> +FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
> +
> +require qt-${PV}.inc
> +
> +QT_CONFIG_FLAGS += " \
> + -exceptions \
> +"
> +
> diff --git a/recipes/qt4/qt4-embedded_4.7.3.bb b/recipes/qt4/qt4-embedded_4.7.3.bb
> new file mode 100644
> index 0000000..7e3d4b8
> --- /dev/null
> +++ b/recipes/qt4/qt4-embedded_4.7.3.bb
> @@ -0,0 +1,14 @@
> +DEFAULT_PREFERENCE = "-1"
> +
> +require qt4-embedded.inc
> +
> +PR = "${INC_PR}.1"
> +
> +QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
> +
> +require qt-${PV}.inc
> +
> +QT_CONFIG_FLAGS += " \
> + -exceptions \
> +"
> +
> diff --git a/recipes/qt4/qt4-native_4.7.3.bb b/recipes/qt4/qt4-native_4.7.3.bb
> new file mode 100644
> index 0000000..a6880a6
> --- /dev/null
> +++ b/recipes/qt4/qt4-native_4.7.3.bb
> @@ -0,0 +1,19 @@
> +require qt4-native.inc
> +LICENSE = "LGPLv2.1 GPLv3"
> +
> +PR = "${INC_PR}.0"
> +
> +# Find the g++.conf/linux.conf in the right directory.
> +FILESPATHPKG =. "qt-${PV}:"
> +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
> + file://qt-config.patch \
> + file://g++.conf \
> + file://linux.conf"
> +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
> +
> +EXTRA_OECONF += " -no-fast -silent -no-rpath"
> +
> +TOBUILD := "src/tools/bootstrap ${TOBUILD}"
> +
> +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
> diff --git a/recipes/qt4/qt4-tools-sdk_4.7.3.bb b/recipes/qt4/qt4-tools-sdk_4.7.3.bb
> new file mode 100644
> index 0000000..832d389
> --- /dev/null
> +++ b/recipes/qt4/qt4-tools-sdk_4.7.3.bb
> @@ -0,0 +1,8 @@
> +require qt4-tools-sdk.inc
> +
> +PR = "${INC_PR}.0"
> +
> +DEFAULT_PREFERENCE = "-1"
> +
> +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
> diff --git a/recipes/qt4/qt4-x11-free-gles_4.7.3.bb b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
> new file mode 100644
> index 0000000..c5fd6f3
> --- /dev/null
> +++ b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
> @@ -0,0 +1,19 @@
> +DEFAULT_PREFERENCE = "-1"
> +
> +require qt4-x11-free.inc
> +PR = "${INC_PR}.7"
> +
> +QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
> +
> +require qt-${PV}.inc
> +
> +QT_CONFIG_FLAGS += " \
> + -no-embedded \
> + -xrandr \
> + -x11"
> +
> +FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
> +
> +DEPENDS += "virtual/egl"
> +require recipes/egl/egl.inc
> +PROVIDES += "qt4-x11-free"
> diff --git a/recipes/qt4/qt4-x11-free_4.7.3.bb b/recipes/qt4/qt4-x11-free_4.7.3.bb
> new file mode 100644
> index 0000000..79a765e
> --- /dev/null
> +++ b/recipes/qt4/qt4-x11-free_4.7.3.bb
> @@ -0,0 +1,15 @@
> +DEFAULT_PREFERENCE = "-1"
> +
> +require qt4-x11-free.inc
> +
> +PR = "${INC_PR}.0"
> +
> +QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
> +
> +require qt-${PV}.inc
> +
> +QT_CONFIG_FLAGS += " \
> + -no-embedded \
> + -xrandr \
> + -x11"
> +
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/6] shr: prefer qt 4.7.3
2011-05-11 20:30 ` [PATCH 5/6] shr: " Eric Bénard
@ 2011-05-12 8:47 ` Martin Jansa
0 siblings, 0 replies; 21+ messages in thread
From: Martin Jansa @ 2011-05-12 8:47 UTC (permalink / raw)
To: Eric Bénard; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]
On Wed, May 11, 2011 at 10:30:04PM +0200, Eric Bénard wrote:
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Cc: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> conf/distro/include/preferred-shr-versions.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
> index 35a4ecd..5cb6e09 100644
> --- a/conf/distro/include/preferred-shr-versions.inc
> +++ b/conf/distro/include/preferred-shr-versions.inc
> @@ -28,7 +28,7 @@ PREFERRED_VERSION_perl = "5.10.1"
> PREFERRED_VERSION_perl-native = "5.10.1"
> UDEV_GE_141 = "1"
>
> -ANGSTROM_QT_VERSION ?= "4.7.2"
> +ANGSTROM_QT_VERSION ?= "4.7.3"
> PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
> PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
> PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/6] minimal: prefer qt 4.7.3
2011-05-12 8:32 ` Paul Menzel
@ 2011-05-12 8:47 ` Michael 'Mickey' Lauer
0 siblings, 0 replies; 21+ messages in thread
From: Michael 'Mickey' Lauer @ 2011-05-12 8:47 UTC (permalink / raw)
To: openembedded-devel
Am Donnerstag, den 12.05.2011, 10:32 +0200 schrieb Paul Menzel:
> sorry for the slight off-topic question. But I how I understand minimal,
> it normally takes the latest recipes available.
Not quite. Minimal's philosophy is to make sure that
the OE metadata are not faulty in itself, hence that
a reasonable set of DEFAULT_PREFERENCE exists, so that
we only have to pinpoint as little as necessary.
> So could setting the Qt
> version be actually be dropped in a future patch?
Fine with me.
Cheers,
--
:M:
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 6/6] qt4: remove 4.7.2
2011-05-11 20:30 ` [PATCH 6/6] qt4: remove 4.7.2 Eric Bénard
@ 2011-05-12 8:48 ` Martin Jansa
0 siblings, 0 replies; 21+ messages in thread
From: Martin Jansa @ 2011-05-12 8:48 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 18528 bytes --]
On Wed, May 11, 2011 at 10:30:05PM +0200, Eric Bénard wrote:
> now that 4.7.3 is prefered for all distributions
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> recipes/qt4/qt-4.7.2.inc | 73 --------------------
> .../0001-Added-Openembedded-crossarch-option.patch | 44 ------------
> .../0010-phonon-gstreamer-rgb-endianess.patch | 23 ------
> recipes/qt4/qt-4.7.2/g++.conf | 60 ----------------
> recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch | 19 -----
> recipes/qt4/qt-4.7.2/linux.conf | 66 ------------------
> recipes/qt4/qt4-embedded-gles_4.7.2.bb | 19 -----
> recipes/qt4/qt4-embedded_4.7.2.bb | 14 ----
> recipes/qt4/qt4-native_4.7.2.bb | 19 -----
> recipes/qt4/qt4-tools-sdk_4.7.2.bb | 8 --
> recipes/qt4/qt4-x11-free-gles_4.7.2.bb | 19 -----
> recipes/qt4/qt4-x11-free_4.7.2.bb | 15 ----
> 12 files changed, 0 insertions(+), 379 deletions(-)
> delete mode 100644 recipes/qt4/qt-4.7.2.inc
> delete mode 100644 recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
> delete mode 100644 recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch
> delete mode 100644 recipes/qt4/qt-4.7.2/g++.conf
> delete mode 100644 recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
> delete mode 100644 recipes/qt4/qt-4.7.2/linux.conf
> delete mode 100644 recipes/qt4/qt4-embedded-gles_4.7.2.bb
> delete mode 100644 recipes/qt4/qt4-embedded_4.7.2.bb
> delete mode 100644 recipes/qt4/qt4-native_4.7.2.bb
> delete mode 100644 recipes/qt4/qt4-tools-sdk_4.7.2.bb
> delete mode 100644 recipes/qt4/qt4-x11-free-gles_4.7.2.bb
> delete mode 100644 recipes/qt4/qt4-x11-free_4.7.2.bb
>
> diff --git a/recipes/qt4/qt-4.7.2.inc b/recipes/qt4/qt-4.7.2.inc
> deleted file mode 100644
> index e6a7b90..0000000
> --- a/recipes/qt4/qt-4.7.2.inc
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -DEFAULT_PREFERENCE = "-1"
> -LICENSE = "LGPLv2.1 GPLv3"
> -
> -FILESPATHPKG =. "qt-${PV}:"
> -
> -SRC_URI = "\
> - ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
> - file://blacklist-fraudulent-comodo-certificates-patch.diff \
> - file://0004-no-qmake.patch \
> - file://hack-out-pg2-4.7.0.patch \
> - file://0006-freetype-host-includes.patch \
> - file://0001-Added-Openembedded-crossarch-option.patch \
> - file://0010-phonon-gstreamer-rgb-endianess.patch \
> - file://g++.conf \
> - file://linux.conf \
> - "
> -# Set necessary variables in the profile
> -SRC_URI += "file://qte.sh"
> -
> -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
> -
> -FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
> -
> -do_configure_prepend() {
> - for pro in $(find ${S} -name "*.pro") ; do
> - sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
> - done
> -
> - sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
> - sed -i \
> - -e /QMAKE_MOC\ /d \
> - -e /QMAKE_UIC\ /d \
> - -e /QMAKE_UIC3\ /d \
> - -e /QMAKE_RCC\ /d \
> - ${S}/configure
> -}
> -
> -do_configure_append() {
> - sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
> -}
> -
> -QT_GLFLAGS ?= ""
> -QT_CONFIG_FLAGS += " -javascript-jit -script -scripttools -declarative -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
> -
> -do_compile() {
> - # Fixup missing wsegl header in some SGX SDKs
> - if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
> - cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
> - fi
> -
> - unset CFLAGS CXXFLAGS
> - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
> - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
> - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
> - install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
> -
> - oe_runmake ${EXTRA_ENV}
> -}
> -
> -do_install_append() {
> - install -d ${D}${bindir}
> - for i in rcc uic moc ; do
> - install -m 0755 ${S}/bin/$i ${D}${bindir}/
> - done
> -
> - #Append an E to the qtdemo file
> - if [ -n "${QT_LIBINFIX}" ] ; then
> - mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
> - fi
> -}
> -
> -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
> -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
> diff --git a/recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
> deleted file mode 100644
> index 71a04a5..0000000
> --- a/recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com>
> -Date: Wed, 12 May 2010 16:52:45 +0200
> -Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
> -
> ----
> - configure | 7 ++++++-
> - 1 files changed, 6 insertions(+), 1 deletions(-)
> -
> -diff --git a/configure b/configure
> -index facd192..9d15136 100755
> ---- a/configure
> -+++ b/configure
> -@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
> - shift
> - VAL=$1
> - ;;
> -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
> -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
> - VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
> - shift
> - VAL="$1"
> -@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
> - xplatform)
> - XPLATFORM="$VAL"
> - ;;
> -+ crossarch)
> -+ CROSSARCH="$VAL"
> -+ ;;
> - debug-and-release)
> - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
> - CFG_DEBUG_RELEASE="$VAL"
> -@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
> - CFG_ARCH=$CFG_HOST_ARCH
> - fi
> -
> -+CFG_ARCH="$CROSSARCH"
> -+
> - if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
> - if [ "$OPT_VERBOSE" = "yes" ]; then
> - echo " '$CFG_ARCH' is supported"
> ---
> -1.7.0.4
> -
> diff --git a/recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch b/recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch
> deleted file mode 100644
> index d43366c..0000000
> --- a/recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> ---- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
> -+++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
> -@@ -18,6 +18,7 @@
> - #include <QApplication>
> - #include "videowidget.h"
> - #include "qwidgetvideosink.h"
> -+#include <gst/video/video.h>
> -
> - QT_BEGIN_NAMESPACE
> -
> -@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb =
> - GST_STATIC_PAD_TEMPLATE("sink",
> - GST_PAD_SINK,
> - GST_PAD_ALWAYS,
> -- GST_STATIC_CAPS("video/x-raw-rgb, "
> -- "framerate = (fraction) [ 0, MAX ], "
> -- "width = (int) [ 1, MAX ], "
> -- "height = (int) [ 1, MAX ],"
> -- "bpp = (int) 32"));
> -+ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN));
> -
> - template <VideoFormat FMT>
> - struct template_factory;
> diff --git a/recipes/qt4/qt-4.7.2/g++.conf b/recipes/qt4/qt-4.7.2/g++.conf
> deleted file mode 100644
> index 80f925c..0000000
> --- a/recipes/qt4/qt-4.7.2/g++.conf
> +++ /dev/null
> @@ -1,60 +0,0 @@
> -#
> -# qmake configuration for common gcc
> -#
> -
> -QMAKE_CC = $(OE_QMAKE_CC)
> -QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
> -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
> -QMAKE_CFLAGS_DEPS += -M
> -QMAKE_CFLAGS_WARN_ON += -Wall -W
> -QMAKE_CFLAGS_WARN_OFF += -w
> -QMAKE_CFLAGS_RELEASE +=
> -QMAKE_CFLAGS_DEBUG += -g
> -QMAKE_CFLAGS_SHLIB += -fPIC
> -QMAKE_CFLAGS_STATIC_LIB += -fPIC
> -QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
> -QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
> -QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
> -QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
> -
> -QMAKE_CXX = $(OE_QMAKE_CXX)
> -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
> -QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
> -QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
> -QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
> -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
> -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
> -QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
> -QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
> -QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
> -QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
> -QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
> -QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
> -QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
> -
> -QMAKE_LINK = $(OE_QMAKE_LINK)
> -QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
> -QMAKE_LINK_C = $(OE_QMAKE_LINK)
> -QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
> -QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
> -QMAKE_LFLAGS_RELEASE +=
> -QMAKE_LFLAGS_DEBUG +=
> -QMAKE_LFLAGS_APP +=
> -QMAKE_LFLAGS_SHLIB += -shared
> -QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
> -QMAKE_LFLAGS_SONAME += -Wl,-soname,
> -QMAKE_LFLAGS_THREAD +=
> -QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
> -QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
> -
> -QMAKE_PCH_OUTPUT_EXT = .gch
> -
> -# -Bsymbolic-functions (ld) support
> -QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
> -QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
> -
> -# some linking helper...
> -CONFIG += rpath_libdirs
> -
> -# for the SDK
> -isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
> diff --git a/recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch b/recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
> deleted file mode 100644
> index 5c588ff..0000000
> --- a/recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -Index: qt-everywhere-opensource-src-4.7.0/configure
> -===================================================================
> ---- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
> -+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
> -@@ -4921,10 +4921,10 @@
> - psql)
> - if [ "$CFG_SQL_psql" != "no" ]; then
> - # Be careful not to use native pg_config when cross building.
> -- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
> -- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
> -- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
> -- fi
> -+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
> -+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
> -+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
> -+# fi
> - [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
> - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
> - # But, respect PSQL_LIBS if set
> diff --git a/recipes/qt4/qt-4.7.2/linux.conf b/recipes/qt4/qt-4.7.2/linux.conf
> deleted file mode 100644
> index a541355..0000000
> --- a/recipes/qt4/qt-4.7.2/linux.conf
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -#
> -# 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_OPENGL =
> -QMAKE_LIBDIR_OPENGL =
> -QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
> -QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
> -QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
> -QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
> -QMAKE_INCDIR_EGL =
> -QMAKE_LIBDIR_EGL =
> -QMAKE_INCDIR_OPENVG =
> -QMAKE_LIBDIR_OPENVG =
> -
> -
> -QMAKE_LIBS =
> -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
> -QMAKE_LIBS_OPENGL = -lGLU -lGL
> -QMAKE_LIBS_OPENGL_QT = -lGL
> -QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
> -QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
> -QMAKE_LIBS_OPENVG = -lOpenVG
> -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-embedded-gles_4.7.2.bb b/recipes/qt4/qt4-embedded-gles_4.7.2.bb
> deleted file mode 100644
> index 8ab5a6c..0000000
> --- a/recipes/qt4/qt4-embedded-gles_4.7.2.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -DEFAULT_PREFERENCE = "-1"
> -
> -require qt4-embedded.inc
> -
> -PR = "${INC_PR}.10"
> -
> -QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
> -
> -PROVIDES += "qt4-embedded"
> -QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
> -
> -FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
> -
> -require qt-${PV}.inc
> -
> -QT_CONFIG_FLAGS += " \
> - -exceptions \
> -"
> -
> diff --git a/recipes/qt4/qt4-embedded_4.7.2.bb b/recipes/qt4/qt4-embedded_4.7.2.bb
> deleted file mode 100644
> index 7e3d4b8..0000000
> --- a/recipes/qt4/qt4-embedded_4.7.2.bb
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -DEFAULT_PREFERENCE = "-1"
> -
> -require qt4-embedded.inc
> -
> -PR = "${INC_PR}.1"
> -
> -QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
> -
> -require qt-${PV}.inc
> -
> -QT_CONFIG_FLAGS += " \
> - -exceptions \
> -"
> -
> diff --git a/recipes/qt4/qt4-native_4.7.2.bb b/recipes/qt4/qt4-native_4.7.2.bb
> deleted file mode 100644
> index 7e98035..0000000
> --- a/recipes/qt4/qt4-native_4.7.2.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -require qt4-native.inc
> -LICENSE = "LGPLv2.1 GPLv3"
> -
> -PR = "${INC_PR}.0"
> -
> -# Find the g++.conf/linux.conf in the right directory.
> -FILESPATHPKG =. "qt-${PV}:"
> -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
> - file://qt-config.patch \
> - file://g++.conf \
> - file://linux.conf"
> -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
> -
> -EXTRA_OECONF += " -no-fast -silent -no-rpath"
> -
> -TOBUILD := "src/tools/bootstrap ${TOBUILD}"
> -
> -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
> -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
> diff --git a/recipes/qt4/qt4-tools-sdk_4.7.2.bb b/recipes/qt4/qt4-tools-sdk_4.7.2.bb
> deleted file mode 100644
> index c86ac2a..0000000
> --- a/recipes/qt4/qt4-tools-sdk_4.7.2.bb
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -require qt4-tools-sdk.inc
> -
> -PR = "${INC_PR}.0"
> -
> -DEFAULT_PREFERENCE = "-1"
> -
> -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
> -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
> diff --git a/recipes/qt4/qt4-x11-free-gles_4.7.2.bb b/recipes/qt4/qt4-x11-free-gles_4.7.2.bb
> deleted file mode 100644
> index c5fd6f3..0000000
> --- a/recipes/qt4/qt4-x11-free-gles_4.7.2.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -DEFAULT_PREFERENCE = "-1"
> -
> -require qt4-x11-free.inc
> -PR = "${INC_PR}.7"
> -
> -QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
> -
> -require qt-${PV}.inc
> -
> -QT_CONFIG_FLAGS += " \
> - -no-embedded \
> - -xrandr \
> - -x11"
> -
> -FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
> -
> -DEPENDS += "virtual/egl"
> -require recipes/egl/egl.inc
> -PROVIDES += "qt4-x11-free"
> diff --git a/recipes/qt4/qt4-x11-free_4.7.2.bb b/recipes/qt4/qt4-x11-free_4.7.2.bb
> deleted file mode 100644
> index 79a765e..0000000
> --- a/recipes/qt4/qt4-x11-free_4.7.2.bb
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -DEFAULT_PREFERENCE = "-1"
> -
> -require qt4-x11-free.inc
> -
> -PR = "${INC_PR}.0"
> -
> -QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
> -
> -require qt-${PV}.inc
> -
> -QT_CONFIG_FLAGS += " \
> - -no-embedded \
> - -xrandr \
> - -x11"
> -
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Update qt to 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
` (6 preceding siblings ...)
2011-05-12 1:21 ` Update qt to 4.7.3 Otavio Salvador
@ 2011-05-12 8:56 ` Paul Menzel
2011-05-12 9:11 ` Eric Bénard
2011-05-12 15:08 ` Tom Rini
8 siblings, 1 reply; 21+ messages in thread
From: Paul Menzel @ 2011-05-12 8:56 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
Dear Eric,
Am Mittwoch, den 11.05.2011, 22:29 +0200 schrieb Eric Bénard:
> Please test these recipes you are interested in as for now I only compile
> tested qt4-embedded & qt4-native.
if you could take a look at my build problem reported in this thread [1]
that would be awesome.
Thanks,
Paul
[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-May/032634.html
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Update qt to 4.7.3
2011-05-12 8:56 ` Paul Menzel
@ 2011-05-12 9:11 ` Eric Bénard
0 siblings, 0 replies; 21+ messages in thread
From: Eric Bénard @ 2011-05-12 9:11 UTC (permalink / raw)
To: openembedded-devel
Hi Paul,
On 12/05/2011 10:56, Paul Menzel wrote:
> Am Mittwoch, den 11.05.2011, 22:29 +0200 schrieb Eric Bénard:
>
>> Please test these recipes you are interested in as for now I only compile
>> tested qt4-embedded& qt4-native.
>
> if you could take a look at my build problem reported in this thread [1]
> that would be awesome.
>
>
Will see if I can find a way to reproduce the thing
Eric
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Update qt to 4.7.3
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
` (7 preceding siblings ...)
2011-05-12 8:56 ` Paul Menzel
@ 2011-05-12 15:08 ` Tom Rini
2011-05-13 10:44 ` Paul Eggleton
8 siblings, 1 reply; 21+ messages in thread
From: Tom Rini @ 2011-05-12 15:08 UTC (permalink / raw)
To: openembedded-devel
On 05/11/2011 01:29 PM, Eric Bénard wrote:
>
> Hi,
>
> Please test these recipes you are interested in as for now I only compile
> tested qt4-embedded & qt4-native.
Any idea if this fixes all of the arches that moving to 4.7.2 broke
(anything not arm or x86, more or less) ? Thanks.
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Update qt to 4.7.3
2011-05-12 15:08 ` Tom Rini
@ 2011-05-13 10:44 ` Paul Eggleton
2011-05-13 15:56 ` Tom Rini
0 siblings, 1 reply; 21+ messages in thread
From: Paul Eggleton @ 2011-05-13 10:44 UTC (permalink / raw)
To: openembedded-devel
On Thursday 12 May 2011 16:08:19 Tom Rini wrote:
> Any idea if this fixes all of the arches that moving to 4.7.2 broke
> (anything not arm or x86, more or less) ? Thanks.
Which arches specifically didn't build for you? I have at least managed to
build 4.7.3 for x86-64 and MIPS (with oe-core that is).
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Update qt to 4.7.3
2011-05-13 10:44 ` Paul Eggleton
@ 2011-05-13 15:56 ` Tom Rini
0 siblings, 0 replies; 21+ messages in thread
From: Tom Rini @ 2011-05-13 15:56 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-devel
On 05/13/2011 03:44 AM, Paul Eggleton wrote:
> On Thursday 12 May 2011 16:08:19 Tom Rini wrote:
>> Any idea if this fixes all of the arches that moving to 4.7.2 broke
>> (anything not arm or x86, more or less) ? Thanks.
>
> Which arches specifically didn't build for you? I have at least managed to
> build 4.7.3 for x86-64 and MIPS (with oe-core that is).
In openembedded.master, mips*, ppc and sh4 don't compile past 4.7.1 but
I don't have the exact error handy (I think it was some dependency
library didn't support the arch).
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2011-05-13 15:59 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-11 20:29 Update qt to 4.7.3 Eric Bénard
2011-05-11 20:30 ` [PATCH 1/6] qt4: introduce version 4.7.3 Eric Bénard
2011-05-12 8:47 ` Martin Jansa
2011-05-11 20:30 ` [PATCH 2/6] minimal: prefer qt 4.7.3 Eric Bénard
2011-05-12 8:32 ` Paul Menzel
2011-05-12 8:47 ` Michael 'Mickey' Lauer
2011-05-11 20:30 ` [PATCH 3/6] angstrom-2010: " Eric Bénard
2011-05-11 22:04 ` Koen Kooi
2011-05-11 20:30 ` [PATCH 4/6] kaeilos-2009: " Eric Bénard
2011-05-12 8:23 ` Marco Cavallini
2011-05-11 20:30 ` [PATCH 5/6] shr: " Eric Bénard
2011-05-12 8:47 ` Martin Jansa
2011-05-11 20:30 ` [PATCH 6/6] qt4: remove 4.7.2 Eric Bénard
2011-05-12 8:48 ` Martin Jansa
2011-05-12 1:21 ` Update qt to 4.7.3 Otavio Salvador
2011-05-12 7:40 ` Eric Bénard
2011-05-12 8:56 ` Paul Menzel
2011-05-12 9:11 ` Eric Bénard
2011-05-12 15:08 ` Tom Rini
2011-05-13 10:44 ` Paul Eggleton
2011-05-13 15:56 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.