From 1ed7f27e533ce6eb7a85a970e829129b3c7beadb Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 5 Jan 2005 15:40:13 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/05 16:22:47+01:00 (none)!koen move bl into ipaq-common.conf 2005/01/05 16:13:47+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/05 16:13:10+01:00 (none)!koen added bl to h3(6,9)00.conf BOOTSTRAP_(R)DEPENDS 2005/01/05 16:09:44+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/05 16:08:32+01:00 uni-frankfurt.de!mickeyl add Qt/Embedded 4.0 Beta1 (w/ 9 patches) *phew* BKrev: 41dc0a5du2K53dOv-bjQLdShr5g0Zw --- conf/machine/ipaq-common.conf | 4 +-- packages/qt/qt-x11-free_4.0.0-b1.bb | 0 packages/qte/qte-4.0.0-b1/add-qatomic.patch | 0 .../qte/qte-4.0.0-b1/add-tslib-mousedriver.patch | 0 packages/qte/qte-4.0.0-b1/add-tslib-option.patch | 0 packages/qte/qte-4.0.0-b1/fix-mkspecs.patch | 0 packages/qte/qte-4.0.0-b1/fix-qwidget.patch | 0 packages/qte/qte-4.0.0-b1/fix-qwsmanager.patch | 0 packages/qte/qte-4.0.0-b1/fix-sl5000driver.patch | 0 packages/qte/qte-4.0.0-b1/fix-vncdriver.patch | 0 packages/qte/qte-4.0.0-b1/gcc34.patch | 0 .../mousedrivers/tslib/tslibmousedriverplugin.cpp | 0 .../mousedrivers/tslib/tslibmousedriverplugin.h | 0 .../mousedrivers/tslib/tslibmousehandler.cpp | 0 .../mousedrivers/tslib/tslibmousehandler.h | 0 .../mousedrivers/tslib/tslibmousehandler.pro | 0 .../qte/qte-4.0.0-b1/no-moc-no-uic-no-rcc.patch | 0 packages/qte/qte-4.0.0-b1/sharp_char.h | 0 packages/qte/qte-4.0.0-b1/switches.h | 0 packages/qte/qte-4.0.0-b1/update-qtfontdir | 0 packages/qte/qte_4.0.0-b1.bb | 0 packages/uicmoc/uicmoc4-native_4.0.0-b1.bb | 39 ++++++++++++++++++++++ 22 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 packages/qt/qt-x11-free_4.0.0-b1.bb create mode 100644 packages/qte/qte-4.0.0-b1/add-qatomic.patch create mode 100644 packages/qte/qte-4.0.0-b1/add-tslib-mousedriver.patch create mode 100644 packages/qte/qte-4.0.0-b1/add-tslib-option.patch create mode 100644 packages/qte/qte-4.0.0-b1/fix-mkspecs.patch create mode 100644 packages/qte/qte-4.0.0-b1/fix-qwidget.patch create mode 100644 packages/qte/qte-4.0.0-b1/fix-qwsmanager.patch create mode 100644 packages/qte/qte-4.0.0-b1/fix-sl5000driver.patch create mode 100644 packages/qte/qte-4.0.0-b1/fix-vncdriver.patch create mode 100644 packages/qte/qte-4.0.0-b1/gcc34.patch create mode 100644 packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.cpp create mode 100644 packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.h create mode 100644 packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.cpp create mode 100644 packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.h create mode 100644 packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.pro create mode 100644 packages/qte/qte-4.0.0-b1/no-moc-no-uic-no-rcc.patch create mode 100644 packages/qte/qte-4.0.0-b1/sharp_char.h create mode 100644 packages/qte/qte-4.0.0-b1/switches.h create mode 100644 packages/qte/qte-4.0.0-b1/update-qtfontdir create mode 100644 packages/qte/qte_4.0.0-b1.bb diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf index fd2bdbb083..7758231431 100644 --- a/conf/machine/ipaq-common.conf +++ b/conf/machine/ipaq-common.conf @@ -1,4 +1,4 @@ IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth" -BOOTSTRAP_EXTRA_DEPENDS += "kbdd hostap-modules orinoco-modules mipv6" -BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd hostap-modules-cs orinoco-modules mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}" +BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6" +BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}" diff --git a/packages/qt/qt-x11-free_4.0.0-b1.bb b/packages/qt/qt-x11-free_4.0.0-b1.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/add-qatomic.patch b/packages/qte/qte-4.0.0-b1/add-qatomic.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/add-tslib-mousedriver.patch b/packages/qte/qte-4.0.0-b1/add-tslib-mousedriver.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/add-tslib-option.patch b/packages/qte/qte-4.0.0-b1/add-tslib-option.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/fix-mkspecs.patch b/packages/qte/qte-4.0.0-b1/fix-mkspecs.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/fix-qwidget.patch b/packages/qte/qte-4.0.0-b1/fix-qwidget.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/fix-qwsmanager.patch b/packages/qte/qte-4.0.0-b1/fix-qwsmanager.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/fix-sl5000driver.patch b/packages/qte/qte-4.0.0-b1/fix-sl5000driver.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/fix-vncdriver.patch b/packages/qte/qte-4.0.0-b1/fix-vncdriver.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/gcc34.patch b/packages/qte/qte-4.0.0-b1/gcc34.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.cpp b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.h b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.cpp b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.h b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.pro b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/no-moc-no-uic-no-rcc.patch b/packages/qte/qte-4.0.0-b1/no-moc-no-uic-no-rcc.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/sharp_char.h b/packages/qte/qte-4.0.0-b1/sharp_char.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/switches.h b/packages/qte/qte-4.0.0-b1/switches.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-4.0.0-b1/update-qtfontdir b/packages/qte/qte-4.0.0-b1/update-qtfontdir new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte_4.0.0-b1.bb b/packages/qte/qte_4.0.0-b1.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb index e69de29bb2..62729e29e3 100644 --- a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb +++ b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +PR = "r1" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-opensource-${PV}.tar.bz2 \ + file://gcc34.patch;patch=1 \ + file://fix-qwsmanager.patch;patch=1 \ + file://fix-qwidget.patch;patch=1 " +S = "${WORKDIR}/qt-embedded-opensource-${PV}" + +inherit native + +EXTRA_OECONF = "-qt-libjpeg -qt-libpng -qt-gif -system-zlib \ + -no-qvfb -no-nis -no-cups -no-pch \ + -no-accessibility -verbose -no-compat -fast" +EXTRA_OEMAKE = " " + +do_configure() { + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +do_compile() { + unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS + cd ${S}/src/moc && make CC="${CC}" CXX="${CXX}" + cd ${S}/src/core && make CC="${CC}" CXX="${CXX}" + cd ${S}/src/xml && make CC="${CC}" CXX="${CXX}" + cd ${S}/src/tools/uic && make CC="${CC}" CXX="${CXX}" + cd ${S}/src/tools/rcc && make CC="${CC}" CXX="${CXX}" +} + +do_stage() { + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 + install -m 0655 lib/libQtXml.so.4 ${STAGING_LIBDIR} + install -m 0655 lib/libQtCore.so.4 ${STAGING_LIBDIR} +} -- cgit 1.2.3-korg