[oe-commits] org.oe.dev merge of '5e5ed72728986531bc9fcd00f87f56051f1fbff5'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Jan 5 19:41:35 UTC 2008
merge of '5e5ed72728986531bc9fcd00f87f56051f1fbff5'
and '897413a90458757cb227c0afbc74963d175a60a7'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2df396d3c9bb3f2afb58c9ecb59aba197323bf87
ViewMTN: http://monotone.openembedded.org/revision/info/2df396d3c9bb3f2afb58c9ecb59aba197323bf87
Files:
1
packages/speech-dispatcher/files/confSpeechd.conf_00.patch
packages/navit/files/navit.launcher
packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
packages/speech-dispatcher/files/speech-dispatcher.init
packages/espeak/espeak_1.30.bb
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/u-boot/u-boot-openmoko_svn.bb
Diffs:
#
# mt diff -r5e5ed72728986531bc9fcd00f87f56051f1fbff5 -r2df396d3c9bb3f2afb58c9ecb59aba197323bf87
#
#
#
# delete "packages/speech-dispatcher/files/confSpeechd.conf_00.patch"
#
# add_file "packages/navit/files/navit.launcher"
# content [27112f09960b2c81d820fef3fe2b712926754667]
#
# add_file "packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch"
# content [001e9d4108977248cedd50752029192824293596]
#
# add_file "packages/speech-dispatcher/files/speech-dispatcher.init"
# content [c2d6965815b005c0d9ab696cbca0d2edb3c39bfd]
#
# patch "packages/espeak/espeak_1.30.bb"
# from [81d52cdf97440599166ddf3cf05b7e750c5bc59d]
# to [0b187e4c430c8a401c4d5bd39c356847ef639578]
#
# patch "packages/navit/navit.inc"
# from [926adcffc6471b5c8bf96d43d6eaf5c81bd2debf]
# to [dc36e11d9155034cfe2c407959f0b757b5a483de]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0]
# to [1127602c440a00440088e7587bf88d3c760f05c4]
#
# patch "packages/navit/navit_cvs.bb"
# from [537deb351fc223dc40a33d489f2edf10bd7f67dd]
# to [d22f4f689826ebf7d008a0bc66a88d56cc149e05]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# from [4c119ef83390203d6cbc5962db26ac4ec8ed6733]
# to [c0404c61c7a8cf7050862abc2771e72e634cf323]
#
============================================================
--- packages/navit/files/navit.launcher 27112f09960b2c81d820fef3fe2b712926754667
+++ packages/navit/files/navit.launcher 27112f09960b2c81d820fef3fe2b712926754667
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: navit.launcher
+# Date: 20080105 (YMD)
+#
+#################################################################################
+#
+# 20080105 - v0.0.1 - Initial release
+
+# On devices with low memory (< 512Mb?) Navit will segfault on start.
+# This can be worked around by doing
+# "echo 1 > /proc/sys/vm/overcommit_memory"
+
+if test "`cat /proc/meminfo | grep ^MemTotal | awk '{print $2}'`" -lt "500000"
+then
+ if test "$USER" = "root"
+ then
+ echo "Enabling low-mem workaround..."
+ echo 1 > /proc/sys/vm/overcommit_memory
+ else
+ echo "I need root-privs to enable the low-mem workaround!"
+ fi
+fi
+
+navit.real $*
+
+
============================================================
--- packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch 001e9d4108977248cedd50752029192824293596
+++ packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch 001e9d4108977248cedd50752029192824293596
@@ -0,0 +1,33 @@
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig 2008-01-05 16:38:53.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in 2008-01-05 16:40:45.000000000 +0000
+@@ -36,7 +36,7 @@
+ # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
+ # want to influence it.
+
+-LogDir "default"
++LogDir "/var/log/"
+ #LogDir "/var/log/speech-dispatcher/"
+ #LogDir "stdout"
+
+@@ -129,9 +129,9 @@
+ # - configuration is the path to the config file of this module,
+ # either relative (to etc/speechd/modules/) or absolute
+
+-AddModule "espeak" "sd_espeak" "espeak.conf"
+-AddModule "festival" "sd_festival" "festival.conf"
+-AddModule "flite" "sd_flite" "flite.conf"
++AddModule "espeak" "sd_espeak" "/etc/speech-dispatcher/modules/espeak.conf"
++#AddModule "festival" "sd_festival" "festival.conf"
++#AddModule "flite" "sd_flite" "flite.conf"
+ #AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+ #AddModule "epos-generic" "sd_generic" "epos-generic.conf"
+ #AddModule "dtk-generic" "sd_generic" "dtk-generic.conf"
+@@ -172,6 +172,6 @@
+
+ # There are some sample client settings
+
+-Include "clients/emacs.conf"
+-Include "clients/gnome-speech.conf"
++#Include "clients/emacs.conf"
++#Include "clients/gnome-speech.conf"
+
============================================================
--- packages/speech-dispatcher/files/speech-dispatcher.init c2d6965815b005c0d9ab696cbca0d2edb3c39bfd
+++ packages/speech-dispatcher/files/speech-dispatcher.init c2d6965815b005c0d9ab696cbca0d2edb3c39bfd
@@ -0,0 +1,42 @@
+#! /bin/sh
+
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/speech-dispatcher
+PIDFILE=/var/run/speech-dispatcher.pid
+NAME=speech-dispatcher
+DESC='Speech Dispatcher'
+USER=speech-dispatcher
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+ start)
+ echo "Starting $NAME"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --exec $DAEMON
+
+ ;;
+ stop)
+ echo "Stopping $NAME"
+ start-stop-daemon --oknodo --stop --quiet \
+ --pidfile $PIDFILE --exec $DAEMON
+ ;;
+ restart)
+ echo "Restarting $NAME"
+ start-stop-daemon --oknodo --stop --quiet \
+ --pidfile $PIDFILE --exec $DAEMON
+ sleep 3
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --exec $DAEMON
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/espeak/espeak_1.30.bb 81d52cdf97440599166ddf3cf05b7e750c5bc59d
+++ packages/espeak/espeak_1.30.bb 0b187e4c430c8a401c4d5bd39c356847ef639578
@@ -15,7 +15,7 @@ DEPENDS = "portaudio-v19"
######################################################################################
-PR = "r0"
+PR = "r1"
SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-${PV}-source.zip"
@@ -44,3 +44,9 @@ do_install() {
cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/espeak
+ install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
+ oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
+}
============================================================
--- packages/navit/navit.inc 926adcffc6471b5c8bf96d43d6eaf5c81bd2debf
+++ packages/navit/navit.inc dc36e11d9155034cfe2c407959f0b757b5a483de
@@ -9,3 +9,17 @@ FILES_${PN}-dev += "${libdir}/${PN}/*/*.
FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
+
+SRC_URI_append = " \
+ file://navit.launcher \
+ "
+
+do_install_append() {
+ install -d ${D}/usr/share/applications/
+
+ install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+
+ mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
+
+ install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
+}
============================================================
--- packages/navit/navit_0.0.3.bb bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0
+++ packages/navit/navit_0.0.3.bb 1127602c440a00440088e7587bf88d3c760f05c4
@@ -1,6 +1,6 @@ require navit.inc
require navit.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
file://navit.xml-so.patch;patch=1 \
============================================================
--- packages/navit/navit_cvs.bb 537deb351fc223dc40a33d489f2edf10bd7f67dd
+++ packages/navit/navit_cvs.bb d22f4f689826ebf7d008a0bc66a88d56cc149e05
@@ -1,7 +1,7 @@ PV = "0.0.3+cvs${SRCDATE}"
require navit.inc
PV = "0.0.3+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
S = "${WORKDIR}/navit"
@@ -13,8 +13,3 @@ EXTRA_AUTORECONF = " -I m4"
EXTRA_AUTORECONF = " -I m4"
-do_install_append() {
- install -d ${D}/usr/share/applications/
-
- install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-}
============================================================
--- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb 4c119ef83390203d6cbc5962db26ac4ec8ed6733
+++ packages/speech-dispatcher/speech-dispatcher_0.6.5.bb c0404c61c7a8cf7050862abc2771e72e634cf323
@@ -1,26 +1,33 @@
-DESCRIPTION = " Speech Dispatcher is a high-level device independent layer \
+DESCRIPTION = "Speech Dispatcher is a high-level device independent layer \
for speech synthesis through a simple, stable and well documented interface."
HOMEPAGE = "http://www.freebsoft.org/speechd/"
LICENSE = "GPLv2"
DEPENDS = "flite libdotconf glib-2.0"
-RPROVIDES += "speechd"
+RPROVIDES_${PN} += "speechd"
-PR = "r1"
+PR = "r5"
-inherit autotools
+inherit autotools update-rc.d
SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
+ file://speech-dispatcher.init \
file://srcMakefile.am.patch;patch=1 \
- file://confSpeechd.conf_00.patch;patch=1"
+ file://configSpeechd.conf.in_00.patch;patch=1"
LEAD_SONAME = "libspeechd.so"
+EXTRA_OECONF = " --with-espeak=yes --with-flite=no --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes "
+INITSCRIPT_NAME = "speech-dispatcher"
+INITSCRIPT_PARAMS = "defaults 45"
+
do_install() {
install -d ${D}${bindir}
install -d ${D}${includedir}
install -d ${D}${libdir}/${PN}-modules
- install -d ${D}${sysconfdir}
- install -d ${D}${sysconfdir}/modules
+ install -d ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/speech-dispatcher
+ install -d ${D}${sysconfdir}/speech-dispatcher/modules
oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
@@ -31,8 +38,9 @@ do_install() {
install -m 0755 ${S}/src/server/.libs/speech-dispatcher ${D}${bindir}
install -m 0755 ${S}/src/modules/.libs/sd_* ${D}${libdir}/${PN}-modules/
- install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}
- install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/modules
+ install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}/speech-dispatcher
+ install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/speech-dispatcher/modules
+ install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher
}
do_stage() {
#
# mt diff -r897413a90458757cb227c0afbc74963d175a60a7 -r2df396d3c9bb3f2afb58c9ecb59aba197323bf87
#
#
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [67ec27434d36f171aedd9fb4e06f390505792635]
# to [d812cd2b7484ad3d696a1616eea6e3e80706d31c]
#
============================================================
--- packages/u-boot/u-boot-openmoko_svn.bb 67ec27434d36f171aedd9fb4e06f390505792635
+++ packages/u-boot/u-boot-openmoko_svn.bb d812cd2b7484ad3d696a1616eea6e3e80706d31c
@@ -6,7 +6,7 @@ PV = "1.3.1${LOCALVERSION}"
PROVIDES = "virtual/bootloader"
LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
PV = "1.3.1${LOCALVERSION}"
-PR = "r2"
+PR = "r3"
SRCREV_FORMAT = "patches"
@@ -17,7 +17,7 @@ SRC_URI = "\
SRC_URI = "\
git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
- file://uboot-eabi-fix-HACK.patch \
+ file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
file://makefile-no-dirafter.patch;patch=1 \
file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \
More information about the Openembedded-commits
mailing list