merge of '479705830aaddad1ebb7bf7f36e492b5587043a0'

     and 'c4bca390acd8e11f41e5c2fa6f21837f7f6b70ae'

66 files changed, 3106 insertions, 442 deletions

diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab
index b44d7eacee..63711f989e 100644
--- a/packages/base-files/base-files/h5000/fstab
+++ b/packages/base-files/base-files/h5000/fstab
@@ -1,8 +1,8 @@
-/dev/mtdblock/1	/ 	jffs2	defaults	1  1 
+/dev/mtdblock1	/ 	jffs2	defaults	1  1 
 #breaks h51xx
-/dev/mtdblock/2 /home   jffs2   defaults        1  1
+/dev/mtdblock2 /home   jffs2   defaults        1  1
 proc            /proc   proc    defaults        0  0
 /dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
-/dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
+/dev/mmcblk0p1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
 tmpfs		/var	tmpfs	defaults	0  0
 tmpfs		/media/ram	tmpfs	defaults	0  0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 63e041bf62..c149fd975b 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r57"
+PR = "r58"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/blueprobe/blueprobe-0.17/hwuart.patch b/packages/blueprobe/blueprobe-0.17/hwuart.patch
new file mode 100644
index 0000000000..274c1455d8
--- /dev/null
+++ b/packages/blueprobe/blueprobe-0.17/hwuart.patch
@@ -0,0 +1,21 @@
+Index: base/blueprobe/blueprobe.init
+===================================================================
+--- base/blueprobe/blueprobe.init	(revision 8939)
++++ base/blueprobe/blueprobe.init	(working copy)
+@@ -46,14 +46,14 @@
+ 	;;
+     "HP iPAQ H5400")
+ 	BLUETOOTH=yes
+-	PORT=/dev/tts/1
++	PORT=/dev/ttyS3
+ 	SPEED=921600
+         PROTO=any
+ 	PROBE=yes
+ 	;;
+     "HP iPAQ H3900")
+ 	BLUETOOTH=yes
+-	PORT=/dev/tts/1
++	PORT=/dev/ttyS1
+ 	SPEED=921600
+         PROTO=bcsp
+ 	PROBE=yes
diff --git a/packages/blueprobe/blueprobe_0.17.bb b/packages/blueprobe/blueprobe_0.17.bb
index ffd83b66ae..b82bedf632 100644
--- a/packages/blueprobe/blueprobe_0.17.bb
+++ b/packages/blueprobe/blueprobe_0.17.bb
@@ -1,7 +1,8 @@
 require blueprobe.inc
 
-PR = "r2"
+PR = "r3"
 
