diff options
68 files changed, 3116 insertions, 445 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b1855b0ea7..dc0cc22fc0 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -107,7 +107,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_gtk+ = "2.10.6" +PREFERRED_VERSION_gtk+ = "2.10.7" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 843e26bed0..485d90df7f 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -31,17 +31,24 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ kernel-module-af-key \ kernel-module-bsd-comp \ kernel-module-i2c-pxa \ - kernel-module-htcuniversal-power \ kernel-module-snd-htcuniversal-audio \ kernel-module-htcuniversal-acx \ kernel-module-acx \ + kernel-module-i2c-algo-bit \ + kernel-module-rtc-sa1100 \ + kernel-module-rtc-dev \ + kernel-module-rtc-proc \ + kernel-module-rtc-sysfs \ " # # Modules autoload and other boot properties # -module_autoload_acx = "acx" +#module_autoload_acx = "acx" module_autoload_htcuniversal_acx = "htcuniversal_acx" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" 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 |
