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

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

2005/02/20 13:17:29+00:00 rpsys.net!RP
openzaurus-2.6: Add Dirk Opfer's latest work on tosa

2005/02/20 14:06:58+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/20 14:06:39+01:00 uni-frankfurt.de!mickeyl
remove opie-inline-pics packages, 'tis was a dumb idea

2005/02/20 02:07:49+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/oe/packages

2005/02/20 02:07:09+01:00 vanille.de!mickeyl
opie-console: package keys

2005/02/19 18:44:13+01:00 vanille.de!mickeyl
latest libqpe from Opie cvs contains support for building it without inline images
we build it like that to support different "inline" image packages for different models

2005/02/19 18:05:37+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/local/pkg/oe/packages

2005/02/19 18:05:12+01:00 vanille.de!mickeyl
install qte fonts through staging

BKrev: 4218933a_t5CahsnwckaZTFUzmfryg

6 files changed, 141 insertions, 53 deletions

diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 9df42b4335..a02bdcfb7c 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "uicmoc-native qte"
 PROVIDES = "virtual/libqpe"
 PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
 	file://nomax.patch;patch=1;pnum=1"
@@ -16,7 +16,7 @@ inherit qmake
 
 QMAKE_PROFILES = "library.pro"
 EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
-EXTRA_QMAKEVARS_POST = "DESTDIR="
+EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
 
 CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"
 CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
diff --git a/packages/linux/linux-openzaurus_2.6.11-rc4.bb b/packages/linux/linux-openzaurus_2.6.11-rc4.bb
index 5224a0ded5..874a5ddfcc 100644
--- a/packages/linux/linux-openzaurus_2.6.11-rc4.bb
+++ b/packages/linux/linux-openzaurus_2.6.11-rc4.bb
@@ -5,58 +5,71 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r1"
+PR = "r2"
+
+DOSRC="http://www.do13.in-berlin.de/openzaurus"
+RPSRC="http://www.rpsys.net/openzaurus/patches"
+JLSRC="http://www.cs.wisc.edu/~lenz/zaurus/files/"
 
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk7.gz;patch=1 \
 
 # These have been left in the hope JL will split his patch series...
-#http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_base.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-cpu.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_kbd.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_pm.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_devices.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_lcd.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_uart.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_batswitch.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_pcmcia.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/sharp_mtd.patch;patch=1 \
-#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.patch;patch=1 \
+#${RPSRC}/jl1/poodle_base.patch;patch=1 \
+#${RPSRC}/jl1/poodle_fb.patch;patch=1 \
+#${RPSRC}/jl1/pxa-cpu.patch;patch=1 \
+#${RPSRC}/jl1/locomo_kbd.patch;patch=1 \
+#${RPSRC}/jl1/locomo_pm.patch;patch=1 \
+#${RPSRC}/jl1/locomo_devices.patch;patch=1 \
+#${RPSRC}/jl1/locomo_lcd.patch;patch=1 \
+#${RPSRC}/jl1/collie_uart.patch;patch=1 \
+#${RPSRC}/jl1/collie_batswitch.patch;patch=1 \
+#${RPSRC}/jl1/collie_pcmcia.patch;patch=1 \
+#${RPSRC}/jl1/sharp_mtd.patch;patch=1 \
+#${RPSRC}/jl1/collie_use_sharp_mtd.patch;patch=1 \
 
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.10.tar.gz \
-	   ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc4.bz2;patch=2 \
+           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc4.bz2;patch=2 \
            file://add-oz-release-string.patch;patch=1 \
            file://add-elpp-stuff.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-linking-bug.patch;patch=1 \	   