-SRC_URI += "file://hx4700.patch;patch=1\
-	    file://h2200-fixup.patch;patch=1\
-            file://htcuniversal.patch;patch=1"
+SRC_URI += "file://hx4700.patch;patch=1 \
+	    file://h2200-fixup.patch;patch=1 \
+            file://htcuniversal.patch;patch=1 \
+	    file://hwuart.patch;patch=1;pnum=2"
diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb
new file mode 100644
index 0000000000..2c0650511a
--- /dev/null
+++ b/packages/blueprobe/blueprobe_0.18.bb
@@ -0,0 +1,3 @@
+require blueprobe.inc
+
+PR = "r0"
diff --git a/packages/esound/esound-gpe_20070109.bb b/packages/esound/esound-gpe_20070109.bb
new file mode 100644
index 0000000000..790462f5e8
--- /dev/null
+++ b/packages/esound/esound-gpe_20070109.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Enlightened Sound Daemon - GPE version"
+SECTION = "gpe/base"
+LICENSE = "GPL"
+DEPENDS = "audiofile"
+PR = "r0"
+PROVIDES += "esound"
+RPROVIDES += "esound"
+
+SRCDATE = "${PV}"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk;module=extra/esound;rev=8935 \
+	   file://audiofile-please.patch;patch=1 \
+	   file://configure.patch;patch=1"
+
+S = "${WORKDIR}/esound"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "--disable-alsa"
+
+SOV = "0.2.28"
+
+do_stage () {
+	install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
+	oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR}
+	install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la
+	install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal
+}
+
+PACKAGES =+ "esddsp esd esd-utils"
+
+FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
+FILES_esd = "${bindir}/esd"
+FILES_esd-utils = "${bindir}/*"
diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb
deleted file mode 100644
index bfd68eb3e2..0000000000
--- a/packages/ffmpeg/ffmpeg_cvs.bb
+++ /dev/null
@@ -1,84 +0,0 @@
-#Remove the dash after cvs below when 0.4.9 changes in PV
-PV = "0.4.9-pre1+cvs-${SRCDATE}"
-DESCRIPTION = "ffmpeg"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib libvorbis faac liba52 lame"
-LICENSE = "GPL"
-PR = "r1"
-S = "${WORKDIR}/ffmpeg"
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools
-
-SRC_URI = "cvs://anonymous@mplayerhq.hu/cvsroot/ffmpeg;module=ffmpeg \
-	file://configure.patch;patch=0 \
-	file://common.patch;patch=1 \
-	file://soname.patch;patch=1 \
-	"
-
-TARGET_LDFLAGS_append = " -lm -la52 "
-
-EXTRA_OECONF=" \
-	--enable-mp3lame \
-	--enable-vorbis \
-	--enable-faac \
-	--enable-a52 \
-	--enable-a52bin \
-	--enable-pp \
-#	--enable-shared-pp \
-	--enable-shared \
-	--disable-amr_nb \
-	--enable-amr_nb-fixed \
-	--disable-amr_wb \
-	--enable-pthreads \
-	--enable-gpl \
-	--enable-zlib \
-	\
-	--disable-audio-beos \
-	--disable-v4l \
-	--disable-dv1394 \
-	--disable-debug \
-	--disable-ffserver \
-	--disable-ffplay \
-	\
-	--cross-prefix=${TARGET_PREFIX} \
-	--extra-cflags=\$(TARGET_CFLAGS) \
-	--extra-ldflags=\$(TARGET_LDFLAGS) \
-	--extra-libs=\$(TARGET_LDFLAGS) \
-	\
-	--cpu=${PACKAGE_ARCH} \
-	--prefix=${D}${prefix} \
-	--mandir=${D}${prefix}/share/man \
-"
-
-PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
-FILES_${PN} = "${bindir}"
-FILES_${PN}-dev = "${includedir}"
-FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
-FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
-
-# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
-
-
-do_configure_prepend() {
-	export CC="${CC}"
-}
-
-do_stage() {
-	oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
-	oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/ffmpeg
-	install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
-	install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
-	install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h
-	install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
-	install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
-	install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
-	install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
-	install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
-}
diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb
new file mode 100644
index 0000000000..4098d721f9
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg_svn.bb
@@ -0,0 +1,127 @@
+DESCRIPTION = "ffmpeg"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "zlib libvorbis faac liba52 lame"
+PV = "0.4.9+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.mplayerhq.hu/ffmpeg/;module=trunk"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+TARGET_LDFLAGS_append = " -lm -la52 "
+
+EXTRA_OECONF = " \
+	--enable-mp3lame \
+        --enable-vorbis \
+        --enable-faad \
+        --enable-a52 \
+        --enable-a52bin \
+        --enable-pp \
+        --enable-shared \
+        --enable-pthreads \
+        --enable-gpl \
+        \
+        --disable-audio-beos \
+        --disable-v4l \
+        --disable-dv1394 \
+        --disable-debug \
+        --disable-ffserver \
+        --disable-ffplay \
+        \
+        --cross-prefix=${TARGET_PREFIX} \
+        \
+        --cpu=${PACKAGE_ARCH} \
+"
+
+
+# We do this because the install program is called with -s
+# which causes it to call "strip" and it then mangles cross compiled stuff..
+PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+
+do_configure_prepend() {
+        export CC="${CC}"
+}
+
+oe_runconf () {
+        if [ -x ${S}/configure ] ; then
+                cfgcmd="${S}/configure \
+                        --prefix=${prefix} \
+                        --mandir=${mandir} \
+                        ${EXTRA_OECONF} \
+                    $@"
+                oenote "Running $cfgcmd..."
+                $cfgcmd || oefatal "oe_runconf failed"
+        else
+                oefatal "no configure script found"
+        fi
+
+}
+
+do_stage() {
+        oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libavutil libavutil ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libpostproc libpostproc ${STAGING_LIBDIR}
+
+        install -d ${STAGING_INCDIR}/ffmpeg
+        install -m 0644 ${S}/libavcodec/avcodec.h \
+                ${STAGING_INCDIR}/ffmpeg/avcodec.h
+
+        install -m 0644 ${S}/libavformat/avformat.h \
+                ${STAGING_INCDIR}/ffmpeg/avformat.h
+        install -m 0644 ${S}/libavformat/avio.h \
+                ${STAGING_INCDIR}/ffmpeg/avio.h
+        install -m 0644 ${S}/libavformat/rtp.h \
+                ${STAGING_INCDIR}/ffmpeg/rtp.h
+        install -m 0644 ${S}/libavformat/rtsp.h \
+                ${STAGING_INCDIR}/ffmpeg/rtsp.h
+        install -m 0644 ${S}/libavformat/rtspcodes.h \
+                ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
+
+        install -m 0644 ${S}/libavutil/avutil.h \
+                ${STAGING_INCDIR}/ffmpeg/avutil.h
+        install -m 0644 ${S}/libavutil/bswap.h \
+                ${STAGING_INCDIR}/ffmpeg/bswap.h
+        install -m 0644 ${S}/libavutil/common.h \
+                ${STAGING_INCDIR}/ffmpeg/common.h
+        install -m 0644 ${S}/libavutil/crc.h \
+                ${STAGING_INCDIR}/ffmpeg/crc.h
+        install -m 0644 ${S}/libavutil/integer.h \
+                ${STAGING_INCDIR}/ffmpeg/integer.h
+        install -m 0644 ${S}/libavutil/intfloat_readwrite.h \
+                ${STAGING_INCDIR}/ffmpeg/intfloat_readwrite.h
+        install -m 0644 ${S}/libavutil/mathematics.h \
+                ${STAGING_INCDIR}/ffmpeg/mathematics.h
+        install -m 0644 ${S}/libavutil/rational.h \
+                ${STAGING_INCDIR}/ffmpeg/rational.h
+}
+
+PACKAGES += "libavcodec libavcodec-dev \
+        libavformat libavformat-dev \
+        libavutil libavutil-dev \
+        libpostproc libpostproc-dev"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-doc = "${mandir}"
+
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so \
+        ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
+
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so \
+        ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+
+FILES_libavutil = "${libdir}/libavutil*.so.*"
+FILES_libavutil-dev = "${libdir}/libavutil*.so \
+        ${libdir}/libavutil*.la ${libdir}/libavutil*.a"
+
+FILES_libpostproc = "${libdir}/libpostproc*.so.*"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so \
+        ${libdir}/libpostproc*.la ${libdir}/libpostproc*.a"
diff --git a/packages/gpe-bootsplash/files/angstrom/splash-l.svg b/packages/gpe-bootsplash/files/angstrom/splash-l.svg
index 9aad9bbf6e..5af0402cb9 100644
--- a/packages/gpe-bootsplash/files/angstrom/splash-l.svg
+++ b/packages/gpe-bootsplash/files/angstrom/splash-l.svg
@@ -7,16 +7,16 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="841.88977pt"
    height="595.27557pt"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.43+0.44pre4"
    version="1.0"
