* [PATCH 1/1] qt3: Add qt3 to poky for fixing [YOCTO #816]
@ 2011-04-22 9:31 Xiaofeng Yan
0 siblings, 0 replies; 4+ messages in thread
From: Xiaofeng Yan @ 2011-04-22 9:31 UTC (permalink / raw)
To: poky
[-- Attachment #1: Type: text/plain, Size: 18556 bytes --]
From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
Add a new layer "meta-qt3" and import recipes-qt3,qt3e.bbclass and qt3x11.bbclass from OE.
Qt3 is needed by LSB Test Suite.
Changes from the meta-openembedded version:
1 Add "-L ${STAGING_LIBDIR} -I ${STAGING_INCDIR_NATIVE}" to function do_configure() in file qt-x11-free-native_3.3.5.bb
2 Remove do_stage and transfer contents from do_stage to do_install in file qt-x11-free-native_3.3.5.bb
3 Add LIC_FILES_CHKSUM and PR in file qt-x11-free-native_3.3.5.bb
4 Remove -plugin-sql-mysql from "QT_CONFIG_FLAGS" in file qt-x11-free-common.inc
5 Add "install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic" to function do_compile() in file qt-x11-free-common.inc
6 Change do_stage to do_install_prepend in file qt-x11-free-common.inc
7 Add LIC_FILES_CHKSUM and PR in file qt-x11-free_3.3.7.bb
8 Add links in qt-x11-free-native_3.3.5.bb
cd ${D}${bindir}
for i in qmake moc uic lrelease lupdate;do
ln -s ${i}3 ${i}
done
9 Remove depends for qt-x11-free_3.3.7
10Add meta-qt3 to meta-yocto/conf/bblayers.conf.sample
11Add PROVIDER VERSION for qt3 to meta-yocto/conf/distro/poky-lsb.conf
12Add "BBCLASSEXTEND = "native"" to libxmu_1.1.0.bb because qt3 depend on it.
---
meta-qt3/conf/layer.conf | 10 ++
meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc | 90 ++++++++++++++++++++
.../recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 71 +++++++++++++++
.../recipes-qt3/qt3/qt-x11-free/configure.patch | 51 +++++++++++
.../recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch | 28 ++++++
.../recipes-qt3/qt3/qt-x11-free/no-examples.patch | 16 ++++
meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb | 13 +++
meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 16 ++++
meta-yocto/conf/bblayers.conf.sample | 5 +-
meta-yocto/conf/distro/poky-lsb.conf | 3 +-
meta/classes/qt3e.bbclass | 11 +++
meta/classes/qt3x11.bbclass | 15 +++
meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb | 1 +
13 files changed, 327 insertions(+), 3 deletions(-)
create mode 100755 meta-qt3/conf/layer.conf
create mode 100755 meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
create mode 100755 meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
create mode 100755 meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
create mode 100755 meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
create mode 100755 meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
create mode 100755 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
create mode 100755 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
create mode 100644 meta/classes/qt3e.bbclass
create mode 100644 meta/classes/qt3x11.bbclass
diff --git a/meta-qt3/conf/layer.conf b/meta-qt3/conf/layer.conf
new file mode 100755
index 0000000..0d5307f
--- /dev/null
+++ b/meta-qt3/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}:${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb "
+
+BBFILE_COLLECTIONS += "qt3"
+BBFILE_PATTERN_qt3 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_qt3 = "6"
+
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc b/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
new file mode 100755
index 0000000..817e307
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
@@ -0,0 +1,90 @@
+DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+HOMEPAGE ="http://www.trolltech.com"
+PR = "r0"
+
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+inherit qmake_base qt3x11
+
+export QTDIR = "${S}"
+STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
+ARCH_i686 = "x86"
+EXTRA_OEMAKE = "-e"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
+ -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -verbose"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
+ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ AR="${TARGET_PREFIX}ar cqs" \
+ MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
+
+do_configure() {
+ echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
+
+ # force regenerate
+ rm -f src/qtmain.pro
+ cat Makefile>makefile
+ find . -name "Makefile"|xargs rm -f
+ (cd src&& qmake -spec ${QMAKESPEC} )
+ (cd plugins/src&& qmake -spec ${QMAKESPEC} )
+ (cd tools&& qmake -spec ${QMAKESPEC} )
+ (cd tools/qvfb&& qmake -spec ${QMAKESPEC} )
+}
+
+do_compile() {
+ unset CFLAGS
+ unset CXXFLAGS
+
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic
+
+ oe_runmake -C src ${EXTRA_ENV}
+ oe_runmake -C plugins/src ${EXTRA_ENV}
+ oe_runmake -C tools ${EXTRA_ENV}
+}
+
+do_install_prepend() {
+ install -d ${STAGING_QT_DIR}/bin
+ ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
+ ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
+ ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
+ install -d ${STAGING_QT_DIR}/lib
+ oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
+ install -d ${STAGING_QT_DIR}/include/private
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/
+ done
+ for f in include/private/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/private
+ done
+ for f in lib/*.prl
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/lib
+ done
+}
+
+do_install() {
+ install -d ${D}${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+ install -d ${D}${bindir}/
+ install -d ${D}${prefix}/plugins/
+ cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
+}
+
+PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
+ qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
+FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so"
+FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so"
+FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so"
+FILES_qt-x11-designer = "${bindir}/designer"
+FILES_qt-x11-assistant = "${bindir}/assistant"
+FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
+FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
new file mode 100755
index 0000000..232109b
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "Qt/X11 Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+DEPENDS = "xmu-native"
+HOMEPAGE ="http://www.trolltech.com"
+PR = "r0"
+
+FILESDIR ="${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
+
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
+file://LICENSE.QPL;md5=fff372435cb41647bc0b3cb940ea5c51"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://no-examples.patch"
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+#
+# FIXME - This should be updated to use OE's qmake_base.oeclass
+# or the full qmake.oeclass.
+#
+
+PROVIDES = "qt-x11-free-native"
+export QTDIR = "${S}"
+export SYSCONF_CXX = "${CCACHE} g++"
+export SYSCONF_CC = "${CCACHE} gcc"
+export SYSCONF_LINK = "${CCACHE} g++"
+THIS_QMAKESPEC = "${STAGING_DATADIR}/qmake/${TARGET_OS}-oe-g++"
+export QMAKESPEC = ""
+ARCH_i686 = "x86"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -qt-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
+ -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-freetype -no-nis -no-cups -stl -thread -no-exceptions"
+
+
+inherit native
+
+do_configure() {
+ echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast -L ${STAGING_LIBDIR} \
+ -I ${STAGING_INCDIR_NATIVE}
+}
+
+do_compile() {
+ LD_LIBRARY_PATH=${S}/lib oe_runmake \
+ QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${THIS_QMAKESPEC}"
+}
+
+
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 bin/qmake ${D}${bindir}/qmake3
+ for i in moc uic lrelease lupdate; do
+ install -m 0755 bin/${i} ${D}${bindir}/${i}3
+ done
+
+ install -d ${D}${datadir}/qt3/
+ cp -PfR mkspecs ${D}${datadir}/qt3/
+ ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${BUILD_OS}-oe-g++
+ ln -s ${D}${datadir}/qt3/mkspecs/ ${D}${datadir}/qmake
+ install -d ${D}${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+ cd ${D}${bindir}
+ for i in qmake moc uic lrelease lupdate;do
+ ln -s ${i}3 ${i}
+ done
+}
+
+
+SRC_URI[md5sum] = "05d04688c0c0230ed54e89102d689ca4"
+SRC_URI[sha256sum] = "aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
new file mode 100755
index 0000000..9d6c1e8
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
@@ -0,0 +1,51 @@
+
+#
+# Patch managed byhttp://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-free-3.3.2/configure~configure.patch
++++ qt-x11-free-3.3.2/configure
+@@ -1754,21 +1754,14 @@
+ CFG_FREETYPE=yes
+ fi
+ fi
+- # add freetype2 include path
+- if [ "$CFG_FREETYPE" = "yes" ]&& [ -f $outpath/config.tests/x11/xft.inc ];then
+- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\""
+- fi
+- rm -f $outpath/config.tests/x11/xft.inc
+ # add Xft specific libraries
+ if [ "$CFG_FREETYPE" = "yes" ]&& [ -f $outpath/config.tests/x11/xft.lib ]; then
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
+ fi
+- rm -f $outpath/config.tests/x11/xft.lib
+ # add Xft specific config options
+ if [ "$CFG_FREETYPE" = "yes" ]&& [ -f $outpath/config.tests/x11/xft.cfg ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
+ fi
+- rm -f $outpath/config.tests/x11/xft.cfg
+ # auto-detect Session Management support
+ if [ "$CFG_SM" = "auto" ]; then
+ if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
+@@ -2553,12 +2546,6 @@
+ (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting."&& exit 2)) || exit 2
+ fi
+
+-# clean up temporary qconfig.h and qmodules.h
+-rm -f $outpath/include/qmake/qconfig.h
+-rm -f $outpath/include/qmake/qmodules.h
+-rmdir $outpath/include/qmake
+-
+-
+ #-------------------------------------------------------------------------------
+ # tests that need qmake
+ #-------------------------------------------------------------------------------
+@@ -3605,7 +3592,7 @@
+
+ EOF
+ else
+- EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a"
++ EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a $OE_EXTRA_QMAKE"
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " (`basename $SPEC`)"
+ if echo '\c' | grep '\c'>/dev/null; then
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
new file mode 100755
index 0000000..818bced
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
@@ -0,0 +1,28 @@
+
+#
+# Patch managed byhttp://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch
++++ qt-x11-free-3.3.6/src/tools/qstring.h
+@@ -60,7 +60,7 @@
+ #endif
+ #endif
+
+-
++#define Q_NO_PACKED_REFERENCE
+ /*****************************************************************************
+ QString class
+ *****************************************************************************/
+@@ -194,9 +194,9 @@
+ char latin1() const { return ucs> 0xff ? 0 : (char) ucs; }
+ ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+- ushort&unicode() { return *(&ucs); }
++ ushort&unicode() { return *((ushort*)&ucs); }
+ #else
+- ushort&unicode() { return ucs; }
++ ushort&unicode() { return (ushort)ucs; }
+ #endif
+ #ifndef QT_NO_CAST_ASCII
+ // like all ifdef'd code this is undocumented
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
new file mode 100755
index 0000000..b0ee637
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed byhttp://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200
++++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200
+@@ -11,7 +11,7 @@
+ install: FORCE
+ @$(MAKE) qt.install
+
+-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
++all: symlinks src-qmake src-moc sub-src sub-tools
+ @echo
+ @echo "The Qt library is now built in ./lib"
+ @echo "The Qt examples are built in the directories in ./examples"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
new file mode 100755
index 0000000..789e6fb
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
@@ -0,0 +1,13 @@
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
+PROVIDES = "qt3x11"
+PR = "r3"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://configure.patch \
+ file://no-examples.patch \
+file://gcc4_1-HACK.patch"
+
+require qt-x11-free-common.inc
+
+SRC_URI[md5sum] = "dc1384c03ac08af21f6fefab32d982cf"
+SRC_URI[sha256sum] = "04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
new file mode 100755
index 0000000..bfb01b9
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
@@ -0,0 +1,16 @@
+DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl"
+PROVIDES = "qt3x11"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
+file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://configure.patch \
+ file://no-examples.patch \
+file://gcc4_1-HACK.patch"
+
+require qt-x11-free-common.inc
+
+SRC_URI[md5sum] = "655e21cf6a7e66daf8ec6ceda81aae1e"
+SRC_URI[sha256sum] = "48c05b501029f0640db665fbc7f981a0efbf69ad3cf87a43c5eea4872f4f7ba1"
diff --git a/meta-yocto/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample
index 2df038c..d4a9ba2 100644
--- a/meta-yocto/conf/bblayers.conf.sample
+++ b/meta-yocto/conf/bblayers.conf.sample
@@ -4,6 +4,7 @@ LCONF_VERSION = "4"
BBFILES ?= ""
BBLAYERS = " \
- ##COREBASE##/meta \
- ##COREBASE##/meta-yocto \
+ ##POKYBASE##/meta \
+ ##POKYBASE##/meta-yocto \
+ ##POKYBASE##/meta-qt3 \
"
diff --git a/meta-yocto/conf/distro/poky-lsb.conf b/meta-yocto/conf/distro/poky-lsb.conf
index eb1cf82..2bf1b33 100644
--- a/meta-yocto/conf/distro/poky-lsb.conf
+++ b/meta-yocto/conf/distro/poky-lsb.conf
@@ -6,4 +6,5 @@ DISTROOVERRIDES = "poky:linuxstdbase"
DISTRO_FEATURES += "pam largefile"
PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-
+PREFERRED_VERSION_qt-x11-free-native = 3.3.5
+PREFERRED_VERSION_qt-x11-free = 3.3.7
diff --git a/meta/classes/qt3e.bbclass b/meta/classes/qt3e.bbclass
new file mode 100644
index 0000000..d3d4a14
--- /dev/null
+++ b/meta/classes/qt3e.bbclass
@@ -0,0 +1,11 @@
+#
+# override variables set by qmake_base to compile Qt/X11 apps
+#
+export QTDIR="${STAGING_DIR_HOST}/qte3"
+export QTEDIR="${STAGING_DIR_HOST}/qte3"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
+export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
+export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
+export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
+export OE_QMAKE_LIBS_QT="qte"
diff --git a/meta/classes/qt3x11.bbclass b/meta/classes/qt3x11.bbclass
new file mode 100644
index 0000000..5408b7f
--- /dev/null
+++ b/meta/classes/qt3x11.bbclass
@@ -0,0 +1,15 @@
+DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
+EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
+#
+# override variables set by qmake_base to compile Qt/X11 apps
+#
+export QTDIR = "${STAGING_DIR_HOST}/qt3"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
+export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb
index 59f2c28..0ef3648 100644
--- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb
@@ -28,5 +28,6 @@ PACKAGES =+ "libxmuu libxmuu-dev"
FILES_libxmuu = "${libdir}/libXmuu.so.*"
FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+BBCLASSEXTEND = "native"
SRC_URI[md5sum] = "6836883a0120e8346cf7f58dc42e465a"
SRC_URI[sha256sum] = "0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad"
[-- Attachment #2: Type: text/html, Size: 21213 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 0/1] meta-qt3: Add qt3 to OE-CORE to fix [#816]
@ 2011-04-29 1:26 Xiaofeng Yan
2011-04-29 1:26 ` [PATCH 1/1] qt3: Add qt3 to poky for fixing [YOCTO #816] Xiaofeng Yan
0 siblings, 1 reply; 4+ messages in thread
From: Xiaofeng Yan @ 2011-04-29 1:26 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Add a new layer "meta-qt3" to OE-CORE because lsb test suite need it.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/meta-qt3
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/meta-qt3
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
qt3: Add qt3 to poky for fixing [YOCTO #816]
meta-qt3/classes/qt3e.bbclass | 11 +++
meta-qt3/classes/qt3x11.bbclass | 15 +++
meta-qt3/conf/layer.conf | 10 ++
meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb | 10 ++
meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc | 92 ++++++++++++++++++++
.../recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 72 +++++++++++++++
.../recipes-qt3/qt3/qt-x11-free/configure.patch | 51 +++++++++++
.../recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch | 28 ++++++
.../recipes-qt3/qt3/qt-x11-free/no-examples.patch | 16 ++++
meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb | 13 +++
meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 17 ++++
meta-qt3/recipes-qt3/tasks/task-core-qt3.bb | 23 +++++
12 files changed, 358 insertions(+), 0 deletions(-)
create mode 100644 meta-qt3/classes/qt3e.bbclass
create mode 100644 meta-qt3/classes/qt3x11.bbclass
create mode 100644 meta-qt3/conf/layer.conf
create mode 100644 meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
create mode 100644 meta-qt3/recipes-qt3/tasks/task-core-qt3.bb
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] qt3: Add qt3 to poky for fixing [YOCTO #816]
2011-04-29 1:26 [PATCH 0/1] meta-qt3: Add qt3 to OE-CORE to fix [#816] Xiaofeng Yan
@ 2011-04-29 1:26 ` Xiaofeng Yan
2011-04-29 5:26 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Xiaofeng Yan @ 2011-04-29 1:26 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Add a new layer "meta-qt3" and import recipes-qt3,qt3e.bbclass and qt3x11.bbclass from OE.
Qt3 is needed by LSB Test Suite. Changes from the meta-openembedded version:
1 Add "-L ${STAGING_LIBDIR} -I ${STAGING_INCDIR_NATIVE}" to function do_configure() in file qt-x11-free-native_3.3.5.bb
2 Remove do_stage and transfer contents from do_stage to do_install in file qt-x11-free-native_3.3.5.bb
3 Add LIC_FILES_CHKSUM and PR in file qt-x11-free-native_3.3.5.bb
4 Remove -plugin-sql-mysql from "QT_CONFIG_FLAGS" in file qt-x11-free-common.inc
5 Add "install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic" to function do_compile() in file qt-x11-free-common.inc
6 Change do_stage to do_install_prepend in file qt-x11-free-common.inc
7 Add LIC_FILES_CHKSUM and PR in file qt-x11-free_3.3.7.bb
8 Add links in qt-x11-free-native_3.3.5.bb
cd ${D}${bindir}
for i in qmake moc uic lrelease lupdate;do
ln -s ${i}3 ${i} done
9 Remove depends for qt-x11-free_3.3.7
10 Add images/core-image-lsb-qt3.bb
11 Add tasks/task-core-qt3.bb
12 Add conf/layer.conf
---
meta-qt3/classes/qt3e.bbclass | 11 +++
meta-qt3/classes/qt3x11.bbclass | 15 +++
meta-qt3/conf/layer.conf | 10 ++
meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb | 10 ++
meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc | 92 ++++++++++++++++++++
.../recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 72 +++++++++++++++
.../recipes-qt3/qt3/qt-x11-free/configure.patch | 51 +++++++++++
.../recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch | 28 ++++++
.../recipes-qt3/qt3/qt-x11-free/no-examples.patch | 16 ++++
meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb | 13 +++
meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 17 ++++
meta-qt3/recipes-qt3/tasks/task-core-qt3.bb | 23 +++++
12 files changed, 358 insertions(+), 0 deletions(-)
create mode 100644 meta-qt3/classes/qt3e.bbclass
create mode 100644 meta-qt3/classes/qt3x11.bbclass
create mode 100644 meta-qt3/conf/layer.conf
create mode 100644 meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
create mode 100644 meta-qt3/recipes-qt3/tasks/task-core-qt3.bb
diff --git a/meta-qt3/classes/qt3e.bbclass b/meta-qt3/classes/qt3e.bbclass
new file mode 100644
index 0000000..d3d4a14
--- /dev/null
+++ b/meta-qt3/classes/qt3e.bbclass
@@ -0,0 +1,11 @@
+#
+# override variables set by qmake_base to compile Qt/X11 apps
+#
+export QTDIR="${STAGING_DIR_HOST}/qte3"
+export QTEDIR="${STAGING_DIR_HOST}/qte3"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
+export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
+export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
+export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
+export OE_QMAKE_LIBS_QT="qte"
diff --git a/meta-qt3/classes/qt3x11.bbclass b/meta-qt3/classes/qt3x11.bbclass
new file mode 100644
index 0000000..5408b7f
--- /dev/null
+++ b/meta-qt3/classes/qt3x11.bbclass
@@ -0,0 +1,15 @@
+DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
+EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
+#
+# override variables set by qmake_base to compile Qt/X11 apps
+#
+export QTDIR = "${STAGING_DIR_HOST}/qt3"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
+export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
diff --git a/meta-qt3/conf/layer.conf b/meta-qt3/conf/layer.conf
new file mode 100644
index 0000000..f4597db
--- /dev/null
+++ b/meta-qt3/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}:${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb"
+
+BBFILE_COLLECTIONS += "qt3"
+BBFILE_PATTERN_qt3 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_qt3 = "6"
+
diff --git a/meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb b/meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb
new file mode 100644
index 0000000..b7dc92e
--- /dev/null
+++ b/meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb
@@ -0,0 +1,10 @@
+IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
+
+IMAGE_INSTALL = "\
+ ${POKY_BASE_INSTALL} \
+ task-core-basic \
+ task-core-lsb \
+ task-core-qt-mt3 \
+ "
+
+inherit core-image
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc b/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
new file mode 100644
index 0000000..60fbd42
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
@@ -0,0 +1,92 @@
+DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+HOMEPAGE = "http://www.trolltech.com"
+PR = "r0"
+
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+
+inherit qmake_base ${COREBASE}/meta-qt3/classes/qt3x11.bbclass
+
+export QTDIR = "${S}"
+STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
+ARCH_i686 = "x86"
+EXTRA_OEMAKE = "-e"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
+ -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -verbose"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
+ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ AR="${TARGET_PREFIX}ar cqs" \
+ MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
+
+do_configure() {
+ echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
+
+ # force regenerate
+ rm -f src/qtmain.pro
+ cat Makefile >makefile
+ find . -name "Makefile"|xargs rm -f
+ (cd src && qmake -spec ${QMAKESPEC} )
+ (cd plugins/src && qmake -spec ${QMAKESPEC} )
+ (cd tools && qmake -spec ${QMAKESPEC} )
+ (cd tools/qvfb && qmake -spec ${QMAKESPEC} )
+}
+
+do_compile() {
+ unset CFLAGS
+ unset CXXFLAGS
+
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic
+
+ oe_runmake -C src ${EXTRA_ENV}
+ oe_runmake -C plugins/src ${EXTRA_ENV}
+ oe_runmake -C tools ${EXTRA_ENV}
+}
+
+do_install_prepend() {
+ install -d ${STAGING_QT_DIR}/bin
+ ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
+ ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
+ ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
+ install -d ${STAGING_QT_DIR}/lib
+ oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
+ install -d ${STAGING_QT_DIR}/include/private
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/
+ done
+ for f in include/private/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/private
+ done
+ for f in lib/*.prl
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/lib
+ done
+}
+
+do_install() {
+ install -d ${D}${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+ install -d ${D}${bindir}/
+ install -d ${D}${prefix}/plugins/
+ cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
+}
+
+PACKAGES =+ " libqt-mt3 qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
+ qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
+FILES_libqt-mt3 = "${D}/{libdir}/libqt-mt*"
+FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so"
+FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so"
+FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so"
+FILES_qt-x11-designer = "${bindir}/designer"
+FILES_qt-x11-assistant = "${bindir}/assistant"
+FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
+FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
new file mode 100644
index 0000000..2c55a57
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "Qt/X11 Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+DEPENDS = "xmu-native"
+HOMEPAGE = "http://www.trolltech.com"
+PR = "r0"
+
+PROVIDES += "qt-x11-free-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
+
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
+ file://LICENSE.QPL;md5=fff372435cb41647bc0b3cb940ea5c51"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://no-examples.patch"
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+#
+# FIXME - This should be updated to use OE's qmake_base.oeclass
+# or the full qmake.oeclass.
+#
+
+PROVIDES = "qt-x11-free-native"
+export QTDIR = "${S}"
+export SYSCONF_CXX = "${CCACHE} g++"
+export SYSCONF_CC = "${CCACHE} gcc"
+export SYSCONF_LINK = "${CCACHE} g++"
+THIS_QMAKESPEC = "${STAGING_DATADIR}/qmake/${TARGET_OS}-oe-g++"
+export QMAKESPEC = ""
+ARCH_i686 = "x86"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -qt-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
+ -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-freetype -no-nis -no-cups -stl -thread -no-exceptions"
+
+
+inherit native
+
+do_configure() {
+ echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast -L ${STAGING_LIBDIR} \
+ -I ${STAGING_INCDIR_NATIVE}
+}
+
+do_compile() {
+ LD_LIBRARY_PATH=${S}/lib oe_runmake \
+ QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${THIS_QMAKESPEC}"
+}
+
+
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 bin/qmake ${D}${bindir}/qmake3
+ for i in moc uic lrelease lupdate; do
+ install -m 0755 bin/${i} ${D}${bindir}/${i}3
+ done
+
+ install -d ${D}${datadir}/qt3/
+ cp -PfR mkspecs ${D}${datadir}/qt3/
+ ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${BUILD_OS}-oe-g++
+ ln -s ${D}${datadir}/qt3/mkspecs/ ${D}${datadir}/qmake
+ install -d ${D}${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+ cd ${D}${bindir}
+ for i in qmake moc uic lrelease lupdate;do
+ ln -s ${i}3 ${i}
+ done
+}
+
+
+SRC_URI[md5sum] = "05d04688c0c0230ed54e89102d689ca4"
+SRC_URI[sha256sum] = "aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
new file mode 100644
index 0000000..9d6c1e8
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
@@ -0,0 +1,51 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-free-3.3.2/configure~configure.patch
++++ qt-x11-free-3.3.2/configure
+@@ -1754,21 +1754,14 @@
+ CFG_FREETYPE=yes
+ fi
+ fi
+- # add freetype2 include path
+- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then
+- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\""
+- fi
+- rm -f $outpath/config.tests/x11/xft.inc
+ # add Xft specific libraries
+ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
+ fi
+- rm -f $outpath/config.tests/x11/xft.lib
+ # add Xft specific config options
+ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
+ fi
+- rm -f $outpath/config.tests/x11/xft.cfg
+ # auto-detect Session Management support
+ if [ "$CFG_SM" = "auto" ]; then
+ if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
+@@ -2553,12 +2546,6 @@
+ (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
+ fi
+
+-# clean up temporary qconfig.h and qmodules.h
+-rm -f $outpath/include/qmake/qconfig.h
+-rm -f $outpath/include/qmake/qmodules.h
+-rmdir $outpath/include/qmake
+-
+-
+ #-------------------------------------------------------------------------------
+ # tests that need qmake
+ #-------------------------------------------------------------------------------
+@@ -3605,7 +3592,7 @@
+
+ EOF
+ else
+- EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a"
++ EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a $OE_EXTRA_QMAKE"
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " (`basename $SPEC`)"
+ if echo '\c' | grep '\c' >/dev/null; then
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
new file mode 100644
index 0000000..818bced
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
@@ -0,0 +1,28 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch
++++ qt-x11-free-3.3.6/src/tools/qstring.h
+@@ -60,7 +60,7 @@
+ #endif
+ #endif
+
+-
++#define Q_NO_PACKED_REFERENCE
+ /*****************************************************************************
+ QString class
+ *****************************************************************************/
+@@ -194,9 +194,9 @@
+ char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
+ ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+- ushort &unicode() { return *(&ucs); }
++ ushort &unicode() { return *((ushort*)&ucs); }
+ #else
+- ushort &unicode() { return ucs; }
++ ushort &unicode() { return (ushort)ucs; }
+ #endif
+ #ifndef QT_NO_CAST_ASCII
+ // like all ifdef'd code this is undocumented
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
new file mode 100644
index 0000000..b0ee637
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200
++++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200
+@@ -11,7 +11,7 @@
+ install: FORCE
+ @$(MAKE) qt.install
+
+-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
++all: symlinks src-qmake src-moc sub-src sub-tools
+ @echo
+ @echo "The Qt library is now built in ./lib"
+ @echo "The Qt examples are built in the directories in ./examples"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
new file mode 100644
index 0000000..789e6fb
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
@@ -0,0 +1,13 @@
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
+PROVIDES = "qt3x11"
+PR = "r3"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://configure.patch \
+ file://no-examples.patch \
+ file://gcc4_1-HACK.patch"
+
+require qt-x11-free-common.inc
+
+SRC_URI[md5sum] = "dc1384c03ac08af21f6fefab32d982cf"
+SRC_URI[sha256sum] = "04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae"
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
new file mode 100644
index 0000000..9a3bcf9
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
@@ -0,0 +1,17 @@
+DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl"
+PROVIDES = "qt3x11"
+PR = "r0"
+
+PREFERRED_VERSION_qt-x11-free = 3.3.7
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
+ file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://configure.patch \
+ file://no-examples.patch \
+ file://gcc4_1-HACK.patch"
+
+require qt-x11-free-common.inc
+
+SRC_URI[md5sum] = "655e21cf6a7e66daf8ec6ceda81aae1e"
+SRC_URI[sha256sum] = "48c05b501029f0640db665fbc7f981a0efbf69ad3cf87a43c5eea4872f4f7ba1"
diff --git a/meta-qt3/recipes-qt3/tasks/task-core-qt3.bb b/meta-qt3/recipes-qt3/tasks/task-core-qt3.bb
new file mode 100644
index 0000000..81479d9
--- /dev/null
+++ b/meta-qt3/recipes-qt3/tasks/task-core-qt3.bb
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2011 Wind River
+#
+
+DESCRIPTION = "Create qt3 Tasks"
+PR = "r0"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PACKAGES = "\
+ task-core-qt-mt3 \
+"
+
+
+ALLOW_EMPTY = "1"
+
+
+RDEPENDS_task-core-qt-mt3 = "\
+ qt-x11-free \
+ libqt-mt3 \
+"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] qt3: Add qt3 to poky for fixing [YOCTO #816]
2011-04-29 1:26 ` [PATCH 1/1] qt3: Add qt3 to poky for fixing [YOCTO #816] Xiaofeng Yan
@ 2011-04-29 5:26 ` Saul Wold
0 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-04-29 5:26 UTC (permalink / raw)
To: Xiaofeng Yan; +Cc: poky
On 04/28/2011 06:26 PM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> Add a new layer "meta-qt3" and import recipes-qt3,qt3e.bbclass and qt3x11.bbclass from OE.
> Qt3 is needed by LSB Test Suite. Changes from the meta-openembedded version:
> 1 Add "-L ${STAGING_LIBDIR} -I ${STAGING_INCDIR_NATIVE}" to function do_configure() in file qt-x11-free-native_3.3.5.bb
> 2 Remove do_stage and transfer contents from do_stage to do_install in file qt-x11-free-native_3.3.5.bb
> 3 Add LIC_FILES_CHKSUM and PR in file qt-x11-free-native_3.3.5.bb
> 4 Remove -plugin-sql-mysql from "QT_CONFIG_FLAGS" in file qt-x11-free-common.inc
> 5 Add "install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic" to function do_compile() in file qt-x11-free-common.inc
> 6 Change do_stage to do_install_prepend in file qt-x11-free-common.inc
> 7 Add LIC_FILES_CHKSUM and PR in file qt-x11-free_3.3.7.bb
> 8 Add links in qt-x11-free-native_3.3.5.bb
> cd ${D}${bindir}
> for i in qmake moc uic lrelease lupdate;do
> ln -s ${i}3 ${i} done
> 9 Remove depends for qt-x11-free_3.3.7
> 10 Add images/core-image-lsb-qt3.bb
> 11 Add tasks/task-core-qt3.bb
> 12 Add conf/layer.conf
> ---
> meta-qt3/classes/qt3e.bbclass | 11 +++
> meta-qt3/classes/qt3x11.bbclass | 15 +++
> meta-qt3/conf/layer.conf | 10 ++
> meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb | 10 ++
> meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc | 92 ++++++++++++++++++++
> .../recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb | 72 +++++++++++++++
> .../recipes-qt3/qt3/qt-x11-free/configure.patch | 51 +++++++++++
> .../recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch | 28 ++++++
> .../recipes-qt3/qt3/qt-x11-free/no-examples.patch | 16 ++++
> meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb | 13 +++
> meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 17 ++++
> meta-qt3/recipes-qt3/tasks/task-core-qt3.bb | 23 +++++
> 12 files changed, 358 insertions(+), 0 deletions(-)
> create mode 100644 meta-qt3/classes/qt3e.bbclass
> create mode 100644 meta-qt3/classes/qt3x11.bbclass
> create mode 100644 meta-qt3/conf/layer.conf
> create mode 100644 meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb
> create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
> create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
> create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
> create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
> create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
> create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
> create mode 100644 meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
> create mode 100644 meta-qt3/recipes-qt3/tasks/task-core-qt3.bb
>
> diff --git a/meta-qt3/classes/qt3e.bbclass b/meta-qt3/classes/qt3e.bbclass
> new file mode 100644
> index 0000000..d3d4a14
> --- /dev/null
> +++ b/meta-qt3/classes/qt3e.bbclass
> @@ -0,0 +1,11 @@
> +#
> +# override variables set by qmake_base to compile Qt/X11 apps
> +#
> +export QTDIR="${STAGING_DIR_HOST}/qte3"
> +export QTEDIR="${STAGING_DIR_HOST}/qte3"
> +export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
> +export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
> +export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
> +export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
> +export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
> +export OE_QMAKE_LIBS_QT="qte"
> diff --git a/meta-qt3/classes/qt3x11.bbclass b/meta-qt3/classes/qt3x11.bbclass
> new file mode 100644
> index 0000000..5408b7f
> --- /dev/null
> +++ b/meta-qt3/classes/qt3x11.bbclass
> @@ -0,0 +1,15 @@
> +DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
> +EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
> +#
> +# override variables set by qmake_base to compile Qt/X11 apps
> +#
> +export QTDIR = "${STAGING_DIR_HOST}/qt3"
> +export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
> +export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
> +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
> +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
> +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
> +export OE_QMAKE_LIBS_QT = "qt"
> +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
> +export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
> +export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
> diff --git a/meta-qt3/conf/layer.conf b/meta-qt3/conf/layer.conf
> new file mode 100644
> index 0000000..f4597db
> --- /dev/null
> +++ b/meta-qt3/conf/layer.conf
> @@ -0,0 +1,10 @@
> +# We have a conf and classes directory, add to BBPATH
> +BBPATH := "${BBPATH}:${LAYERDIR}"
> +
> +# We have a packages directory, add to BBFILES
> +BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb"
> +
> +BBFILE_COLLECTIONS += "qt3"
> +BBFILE_PATTERN_qt3 := "^${LAYERDIR}/"
> +BBFILE_PRIORITY_qt3 = "6"
> +
> diff --git a/meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb b/meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb
> new file mode 100644
> index 0000000..b7dc92e
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/images/core-image-lsb-qt3.bb
> @@ -0,0 +1,10 @@
> +IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
> +
> +IMAGE_INSTALL = "\
> + ${POKY_BASE_INSTALL} \
> + task-core-basic \
> + task-core-lsb \
> + task-core-qt-mt3 \
> + "
> +
> +inherit core-image
> diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc b/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
> new file mode 100644
> index 0000000..60fbd42
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free-common.inc
> @@ -0,0 +1,92 @@
> +DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
> +SECTION = "x11/libs"
> +PRIORITY = "optional"
> +LICENSE = "GPL QPL"
Is this an "And" (&) or an "or" (|) license choice? I think there is
another case like this also.
Sau!
> +HOMEPAGE = "http://www.trolltech.com"
> +PR = "r0"
> +
> +S = "${WORKDIR}/qt-x11-free-${PV}"
> +
> +
> +inherit qmake_base ${COREBASE}/meta-qt3/classes/qt3x11.bbclass
> +
> +export QTDIR = "${S}"
> +STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
> +ARCH_i686 = "x86"
> +EXTRA_OEMAKE = "-e"
> +
> +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
> + -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -verbose"
> +
> +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
> + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
> + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
> + AR="${TARGET_PREFIX}ar cqs" \
> + MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
> +
> +do_configure() {
> + echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \
> + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
> +
> + # force regenerate
> + rm -f src/qtmain.pro
> + cat Makefile>makefile
> + find . -name "Makefile"|xargs rm -f
> + (cd src&& qmake -spec ${QMAKESPEC} )
> + (cd plugins/src&& qmake -spec ${QMAKESPEC} )
> + (cd tools&& qmake -spec ${QMAKESPEC} )
> + (cd tools/qvfb&& qmake -spec ${QMAKESPEC} )
> +}
> +
> +do_compile() {
> + unset CFLAGS
> + unset CXXFLAGS
> +
> + install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc
> + install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic
> +
> + oe_runmake -C src ${EXTRA_ENV}
> + oe_runmake -C plugins/src ${EXTRA_ENV}
> + oe_runmake -C tools ${EXTRA_ENV}
> +}
> +
> +do_install_prepend() {
> + install -d ${STAGING_QT_DIR}/bin
> + ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
> + ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
> + ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
> + install -d ${STAGING_QT_DIR}/lib
> + oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
> + install -d ${STAGING_QT_DIR}/include/private
> + for f in include/*.h
> + do
> + install -m 0644 $f ${STAGING_QT_DIR}/include/
> + done
> + for f in include/private/*.h
> + do
> + install -m 0644 $f ${STAGING_QT_DIR}/include/private
> + done
> + for f in lib/*.prl
> + do
> + install -m 0644 $f ${STAGING_QT_DIR}/lib
> + done
> +}
> +
> +do_install() {
> + install -d ${D}${libdir}/
> + oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
> + install -d ${D}${bindir}/
> + install -d ${D}${prefix}/plugins/
> + cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
> +}
> +
> +PACKAGES =+ " libqt-mt3 qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
> + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
> +FILES_libqt-mt3 = "${D}/{libdir}/libqt-mt*"
> +FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so"
> +FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so"
> +FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so"
> +FILES_qt-x11-designer = "${bindir}/designer"
> +FILES_qt-x11-assistant = "${bindir}/assistant"
> +FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
> +FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug"
> diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
> new file mode 100644
> index 0000000..2c55a57
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free-native_3.3.5.bb
> @@ -0,0 +1,72 @@
> +DESCRIPTION = "Qt/X11 Version ${PV}"
> +SECTION = "libs"
> +PRIORITY = "optional"
> +LICENSE = "GPL QPL"
> +DEPENDS = "xmu-native"
> +HOMEPAGE = "http://www.trolltech.com"
> +PR = "r0"
> +
> +PROVIDES += "qt-x11-free-native"
> +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
> + file://LICENSE.QPL;md5=fff372435cb41647bc0b3cb940ea5c51"
> +
> +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
> + file://no-examples.patch"
> +S = "${WORKDIR}/qt-x11-free-${PV}"
> +
> +#
> +# FIXME - This should be updated to use OE's qmake_base.oeclass
> +# or the full qmake.oeclass.
> +#
> +
> +PROVIDES = "qt-x11-free-native"
> +export QTDIR = "${S}"
> +export SYSCONF_CXX = "${CCACHE} g++"
> +export SYSCONF_CC = "${CCACHE} gcc"
> +export SYSCONF_LINK = "${CCACHE} g++"
> +THIS_QMAKESPEC = "${STAGING_DATADIR}/qmake/${TARGET_OS}-oe-g++"
> +export QMAKESPEC = ""
> +ARCH_i686 = "x86"
> +
> +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -qt-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
> + -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-freetype -no-nis -no-cups -stl -thread -no-exceptions"
> +
> +
> +inherit native
> +
> +do_configure() {
> + echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast -L ${STAGING_LIBDIR} \
> + -I ${STAGING_INCDIR_NATIVE}
> +}
> +
> +do_compile() {
> + LD_LIBRARY_PATH=${S}/lib oe_runmake \
> + QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-L${STAGING_LIBDIR}" \
> + QMAKESPEC="${THIS_QMAKESPEC}"
> +}
> +
> +
> +do_install() {
> + install -d ${D}${bindir}/
> + install -m 0755 bin/qmake ${D}${bindir}/qmake3
> + for i in moc uic lrelease lupdate; do
> + install -m 0755 bin/${i} ${D}${bindir}/${i}3
> + done
> +
> + install -d ${D}${datadir}/qt3/
> + cp -PfR mkspecs ${D}${datadir}/qt3/
> + ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${BUILD_OS}-oe-g++
> + ln -s ${D}${datadir}/qt3/mkspecs/ ${D}${datadir}/qmake
> + install -d ${D}${libdir}/
> + oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
> + cd ${D}${bindir}
> + for i in qmake moc uic lrelease lupdate;do
> + ln -s ${i}3 ${i}
> + done
> +}
> +
> +
> +SRC_URI[md5sum] = "05d04688c0c0230ed54e89102d689ca4"
> +SRC_URI[sha256sum] = "aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96"
> diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
> new file mode 100644
> index 0000000..9d6c1e8
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/configure.patch
> @@ -0,0 +1,51 @@
> +
> +#
> +# Patch managed by http://www.holgerschurig.de/patcher.html
> +#
> +
> +--- qt-x11-free-3.3.2/configure~configure.patch
> ++++ qt-x11-free-3.3.2/configure
> +@@ -1754,21 +1754,14 @@
> + CFG_FREETYPE=yes
> + fi
> + fi
> +- # add freetype2 include path
> +- if [ "$CFG_FREETYPE" = "yes" ]&& [ -f $outpath/config.tests/x11/xft.inc ];then
> +- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\""
> +- fi
> +- rm -f $outpath/config.tests/x11/xft.inc
> + # add Xft specific libraries
> + if [ "$CFG_FREETYPE" = "yes" ]&& [ -f $outpath/config.tests/x11/xft.lib ]; then
> + QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
> + fi
> +- rm -f $outpath/config.tests/x11/xft.lib
> + # add Xft specific config options
> + if [ "$CFG_FREETYPE" = "yes" ]&& [ -f $outpath/config.tests/x11/xft.cfg ]; then
> + QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
> + fi
> +- rm -f $outpath/config.tests/x11/xft.cfg
> + # auto-detect Session Management support
> + if [ "$CFG_SM" = "auto" ]; then
> + if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
> +@@ -2553,12 +2546,6 @@
> + (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting."&& exit 2)) || exit 2
> + fi
> +
> +-# clean up temporary qconfig.h and qmodules.h
> +-rm -f $outpath/include/qmake/qconfig.h
> +-rm -f $outpath/include/qmake/qmodules.h
> +-rmdir $outpath/include/qmake
> +-
> +-
> + #-------------------------------------------------------------------------------
> + # tests that need qmake
> + #-------------------------------------------------------------------------------
> +@@ -3605,7 +3592,7 @@
> +
> + EOF
> + else
> +- EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a"
> ++ EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a $OE_EXTRA_QMAKE"
> + if [ "$OPT_VERBOSE" = "yes" ]; then
> + echo " (`basename $SPEC`)"
> + if echo '\c' | grep '\c'>/dev/null; then
> diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
> new file mode 100644
> index 0000000..818bced
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
> @@ -0,0 +1,28 @@
> +
> +#
> +# Patch managed by http://www.holgerschurig.de/patcher.html
> +#
> +
> +--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch
> ++++ qt-x11-free-3.3.6/src/tools/qstring.h
> +@@ -60,7 +60,7 @@
> + #endif
> + #endif
> +
> +-
> ++#define Q_NO_PACKED_REFERENCE
> + /*****************************************************************************
> + QString class
> + *****************************************************************************/
> +@@ -194,9 +194,9 @@
> + char latin1() const { return ucs> 0xff ? 0 : (char) ucs; }
> + ushort unicode() const { return ucs; }
> + #ifdef Q_NO_PACKED_REFERENCE
> +- ushort&unicode() { return *(&ucs); }
> ++ ushort&unicode() { return *((ushort*)&ucs); }
> + #else
> +- ushort&unicode() { return ucs; }
> ++ ushort&unicode() { return (ushort)ucs; }
> + #endif
> + #ifndef QT_NO_CAST_ASCII
> + // like all ifdef'd code this is undocumented
> diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
> new file mode 100644
> index 0000000..b0ee637
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/no-examples.patch
> @@ -0,0 +1,16 @@
> +
> +#
> +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
> +#
> +
> +--- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200
> ++++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200
> +@@ -11,7 +11,7 @@
> + install: FORCE
> + @$(MAKE) qt.install
> +
> +-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
> ++all: symlinks src-qmake src-moc sub-src sub-tools
> + @echo
> + @echo "The Qt library is now built in ./lib"
> + @echo "The Qt examples are built in the directories in ./examples"
> diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
> new file mode 100644
> index 0000000..789e6fb
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.6.bb
> @@ -0,0 +1,13 @@
> +DEPENDS = "uicmoc3-native freetype virtual/libx11 libxft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
> +PROVIDES = "qt3x11"
> +PR = "r3"
> +
> +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
> + file://configure.patch \
> + file://no-examples.patch \
> + file://gcc4_1-HACK.patch"
> +
> +require qt-x11-free-common.inc
> +
> +SRC_URI[md5sum] = "dc1384c03ac08af21f6fefab32d982cf"
> +SRC_URI[sha256sum] = "04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae"
> diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
> new file mode 100644
> index 0000000..9a3bcf9
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
> @@ -0,0 +1,17 @@
> +DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl"
> +PROVIDES = "qt3x11"
> +PR = "r0"
> +
> +PREFERRED_VERSION_qt-x11-free = 3.3.7
> +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
> + file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b"
> +
> +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
> + file://configure.patch \
> + file://no-examples.patch \
> + file://gcc4_1-HACK.patch"
> +
> +require qt-x11-free-common.inc
> +
> +SRC_URI[md5sum] = "655e21cf6a7e66daf8ec6ceda81aae1e"
> +SRC_URI[sha256sum] = "48c05b501029f0640db665fbc7f981a0efbf69ad3cf87a43c5eea4872f4f7ba1"
> diff --git a/meta-qt3/recipes-qt3/tasks/task-core-qt3.bb b/meta-qt3/recipes-qt3/tasks/task-core-qt3.bb
> new file mode 100644
> index 0000000..81479d9
> --- /dev/null
> +++ b/meta-qt3/recipes-qt3/tasks/task-core-qt3.bb
> @@ -0,0 +1,23 @@
> +#
> +# Copyright (C) 2011 Wind River
> +#
> +
> +DESCRIPTION = "Create qt3 Tasks"
> +PR = "r0"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
> + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +PACKAGES = "\
> + task-core-qt-mt3 \
> +"
> +
> +
> +ALLOW_EMPTY = "1"
> +
> +
> +RDEPENDS_task-core-qt-mt3 = "\
> + qt-x11-free \
> + libqt-mt3 \
> +"
> +
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-04-29 5:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-29 1:26 [PATCH 0/1] meta-qt3: Add qt3 to OE-CORE to fix [#816] Xiaofeng Yan
2011-04-29 1:26 ` [PATCH 1/1] qt3: Add qt3 to poky for fixing [YOCTO #816] Xiaofeng Yan
2011-04-29 5:26 ` Saul Wold
-- strict thread matches above, loose matches on Subject: below --
2011-04-22 9:31 Xiaofeng Yan
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.