Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/13 11:15:39+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/13 11:15:25+02:00 utwente.nl!koen
h3600.conf:  guard jffs image args with a _jffs2

2005/06/13 10:46:19+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/06/13 10:43:27+02:00 uni-frankfurt.de!mickeyl
qte-2.3.10: add c7x0 w100 accelleration bits

2005/06/12 23:38:18+02:00 uni-frankfurt.de!mickeyl
ship aticore-oss-examples in a dedicated package

BKrev: 42ad547bgnVCMjEabf3_D8fpXayQng

diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index c6f801c..9ba744b 100644 (file)
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ipaqsa h3600"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
-EXTRA_IMAGECMD_h3600 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
 BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa ipaq-boot-params"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}')}"
 

diff --git a/packages/qte/qte-2.3.10/c7x0-w100-accel.patch b/packages/qte/qte-2.3.10/c7x0-w100-accel.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index b756003..f8b630c 100644 (file)
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -5,8 +5,9 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \
           file://qpe.patch;patch=1 \
@@ -31,7 +32,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
            file://bidimetrics.patch;patch=5 "
 
 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 "
+SRC_URI_append_c7x0            = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://c7x0-w100-accel.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_tosa            = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
@@ -65,6 +66,7 @@ def qte_arch(d):
 QTE_ARCH := "${@qte_arch(d)}"
 
 EXTRA_OECONF_CONFIG = "-qconfig qpe"
+EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100"
 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"

diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index f96b291..113e97d 100644 (file)
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -1,15 +1,13 @@
 DESCRIPTION = "Driver for the Ati W100 found on the Sharp Zaurus C[87]x0"
-SECTION = "base"
+SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "CLOSED"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://mirror1.pdaxrom.org/source/src/AtiCore-1.0.1.tar.bz2 \
                file://aticore-2.6.patch;patch=1"
 S = "${WORKDIR}/AtiCore-1.0.1"
 
-#FILES_${PN}="${libdir}/*.so* ${bindir}/*"
-         
 EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}' FPU='${TARGET_FPU}'"
 
 do_install() {
@@ -33,4 +31,8 @@ do_install() {
 do_stage() {
        install -m 0644 aticore.h ${STAGING_INCDIR}
        oe_libinstall -so libaticore ${STAGING_LIBDIR}
-}
\ No newline at end of file
+}
+
+PACKAGES =+ "sharp-aticore-oss-examples"
+FILES_sharp-aticore-oss-examples = "${bindir}"
+