[oe-commits] org.oe.dev espeak: upgrade to 1.35, clean up

[xjqian commit]

espeak: upgrade to 1.35, clean up
* replace tab by white space
* replace hard coded ${datadir}

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 4da6222c3d8ffac063dbf07630a514c63a8a68dd
ViewMTN: http://monotone.openembedded.org/revision/info/4da6222c3d8ffac063dbf07630a514c63a8a68dd
Files:
1
packages/espeak/espeak_1.30.bb
packages/espeak/espeak_1.35.bb
Diffs:

#
# mt diff -r646ea6ae5f1dc2ff240dd7489ccf04bf34659fd0 -r4da6222c3d8ffac063dbf07630a514c63a8a68dd
#
#
#
# rename "packages/espeak/espeak_1.30.bb"
#     to "packages/espeak/espeak_1.35.bb"
# 
# patch "packages/espeak/espeak_1.35.bb"
#  from [a8eccd7e70daf05d588bdf9ab26438a62a6dfe71]
#    to [7e4fb524c1a706474b8e218dbcef60f0d2db406d]
#
============================================================
--- packages/espeak/espeak_1.30.bb	a8eccd7e70daf05d588bdf9ab26438a62a6dfe71
+++ packages/espeak/espeak_1.35.bb	7e4fb524c1a706474b8e218dbcef60f0d2db406d
@@ -1,52 +1,42 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: espeak_1.30.bb
-# Date: 20080104 (YMD)
-
 DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
 SECTION = "base"
 LICENSE = "GPL"
-
 DEPENDS = "portaudio-v19"
 
-######################################################################################
+PR = "r0"
 
-PR = "r2"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
 
 S = "${WORKDIR}/${PN}-${PV}-source"
 
-FILES_${PN} += " /usr/share/espeak-data/ "
+FILES_${PN} += "${datadir}/espeak-data"
 
 do_configure() {
-	# espeak supports portaudio in APIs V18 and V19
+	# "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19
 	cp ${S}/src/portaudio19.h ${S}/src/portaudio.h 
 }
 
 do_compile() {
-	cd src
-	oe_runmake
+       cd src
+       oe_runmake
 }
 
 do_install() {
         install -d ${D}${bindir}
-	install -d ${D}${libdir}
+        install -d ${D}${libdir}
         install -d ${D}${includedir}
-	install -d ${D}/usr/share/espeak-data
-	
-	install -m 0755 ${S}/src/espeak ${D}${bindir}
-	oe_libinstall -so -C src libespeak ${D}${libdir}
-	
-	cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
+        install -d ${D}${datadir}/espeak-data
+
+        # we do not ship "speak" binary though.
+        install -m 0755 ${S}/src/espeak ${D}${bindir}
+        install -m 0644 ${S}/src/speak_lib.h ${D}${includedir}
+        oe_libinstall -so -C src libespeak ${D}${libdir}
+
+        cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data
 }
 
 do_stage() {
-	install -d ${STAGING_INCDIR}/espeak
-	install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
+        install -d ${STAGING_INCDIR}/espeak
+        install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
         oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
 }