-   sodipodi:docbase="/Users/koen/Projects/Ångström"
-   sodipodi:docname="angstrom-background.svg"
+   sodipodi:docbase="J:\"
+   sodipodi:docname="foo.svg"
    inkscape:export-filename="/Users/koen/Projects/Ångström/angstrom-background.png"
    inkscape:export-xdpi="55.049999"
    inkscape:export-ydpi="55.049999">
@@ -150,7 +150,7 @@
        fx="202.1609"
        fy="581.95923"
        r="161.44482"
-       gradientTransform="matrix(0.404735,2.39512e-7,-2.549551e-7,0.430831,83.00297,330.5175)"
+       gradientTransform="matrix(0.404735,2.39512e-7,-2.549551e-7,0.430831,83.00297,226.5175)"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,13 +162,13 @@
      inkscape:pageshadow="2"
      inkscape:zoom="0.57230612"
      inkscape:cx="596.83002"
-     inkscape:cy="32.789024"
+     inkscape:cy="104.03094"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="989"
      inkscape:window-height="622"
-     inkscape:window-x="0"
-     inkscape:window-y="22" />
+     inkscape:window-x="121"
+     inkscape:window-y="262" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -205,24 +205,24 @@
        xml:space="preserve"
        style="font-size:66.54315948px;font-style:normal;font-weight:normal;fill:#3d74c0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
        id="text2249"
