diff options
28 files changed, 148 insertions, 66 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4cc84b326f..8e48ba407b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -93,6 +93,7 @@ SRCREV_pn-neod ?= "4336" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-networkmanager ?= "3202" SRCREV_pn-networkmanager-applet ?= "200" +SRCREV_pn-numptyphysics = "45" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -138,9 +139,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4430" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "4488" -SRCREV_pn-opkg-native ?= "4491" -SRCREV_pn-opkg-sdk ?= "4488" +SRCREV_pn-opkg ?= "4564" +SRCREV_pn-opkg-native ?= "4564" +SRCREV_pn-opkg-sdk ?= "4564" SRCREV_pn-opkg-utils ?= "4534" SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-oprofileui ?= "173" @@ -177,5 +178,5 @@ SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" -SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" +SRCREV_pn-xserver-kdrive-glamo ?= "4147f80c0bfedaff7749bccbd1e1d566dee0e04c" SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc" diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb index f444c24e1f..83102a0afe 100644 --- a/packages/dsplink/codec-engine_2.10.bb +++ b/packages/dsplink/codec-engine_2.10.bb @@ -5,7 +5,7 @@ RDEPENDS = "update-modules" inherit module -PR = "r5" +PR = "r7" PV = "2.10" # Get CE tarball from TI website, place in sources and calculate @@ -94,6 +94,7 @@ export DSPLIBS = "${S}/packages/ti/sdo/ce/utils/trace/lib/*.a* \ ${S}/packages/ti/sdo/ce/alg/lib/*.a* \ ${S}/cetools/packages/ti/sdo/fc/dman3/*.a* \ ${S}/cetools/packages/ti/sdo/fc/acpy3/*.a* \ + ${S}/packages/ti/sdo/ce/osal/linux/lib/osal_linux_470.a* \ ${S}/packages/ti/sdo/ce/utils/xdm/lib/*.a* \ ${S}/cetools/packages/ti/sdo/utils/trace/lib/*.a* \ " diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb index 26e63530b9..b110ab9fb6 100644 --- a/packages/dsplink/dsplink_1.51.00.08.bb +++ b/packages/dsplink/dsplink_1.51.00.08.bb @@ -4,7 +4,7 @@ require dsplink.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" -PR = "r9" +PR = "r10" PE = "1" PV = "1.51" @@ -19,5 +19,9 @@ SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz \ file://prcs-fix-include.patch;patch=1;pnum=2 \ " +SRC_URI_append_beagleboard = " \ + file://dsplink-128M.patch;patch=1;pnum=2 \ +" + S = "${WORKDIR}/dsplink_1_51_00_08/dsplink" diff --git a/packages/dsplink/files/ticel-config b/packages/dsplink/files/ticel-config index 13ab6b02be..75ebddae75 100644 --- a/packages/dsplink/files/ticel-config +++ b/packages/dsplink/files/ticel-config @@ -2,7 +2,6 @@ LIBS="" for lib in \ - decode_x470MV.a \ TraceUtil.a \ bioslog.a \ video.a \ @@ -11,8 +10,7 @@ for lib in \ ce.a \ Algorithm_noOS.a \ alg.a \ - osal_dsplink_linux.a \ - osal_dsplink_linux_6446.a \ + osal_linux_470.a \ dman3Cfg.a \ acpy3.a \ cmem.a \ diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 299e9790a1..fb5026db2a 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -71,6 +71,10 @@ GTK_INSTALL = "\ tangogps-fso \ " +GAMES_INSTALL = "\ + numptyphysics \ +" + # FIXME these should rather be part of alsa-state, # once Om stabilizes them... AUDIO_INSTALL_append_om-gta01 = "\ @@ -98,6 +102,7 @@ IMAGE_INSTALL = "\ ${BASE_INSTALL} \ ${X_INSTALL} \ ${GTK_INSTALL} \ + ${GAMES_INSTALL} \ ${AUDIO_INSTALL} \ ${TOOLS_INSTALL} \ ${PYTHON_INSTALL} \ diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb index d2e39760c8..008bd67321 100644 --- a/packages/images/neuros-osd-base-image.bb +++ b/packages/images/neuros-osd-base-image.bb @@ -21,6 +21,9 @@ IMAGE_INSTALL = "task-boot \ wireless-tools zd1211-firmware \ ${DISTRO_SSH_DAEMON} \ qt-embedded dbus \ + neuros-mainmenu \ + neuros-nwm \ +# vlc-davinci \ " IMAGE_LINGUAS = "" diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig index d68f2d069f..1958f1ca0c 100644 --- a/packages/linux/linux-neuros/neuros-osd2/defconfig +++ b/packages/linux/linux-neuros/neuros-osd2/defconfig @@ -32,7 +32,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -496,7 +496,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_IDE=y -CONFIG_IDE_MAX_HWIFS=4 +CONFIG_IDE_MAX_HWIFS=1 CONFIG_BLK_DEV_IDE=y # @@ -850,6 +850,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_DAVINCI=y CONFIG_VIDEO_TVP5150=y +CONFIG_VIDEO_TVP7000=y # CONFIG_VIDEO_TVP5146 is not set # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_CPIA2 is not set @@ -892,7 +893,7 @@ CONFIG_DAB=y # # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_VGASTATE is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -914,9 +915,9 @@ CONFIG_FB_DEFERRED_IO=y # Frame buffer hardware drivers # # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_DAVINCI=y +# CONFIG_FB_DAVINCI is not set # CONFIG_FB_VIRTUAL is not set - +CONFIG_FB_DM=y # # Console display driver support # diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb index 345e3174ae..563a2c5aaa 100644 --- a/packages/linux/linux-neuros_git.bb +++ b/packages/linux/linux-neuros_git.bb @@ -2,10 +2,10 @@ require linux.inc DESCRIPTION = "Linux kernel for Neuros OSD devices" -SRCREV = "7ee93e596406d465e5af2c119e13def9af323f6b" +SRCREV = "d2867be8abb7d67442cec3ae13d782f1254835d8" PV = "2.6.23-${PR}+git${SRCREV}" -PR = "r8" +PR = "r9" COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)" diff --git a/packages/sphinx/.mtn2git_empty b/packages/numptyphysics/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/sphinx/.mtn2git_empty +++ b/packages/numptyphysics/.mtn2git_empty diff --git a/packages/numptyphysics/numptyphysics_svn.bb b/packages/numptyphysics/numptyphysics_svn.bb new file mode 100644 index 0000000000..976028befe --- /dev/null +++ b/packages/numptyphysics/numptyphysics_svn.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Numpty Physics is a drawing puzzle game in the spirit (and style?) \ +of Crayon Physics using the same excellent Box2D engine." +DEPENDS = "virtual/libsdl libsdl-image" +LICENSE = "GPL" +HOMEPAGE = "http://numptyphysics.garage.maemo.org/" +SECTION = "x11/games" +PV = "0.2+svnr${SRCREV}" + +SRC_URI = "\ + svn://garage.maemo.org/svn/${PN};module=trunk;proto=https \ + http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz \ +" +S = "${WORKDIR}/trunk" + +EXTRA_S = "${WORKDIR}/local/packages/numptyphysics" + +# what an ugly buildsystem... handcrafted Makefiles... back to the stoneage +export CCOPTS = "${CFLAGS} -I Box2D/Include" +export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image" + +do_configure() { + for i in Config.h Makefile Game.cpp; do + install -m 0644 ${EXTRA_S}/$i ${S} + done +} + +do_install() { + install -d ${D}${datadir}/numptyphysics + install -d ${D}${bindir} + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0755 ${S}/arm/Game ${D}${bindir}/numptyphysics + install -m 0644 ${EXTRA_S}/star.png ${D}${datadir}/pixmaps + install -m 0644 ${EXTRA_S}/numptyphysics.desktop ${D}/${datadir}/applications + cp -a ${EXTRA_S}/data/* ${D}/${datadir}/numptyphysics/ +} + +FILES_${PN} += "${datadir}" diff --git a/packages/python/python-mako_0.2.2.bb b/packages/python/python-mako_0.2.2.bb new file mode 100644 index 0000000000..718e58a09b --- /dev/null +++ b/packages/python/python-mako_0.2.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A super-fast templating language that borrows the best ideas from the existing templating languages" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "MIT" +HOMEPAGE = "http://www.makotemplates.org/" +SRCNAME = "Mako" +PR = "ml0" + +SRC_URI = "http://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools diff --git a/packages/python/python-sphinxsearch_0.1.bb b/packages/python/python-sphinxsearch_0.1.bb new file mode 100644 index 0000000000..6c1afdcbe6 --- /dev/null +++ b/packages/python/python-sphinxsearch_0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A module for querying the sphinx search daemon" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +HOMEPAGE = "http://www.sphinxsearch.com/" +SRCNAME = "sphinxsearch" +PR = "ml0" + +SRC_URI = "http://pypi.python.org/packages/source/s/sphinxsearch/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/sphinx/pocketsphinx/.mtn2git_empty b/packages/sphinx-search/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/sphinx/pocketsphinx/.mtn2git_empty +++ b/packages/sphinx-search/.mtn2git_empty diff --git a/packages/sphinx-search/sphinx_0.9.8.bb b/packages/sphinx-search/sphinx_0.9.8.bb new file mode 100644 index 0000000000..addc4a65d5 --- /dev/null +++ b/packages/sphinx-search/sphinx_0.9.8.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The Sphinx Fulltext Indexer" +HOMEPAGE = "http://www.sphinxsearch.com/" +LICENSE = "GPL" +PRIORITY = "optional" +DEPENDS = "expat" + +SRC_URI = "\ + http://www.sphinxsearch.com/downloads/sphinx-${PV}.tar.gz \ + http://snowball.tartarus.org/dist/libstemmer_c.tgz \ +" + +inherit autotools + +EXTRA_OECONF = "\ + --without-mysql \ + --with-libstemmer \ +" + +# miscompiles w/ O2 +FULL_OPTIMIZATION_arm = "-O1" + +inherit autotools + +do_configure_prepend() { + mv ${WORKDIR}/libstemmer_c/* libstemmer_c/ +} diff --git a/packages/sphinx-speech/.mtn2git_empty b/packages/sphinx-speech/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sphinx-speech/.mtn2git_empty diff --git a/packages/sphinx-speech/pocketsphinx/.mtn2git_empty b/packages/sphinx-speech/pocketsphinx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sphinx-speech/pocketsphinx/.mtn2git_empty diff --git a/packages/sphinx/pocketsphinx/cross-compile.patch b/packages/sphinx-speech/pocketsphinx/cross-compile.patch index 4392204657..4392204657 100644 --- a/packages/sphinx/pocketsphinx/cross-compile.patch +++ b/packages/sphinx-speech/pocketsphinx/cross-compile.patch diff --git a/packages/sphinx/pocketsphinx_0.2.1.bb b/packages/sphinx-speech/pocketsphinx_0.2.1.bb index 813146ed86..813146ed86 100644 --- a/packages/sphinx/pocketsphinx_0.2.1.bb +++ b/packages/sphinx-speech/pocketsphinx_0.2.1.bb diff --git a/packages/sphinx/pocketsphinx_0.4.1.bb b/packages/sphinx-speech/pocketsphinx_0.4.1.bb index 813146ed86..813146ed86 100644 --- a/packages/sphinx/pocketsphinx_0.4.1.bb +++ b/packages/sphinx-speech/pocketsphinx_0.4.1.bb diff --git a/packages/sphinx/sphinx-fpu.inc b/packages/sphinx-speech/sphinx-fpu.inc index 73ae2ec16e..73ae2ec16e 100644 --- a/packages/sphinx/sphinx-fpu.inc +++ b/packages/sphinx-speech/sphinx-fpu.inc diff --git a/packages/sphinx/sphinxbase_0.1.bb b/packages/sphinx-speech/sphinxbase_0.1.bb index 2830b9010a..2830b9010a 100644 --- a/packages/sphinx/sphinxbase_0.1.bb +++ b/packages/sphinx-speech/sphinxbase_0.1.bb diff --git a/packages/sphinx/sphinxbase_0.3.bb b/packages/sphinx-speech/sphinxbase_0.3.bb index 2830b9010a..2830b9010a 100644 --- a/packages/sphinx/sphinxbase_0.3.bb +++ b/packages/sphinx-speech/sphinxbase_0.3.bb diff --git a/packages/tangogps/tangogps-fso_0.9.2.bb b/packages/tangogps/tangogps-fso_0.9.2.bb index e05b72dc29..c3f202724f 100644 --- a/packages/tangogps/tangogps-fso_0.9.2.bb +++ b/packages/tangogps/tangogps-fso_0.9.2.bb @@ -1,13 +1,8 @@ -LICENSE = "GPLv2" -SECTION = "x11/applications" -PRIORITY = "optional" -DESCRIPTION = "lightweight and fast mapping application" -DEPENDS = "curl gtk+ gconf gypsy dbus-glib" +require tangogps.inc -inherit autotools +RDEPENDS = "frameworkd" -SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz\ - file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \ - file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1" - -S=${WORKDIR}/tangogps-${PV} +SRC_URI += "\ + file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \ + file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1 \ +" diff --git a/packages/tangogps/tangogps.inc b/packages/tangogps/tangogps.inc new file mode 100644 index 0000000000..a96ed8988f --- /dev/null +++ b/packages/tangogps/tangogps.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "A lightweight and fast mapping application" +LICENSE = "GPLv2" +SECTION = "x11/applications" +PRIORITY = "optional" +DEPENDS = "curl gtk+ gconf gypsy" + +SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz" +S = "${WORKDIR}/tangogps-${PV}" + +inherit autotools diff --git a/packages/tangogps/tangogps_0.9.0.3.bb b/packages/tangogps/tangogps_0.9.0.3.bb index f980b0bb04..66c7c9d3ef 100644 --- a/packages/tangogps/tangogps_0.9.0.3.bb +++ b/packages/tangogps/tangogps_0.9.0.3.bb @@ -1,10 +1,4 @@ -LICENSE = "GPLv2" -SECTION = "x11/applications" -PRIORITY = "optional" -DESCRIPTION = "lightweight and fast mapping application" -DEPENDS = "curl gtk+ gconf gpsd" -RDEPENDS = "gpsd" - -SRC_URI = "http://www.tangogps.org/downloads/${PN}-${PV}.tar.gz" +require tangogps.inc -inherit autotools +DEPENDS += "gpsd" +RDEPENDS = "gpsd" diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 623337455c..f6aec948bd 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml31" +PR = "ml32" RDEPENDS = "\ python-ao \ @@ -33,6 +33,7 @@ RDEPENDS = "\ python-lxml \ python-m2crypto \ python-mad \ + python-mako \ python-numarray \ python-numeric \ python-ogg \ @@ -79,6 +80,7 @@ RDEPENDS = "\ python-sgmlop \ python-snmplib \ python-soappy \ + python-sphinxsearch \ python-spydi \ python-spyro \ python-sqlalchemy \ diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb index 6f0308880c..26fba388c3 100644 --- a/packages/vlc/vlc-davinci_0.8.6h.bb +++ b/packages/vlc/vlc-davinci_0.8.6h.bb @@ -4,9 +4,9 @@ LICENSE = "GPL" PRIORITY = "optional" SECTION = "multimedia" -SRCREV = "1ae3abd276bc478f7a3156c4acef1dd20f1b1899" +SRCREV = "d13ee15ec1547dd34a3290684573f91df359f589" -PR = "r3" +PR = "r4" PV = "0.8.6h+${PR}+gitr${SRCREV}" diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index 65ff03cc16..8c285b75dd 100644 --- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "X server for glamo chip in GTA02" +DESCRIPTION = "X server for glamo chip in the Openmoko GTA02 device" SECTION = "x11/base" LICENSE = "MIT" DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \ @@ -8,37 +8,17 @@ DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \ DEPENDS += "libxkbfile libxcalibrate" RDEPENDS_${PN} = "xserver-kdrive" PROVIDES = "virtual/xserver" + PE = "1" -PR = "r6" -PV = "1.3.0.0+git${SRCREV}" +PV = "1.3.0.0+gitr${SRCREV}" +PR = "r0" -SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://kmode-palm.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://fix_default_mode.patch;patch=1 \ - file://enable-xcalibrate.patch;patch=1 \ - file://hide-cursor-and-ppm-root.patch;patch=1 \ - file://xcalibrate_coords.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://w100-autofoo.patch;patch=1 \ - file://w100-fix-offscreen-bmp.patch;patch=1 \ - file://kdrive-1.3-18bpp.patch;patch=1 \ - file://gumstix-kmode.patch;patch=1 \ - file://fix-picturestr-include-order.patch;patch=1 \ -" +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = 'om-gta02' FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.3.0.0:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files" +SRC_URI = "git://git.openmoko.org/git/xglamo.git;protocol=git" S = "${WORKDIR}/git" inherit autotools pkgconfig |