-http://www.cs.wisc.edu/~lenz/zaurus/files/patch-2.6.11-rc2-jl1.diff.gz;patch=1 \
-http://www.cs.wisc.edu/~lenz/zaurus/files/poodle_fix_mtd_sharpsl_part.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/rndis_fix-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/w100_malloc-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r16.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r10.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/input_power-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras1-r2.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_power-r15.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/ide_fixes-r1.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/mmc_sd-r3.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_snd-r3.patch;patch=1 \
-http://www.do13.in-berlin.de/openzaurus/tosa-machine-base.patch;patch=1 \
-http://www.do13.in-berlin.de/openzaurus/tc6393_nand.patch;patch=1 \
-http://www.do13.in-berlin.de/openzaurus/tc6393-device.patch;patch=1 \
-file://defconfig-c7x0 \
-file://defconfig-collie \
-file://defconfig-poodle \
-file://defconfig-tosa "
-
-SRC_URI_append_tosa = " http://www.do13.in-berlin.de/openzaurus/nand-readid.patch;patch=1 \
-                       http://www.do13.in-berlin.de/openzaurus/multiple-scoop-devices.patch;patch=1"
-SRC_URI_append_c7x0 = " http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1"
-SRC_URI_append_collie = " http://www.rpsys.net/openzaurus/${KV}/jl1/collie_keymap.patch;patch=1 "
-
+           ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \	   
+           ${JLSRC}/patch-2.6.11-rc2-jl1.diff.gz;patch=1 \
+           ${JLSRC}/poodle_fix_mtd_sharpsl_part.patch;patch=1 \
+           ${RPSRC}/rndis_fix-r0.patch;patch=1 \
+           ${RPSRC}/w100_malloc-r1.patch;patch=1 \
+           ${RPSRC}/corgi_kbd-r16.patch;patch=1 \
+           ${RPSRC}/corgi_ts-r10.patch;patch=1 \
+           ${RPSRC}/input_power-r1.patch;patch=1 \
+           ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
+           ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
+           ${RPSRC}/corgi_power-r15.patch;patch=1 \
+           ${RPSRC}/ide_fixes-r1.patch;patch=1 \
+           ${RPSRC}/mmc_sd-r3.patch;patch=1 \
+           ${RPSRC}/corgi_snd-r3.patch;patch=1 \
+           ${DOSRC}/tc6393-device-r1.patch;patch=1 \
+           ${DOSRC}/tc6393_nand-r1.patch;patch=1 \
+           ${DOSRC}/tosa-machine-base-r1.patch;patch=1 \
+           ${DOSRC}/tosa-keyboard-r1.patch;patch=1 \
+           ${DOSRC}/tc6393fb-r0.patch;patch=1 \
+           ${DOSRC}/tosa-power-r0.patch;patch=1 \
+           file://defconfig-c7x0 \
+           file://defconfig-collie \
+           file://defconfig-poodle \
+           file://defconfig-tosa "
+
+SRC_URI_append_collie = " ${RPSRC}/jl1/collie_keymap.patch;patch=1 "
+SRC_URI_append_c7x0 = " ${RPSRC}/corgi_power1-r0.patch;patch=1"
+SRC_URI_append_tosa = " ${RPSRC}/corgi_power1-r0.patch;patch=1 \
+                        ${DOSRC}/nand-readid-r0.patch;patch=1 \
+                        ${DOSRC}/multiple-scoop-devices-r1.patch;patch=1 \
+                        ${DOSRC}/tosa-pcmia-r0.patch;patch=1 \
+                        ${DOSRC}/tosa-mmc-r0.patch;patch=1 \
+                        ${DOSRC}/tosa-bl-r0.patch;patch=1 \
+                        ${DOSRC}/tosa-udc-r0.patch;patch=1 \
+                        ${DOSRC}/pxa-ac97-hh.org-r0.patch;patch=1 \
+                        ${DOSRC}/tosa-ac97-r0.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.10"
 
@@ -83,6 +96,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd"
 CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
 CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
+CMDLINE_ROOT_tosa = "root=/dev/mtdblock1 rootfstype=jffs2 "
 
 ##############################################################
 # Configure memory/ramdisk split for collie
diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb
index 816c2b4212..a978b8fdc3 100644
--- a/packages/opie-console/opie-console_cvs.bb
+++ b/packages/opie-console/opie-console_cvs.bb
@@ -7,7 +7,7 @@ PV = "1.1.9+cvs-${CVSDATE}"
 RDEPENDS = "opie-keytabs"
 APPNAME = "opie-console"
 APPTYPE = binary
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};module=opie/pics \
@@ -17,6 +17,7 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/console/
-    install -m 0644 ${WORKDIR}/pics/console/*.png ${D}/${palmtopdir}/pics/console/
+	install -d ${D}/${palmtopdir}/pics/console/keys/
+	install -m 0644 ${WORKDIR}/pics/console/*.png ${D}/${palmtopdir}/pics/console/
+	install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}/${palmtopdir}/pics/console/keys/
 }
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 0ff62a05f1..107d42bb42 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -4,19 +4,31 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
-S = "${WORKDIR}/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/pics-hires"
+S = "${WORKDIR}"
+
+SHIP_INLINE_PICS = "yes"
+INLINE_PICS = "pics/inline"
+INLINE_PICS_tosa = "pics-hires/inline"
+INLINE_PICS_c7x0 = "pics-hires/inline"
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics/addressbook/
 	install -d ${D}${palmtopdir}/pics/datebook/
 	install -d ${D}${palmtopdir}/pics/todo/
-	install -m 0664 *.png ${D}${palmtopdir}/pics/
-	install -m 0664 addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
-	install -m 0664 datebook/*.png ${D}${palmtopdir}/pics/datebook/
-	install -m 0664 todo/*.png ${D}${palmtopdir}/pics/todo/	
+	install -m 0664 pics/*.png ${D}${palmtopdir}/pics/
+	install -m 0664 pics/addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
+	install -m 0664 pics/datebook/*.png ${D}${palmtopdir}/pics/datebook/
+	install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/	
+
+	if [ "${SHIP_INLINE_PICS}" == "yes" ]; then
+		install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/
+	fi
 }
 
 FILES_${PN} = "${palmtopdir}"
+PACKAGE_ARCH = "${MACHINE}"
+
diff --git a/packages/qte/qte-2.3.10/handhelds.patch b/packages/qte/qte-2.3.10/handhelds.patch
index e69de29bb2..f67766a0c9 100644
--- a/packages/qte/qte-2.3.10/handhelds.patch
+++ b/packages/qte/qte-2.3.10/handhelds.patch
@@ -0,0 +1,60 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp~opie
++++ qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp
+@@ -572,7 +572,7 @@
+ 				    bool enabled, bool active )
+ {
+ #ifndef QT_NO_MENUBAR
+-#ifndef QT_NO_STYLE_SGI
++#if 1 // #ifndef QT_NO_STYLE_SGI
+     if (draw_menu_bar_impl != 0) {
+ 	QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
+ 	(this->*impl)(p, x, y, w, h, mi, g, enabled, active);
+--- qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp~opie
++++ qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp
+@@ -5051,9 +5051,9 @@
+ 	l = l->childItem ? l->childItem : l->siblingItem;
+ 
+     if ( l && l->height() )
+-	s.setHeight( s.height() + 10 * l->height() );
+-    else
+-	s.setHeight( s.height() + 140 );
++	s.setHeight( s.height() + 4 /*10*/ * l->height() );
++    else                      // ^v much too big for handhelds
++	s.setHeight( s.height() + 30 /*140*/ );
+ 
+     if ( s.width() > s.height() * 3 )
+ 	s.setHeight( s.width() / 3 );
+--- qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp~opie
++++ qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp
+@@ -918,6 +918,18 @@
+ {
+ }
+ 
++static void catchSegvSignal( int )
++{
++#ifndef QT_NO_QWS_KEYBOARD
++    if ( qwsServer )
++	qwsServer->closeKeyboard();
++#endif
++    QWSServer::closedown();
++    fprintf(stderr, "Segmentation fault.\n");
++    exit(1);
++}
++
++
+ /*!
+   \class QWSServer qwindowsystem_qws.h
+   \brief Server-specific functionality in Qt/Embedded
+@@ -1043,6 +1055,7 @@
+     }
+ 
+     signal(SIGPIPE, ignoreSignal); //we get it when we read
++    signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
+ #endif
+     focusw = 0;
+     mouseGrabber = 0;
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index aa309dbf2e..5bb7a5e81e 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -114,6 +114,7 @@ do_stage() {
 	rm -f include/qxt.h
 	install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
 	cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
+	cp -a lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/
 }
 
 do_install() {