From bcd2df33a3464606634cf14a2a6023eb801b6d3e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 22 Apr 2006 21:06:30 +0000 Subject: qte: use .inc file to produce three incarnations of every version --- .../qte/qte-2.3.12/fix-errno-exception-spec.patch | 16 ++ packages/qte/qte-2.3.12/fix-native-build.patch | 11 -- packages/qte/qte-2.3.12/gcc4.patch | 16 ++ packages/qte/qte-common_2.3.10.inc | 2 +- packages/qte/qte-common_2.3.12.inc | 162 +++++++++++++++++++++ packages/qte/qte-mt-static_2.3.12.bb | 23 +++ packages/qte/qte-mt_2.3.10.bb | 4 +- packages/qte/qte-mt_2.3.12.bb | 9 ++ packages/qte/qte_2.3.10.bb | 1 + packages/qte/qte_2.3.12.bb | 159 -------------------- 10 files changed, 229 insertions(+), 174 deletions(-) create mode 100644 packages/qte/qte-2.3.12/fix-errno-exception-spec.patch delete mode 100644 packages/qte/qte-2.3.12/fix-native-build.patch create mode 100644 packages/qte/qte-2.3.12/gcc4.patch create mode 100644 packages/qte/qte-common_2.3.12.inc create mode 100644 packages/qte/qte-mt-static_2.3.12.bb create mode 100644 packages/qte/qte-mt_2.3.12.bb delete mode 100644 packages/qte/qte_2.3.12.bb (limited to 'packages') diff --git a/packages/qte/qte-2.3.12/fix-errno-exception-spec.patch b/packages/qte/qte-2.3.12/fix-errno-exception-spec.patch new file mode 100644 index 0000000000..19a5c134c8 --- /dev/null +++ b/packages/qte/qte-2.3.12/fix-errno-exception-spec.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.10/src/kernel/qsoundqss_qws.cpp~fix-errno-exception-spec.patch ++++ qt-2.3.10/src/kernel/qsoundqss_qws.cpp +@@ -51,8 +51,6 @@ + #include + #include + +-extern int errno; +- + #define QT_QWS_SOUND_16BIT 1 // or 0, or undefined for always 0 + #define QT_QWS_SOUND_STEREO 1 // or 0, or undefined for always 0 + diff --git a/packages/qte/qte-2.3.12/fix-native-build.patch b/packages/qte/qte-2.3.12/fix-native-build.patch deleted file mode 100644 index 7670d44f27..0000000000 --- a/packages/qte/qte-2.3.12/fix-native-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig 2005-09-19 17:50:39.000000000 +0200 -+++ qt-2.3.10/src/kernel/qwindowsystem_qws.h 2005-09-19 17:50:45.000000000 +0200 -@@ -53,6 +53,8 @@ - class QWSRegionManager; - class QGfx; - class QWSServerData; -+class QWSInputMethod; -+class QWSGestureMethod; - - class QWSInternalWindowInfo - { diff --git a/packages/qte/qte-2.3.12/gcc4.patch b/packages/qte/qte-2.3.12/gcc4.patch new file mode 100644 index 0000000000..550effd7ba --- /dev/null +++ b/packages/qte/qte-2.3.12/gcc4.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- qt-2.3.10/src/tools/qvaluestack.h~gcc4 2005-01-23 15:00:47.000000000 +0100 ++++ qt-2.3.10/src/tools/qvaluestack.h 2006-03-19 02:32:56.000000000 +0100 +@@ -54,7 +54,7 @@ + { + T elem( this->last() ); + if ( !this->isEmpty() ) +- remove( this->fromLast() ); ++ this->remove( this->fromLast() ); + return elem; + } + T& top() { return this->last(); } diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index dafccc0823..822ee2402f 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" -PROVIDES = "virtual/qte virtual/libqte2" +PROVIDES = "virtual/libqte2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}" diff --git a/packages/qte/qte-common_2.3.12.inc b/packages/qte/qte-common_2.3.12.inc new file mode 100644 index 0000000000..c4d584ac48 --- /dev/null +++ b/packages/qte/qte-common_2.3.12.inc @@ -0,0 +1,162 @@ +DESCRIPTION = "Qt/Embedded Version ${PV}" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL" +DEPENDS = "zlib libpng jpeg tslib uicmoc-native" +DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" +DEPENDS_append_c7x0 = " sharp-aticore-oss" +PROVIDES = "virtual/libqte2" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}" + +SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz \ + file://qpe.patch;patch=1 \ + file://vt-switch.patch;patch=1 \ + file://daemonize.patch;patch=1 \ + file://no-moc.patch;patch=1 \ + file://gcc3.patch;patch=1 \ + file://gcc4.patch;patch=1 \ + file://c700-hardware.patch;patch=1 \ + file://encoding.patch;patch=1 \ + file://fix-qgfxraster.patch;patch=1 \ + file://qt-visibility.patch;patch=1 \ + file://simpad.patch;patch=1 \ + file://handhelds.patch;patch=1 \ + file://qiconview-speed.patch;patch=1 \ + file://qtabbar.patch;patch=1 \ + file://qte-fix-iconsize.patch;patch=1 \ + file://fix-linuxfb-setmode.patch;patch=1 \ + file://fix-linuxfb-offscreenoverflow.patch;patch=1 \ + file://fix-qscreen-sync.patch;patch=1 \ + file://improve-calibration-r0.patch;patch=1 \ + file://key.patch;patch=1 \ + file://bidimetrics.patch;patch=5 \ + file://simpad-defaultkbd.patch;patch=1 \ + file://fix-errno-exception-spec.patch;patch=1 \ + file://sharp_char.h \ + file://switches.h " + +SRC_URI_append_simpad = "file://devfs.patch;patch=1 " +SRC_URI_append_c7x0 = "file://kernel-keymap-corgi.patch;patch=1 \ + file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " +SRC_URI_append_spitz = "file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_akita = "file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ + file://mnci.patch;patch=1 \ + file://mnci-touchscreen.patch;patch=1 \ + file://qkeyboard_qws.h \ + file://qkeyboard_qws.cpp " +SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " + +S = "${WORKDIR}/qt-2.3.10-snapshot-20060120" +export QTDIR = "${S}" + +def qte_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "x86" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + +QTE_ARCH := "${@qte_arch(d)}" + +EXTRA_OECONF_CONFIG = "-qconfig qpe" +EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100" +EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb" +EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ + -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" +EXTRA_OEMAKE = "-e" + +# +# FIXME: Add more here +# +EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" +EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" +EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" +EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" +EXTRA_DEFINES_h3600 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_a716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" +EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" +EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" +EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" +EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" + +export SYSCONF_CC = "${CC}" +export SYSCONF_CXX = "${CXX}" +export SYSCONF_LINK = "${CCLD}" +export SYSCONF_SHLIB = "${CCLD}" +export SYSCONF_CFLAGS = "${CFLAGS}" +export SYSCONF_LINK_SHLIB = "${CCLD}" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +export SYSCONF_LFLAGS = "${LDFLAGS} -lts" +export SYSCONF_LFLAGS_mnci = "${LDFLAGS}" +export SYSCONF_MOC = "${STAGING_BINDIR}/moc" +export SYSCONF_UIC = "${STAGING_BINDIR}/uic" + +do_configure_prepend_mnci() { + chmod -R a+w ${S}/src/kernel + cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel + cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel + mkdir bin + ln -sf ${STAGING_BINDIR}/moc bin/moc + ln -sf ${STAGING_BINDIR}/uic bin/uic +} + +# generate uclibc and eabi configurations +do_configure() { + for f in ${S}/configs/linux-*-g++-shared; do + sed -e 's,-linux-,-linux-uclibc-,g' < $f \ + > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'` + sed -e 's,-linux-,-linux-gnueabi-,g' < $f \ + > `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'` + done + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +do_compile() { + unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS + install -d include/asm/ + install -m 0644 ${WORKDIR}/sharp_char.h include/asm/ + install -d include/linux/ + install -m 0644 ${WORKDIR}/switches.h include/linux/ + + # Create symlinks first and then compile the library + oe_runmake symlinks + oe_runmake src-mt sub-src +} + +do_stage() { + rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib + oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -f include/qxt.h + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ + install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR}/${HOST_SYS}/qt2/include/ +} + +do_install() { + oe_libinstall -so -C lib lib${PN} ${D}${palmqtdir}/lib/ +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb new file mode 100644 index 0000000000..ab0844135c --- /dev/null +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -0,0 +1,23 @@ +require qte-common_${PV}.inc +PR = "r0" + +EXTRA_OECONF += "-thread -static" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" + +do_stage() { + rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib + oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -f include/qxt.h + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ +} + +do_install() { + : +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index eeed231496..6ca6566458 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,9 +1,7 @@ require qte-common_${PV}.inc - PR = "r0" -EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif -thread -static \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" +EXTRA_OECONF += "-thread" export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" diff --git a/packages/qte/qte-mt_2.3.12.bb b/packages/qte/qte-mt_2.3.12.bb new file mode 100644 index 0000000000..6ca6566458 --- /dev/null +++ b/packages/qte/qte-mt_2.3.12.bb @@ -0,0 +1,9 @@ +require qte-common_${PV}.inc +PR = "r0" + +EXTRA_OECONF += "-thread" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 345a585254..25741931e6 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,2 +1,3 @@ require qte-common_${PV}.inc PR = "r40" + diff --git a/packages/qte/qte_2.3.12.bb b/packages/qte/qte_2.3.12.bb deleted file mode 100644 index 19940fa343..0000000000 --- a/packages/qte/qte_2.3.12.bb +++ /dev/null @@ -1,159 +0,0 @@ -DESCRIPTION = "Qt/Embedded Version ${PV}" -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -DEPENDS = "zlib libpng jpeg tslib uicmoc-native" -DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" -DEPENDS_append_c7x0 = " sharp-aticore-oss" -PROVIDES = "virtual/qte virtual/libqte2" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://sunsite.rediris.es/mirror/Qt/snapshots/qt-embedded-2.3.10-snapshot-20060120.tar.gz \ - file://qpe.patch;patch=1 \ - file://vt-switch.patch;patch=1 \ - file://daemonize.patch;patch=1 \ - file://no-moc.patch;patch=1 \ - file://gcc3.patch;patch=1 \ - file://c700-hardware.patch;patch=1 \ - file://encoding.patch;patch=1 \ - file://fix-qgfxraster.patch;patch=1 \ - file://qt-visibility.patch;patch=1 \ - file://simpad.patch;patch=1 \ - file://handhelds.patch;patch=1 \ - file://qiconview-speed.patch;patch=1 \ - file://qtabbar.patch;patch=1 \ - file://qte-fix-iconsize.patch;patch=1 \ - file://fix-linuxfb-setmode.patch;patch=1 \ - file://fix-linuxfb-offscreenoverflow.patch;patch=1 \ - file://fix-qscreen-sync.patch;patch=1 \ - file://improve-calibration-r0.patch;patch=1 \ - file://key.patch;patch=1 \ - file://bidimetrics.patch;patch=5 \ - file://simpad-defaultkbd.patch;patch=1 \ - file://sharp_char.h \ - file://switches.h " - -SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ - file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_borzoi = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ - file://mnci.patch;patch=1 \ - file://mnci-touchscreen.patch;patch=1 \ - file://qkeyboard_qws.h \ - file://qkeyboard_qws.cpp " -SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " - - -S = "${WORKDIR}/qt-2.3.10-snapshot-20060120" - -export QTDIR = "${S}" - -def qte_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch - -QTE_ARCH := "${@qte_arch(d)}" - -EXTRA_OECONF_CONFIG = "-qconfig qpe" -EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100" -EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb" -EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" -EXTRA_OEMAKE = "-e" - -# -# FIXME: Add more here -# -EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" -EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" -EXTRA_DEFINES_h3600 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_a716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" -EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_borzoi = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" - -export SYSCONF_CC = "${CC}" -export SYSCONF_CXX = "${CXX}" -export SYSCONF_LINK = "${CCLD}" -export SYSCONF_SHLIB = "${CCLD}" -export SYSCONF_CFLAGS = "${CFLAGS}" -export SYSCONF_LINK_SHLIB = "${CCLD}" -export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" -#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" -export SYSCONF_LFLAGS = "${LDFLAGS} -lts" -export SYSCONF_LFLAGS_mnci = "${LDFLAGS}" -export SYSCONF_MOC = "${STAGING_BINDIR}/moc" -export SYSCONF_UIC = "${STAGING_BINDIR}/uic" - -do_configure_prepend_mnci() { - chmod -R a+w ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel - mkdir bin - ln -sf ${STAGING_BINDIR}/moc bin/moc - ln -sf ${STAGING_BINDIR}/uic bin/uic -} - -do_configure() { - for f in ${S}/configs/linux-*-g++-shared; do - sed -e 's,-linux-,-linux-uclibc-,g' < $f \ - > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'` - done - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS - install -d include/asm/ - install -m 0644 ${WORKDIR}/sharp_char.h include/asm/ - install -d include/linux/ - install -m 0644 ${WORKDIR}/switches.h include/linux/ - - # Create symlinks first and then compile the library - oe_runmake symlinks - oe_runmake src-mt sub-src -} - -do_stage() { - rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib - oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib - rm -f include/qxt.h - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ -} - -do_install() { - oe_libinstall -so -C lib libqte ${D}${palmqtdir}/lib/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "${palmqtdir}" -- cgit v1.2.3