-       y="813.42664"
+       y="709.42664"
        x="555.96344"><tspan
          id="tspan2251"
-         y="813.42664"
+         y="709.42664"
          x="555.96344"
          sodipodi:role="line">Embedded power</tspan></text>
     <path
        style="fill:url(#radialGradient3311);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 166.00737,492.46796 L 7.4907863,757.45093 L 322.15804,757.45093 L 166.00737,492.46796 z "
+       d="M 166.00737,388.46796 L 7.4907863,653.45093 L 322.15804,653.45093 L 166.00737,388.46796 z "
        id="path1449"
        sodipodi:nodetypes="cccc" />
     <path
        style="font-size:114.39354706px;font-style:normal;font-weight:normal;fill:#fb8900;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       d="M 331.08665,757.03785 L 316.38285,757.03785 L 316.38285,707.29524 C 316.38279,703.28042 316.14814,699.52625 315.67894,696.03274 C 315.2096,692.48722 314.34928,689.72373 313.09796,687.74229 C 311.79435,685.55245 309.91728,683.93606 307.46673,682.89317 C 305.01602,681.79829 301.83541,681.25082 297.92489,681.25073 C 293.90997,681.25082 289.71261,682.24148 285.3328,684.22278 C 280.95291,686.2042 276.75556,688.73305 272.74072,691.80931 L 272.74072,757.03785 L 258.03691,757.03785 L 258.03691,669.67541 L 272.74072,669.67541 L 272.74072,679.37364 C 277.3291,675.56742 282.07395,672.59538 286.97526,670.45752 C 291.87647,668.31982 296.90809,667.25092 302.07012,667.25083 C 311.50758,667.25092 318.70306,670.09262 323.65655,675.77592 C 328.60986,681.45938 331.08656,689.64552 331.08665,700.33438 L 331.08665,757.03785 M 430.57191,747.10497 C 430.57182,761.91304 427.20873,772.78446 420.48261,779.71925 C 413.75633,786.65399 403.40632,790.12136 389.43256,790.1214 C 384.79197,790.12136 380.25569,789.78245 375.82374,789.10466 C 371.44386,788.47892 367.11614,787.56647 362.84058,786.36725 L 362.84058,771.35058 L 363.62272,771.35058 C 366.02118,772.28912 369.82748,773.43622 375.04161,774.7919 C 380.25569,776.19969 385.46979,776.90361 390.68394,776.90362 C 395.68945,776.90361 399.83467,776.30399 403.11962,775.10475 C 406.40443,773.9055 408.95935,772.23698 410.78435,770.09921 C 412.60922,768.06569 413.91276,765.61506 414.69494,762.74732 C 415.47697,759.87954 415.86804,756.67288 415.86811,753.12726 L 415.86811,745.14969 C 411.43605,748.69529 407.18656,751.35448 403.11962,753.12726 C 399.10468,754.84792 393.9688,755.70825 387.71191,755.70825 C 377.28364,755.70825 368.99322,751.9541 362.84058,744.44577 C 356.74005,736.88532 353.68981,726.24855 353.68983,712.53541 C 353.68981,705.02713 354.73264,698.56165 356.81828,693.1389 C 358.95606,687.66414 361.84989,682.94539 365.4998,678.98259 C 368.88893,675.28065 373.00807,672.4129 377.85723,670.3793 C 382.70632,668.29374 387.52937,667.25092 392.3264,667.25083 C 397.38404,667.25092 401.60746,667.77235 404.99669,668.81508 C 408.43794,669.80585 412.06174,671.344 415.86811,673.42955 L 416.80667,669.67541 L 430.57191,669.67541 L 430.57191,747.10497 M 415.86811,733.02687 L 415.86811,685.39594 C 411.95746,683.62323 408.30757,682.37184 404.91847,681.64178 C 401.58139,680.85975 398.24437,680.46869 394.90739,680.46862 C 386.82548,680.46869 380.46426,683.18002 375.82374,688.60263 C 371.18314,694.02537 368.86288,701.89866 368.86289,7