From eca9b17c852a77b8e473d7d2009da5ebea6e47eb Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Tue, 22 Apr 2008 23:58:32 +0000
Subject: espeak: bump to 1.37. fix RDEPENDS.

---
 packages/espeak/espeak-data_1.35.bb | 30 -------------------------
 packages/espeak/espeak-data_1.37.bb | 30 +++++++++++++++++++++++++
 packages/espeak/espeak.inc          |  2 ++
 packages/espeak/espeak_1.35.bb      | 45 -------------------------------------
 packages/espeak/espeak_1.37.bb      | 45 +++++++++++++++++++++++++++++++++++++
 5 files changed, 77 insertions(+), 75 deletions(-)
 delete mode 100644 packages/espeak/espeak-data_1.35.bb
 create mode 100644 packages/espeak/espeak-data_1.37.bb
 delete mode 100644 packages/espeak/espeak_1.35.bb
 create mode 100644 packages/espeak/espeak_1.37.bb

(limited to 'packages')

diff --git a/packages/espeak/espeak-data_1.35.bb b/packages/espeak/espeak-data_1.35.bb
deleted file mode 100644
index 4dc9aa9882..0000000000
--- a/packages/espeak/espeak-data_1.35.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require espeak.inc
-
-PR = "r0"
-
-inherit native
-
-PACKAGES = "${PN}"
-FILES_${PN} = "${layout_datadir}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-TARGET_ARCH = "${MACHINE_ARCH}"
-
-do_compile() {
-        # Fixing byte order of phoneme data files
-        cd "${S}/platforms/big_endian"
-        sed -i '/^ *CC *=/d' Makefile
-        sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c
-        oe_runmake
-        ./espeak-phoneme-data "${S}/espeak-data"
-        cp -f phondata phonindex phontab "${S}/espeak-data"
-}
-
-do_install() {
-        install -d ${D}${layout_datadir}/espeak-data
-        install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data
-}
-
-do_stage() {
-        :
-}
diff --git a/packages/espeak/espeak-data_1.37.bb b/packages/espeak/espeak-data_1.37.bb
new file mode 100644
index 0000000000..4dc9aa9882
--- /dev/null
+++ b/packages/espeak/espeak-data_1.37.bb
@@ -0,0 +1,30 @@
+require espeak.inc
+
+PR = "r0"
+
+inherit native
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${layout_datadir}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+TARGET_ARCH = "${MACHINE_ARCH}"
+
+do_compile() {
+        # Fixing byte order of phoneme data files
+        cd "${S}/platforms/big_endian"
+        sed -i '/^ *CC *=/d' Makefile
+        sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c
+        oe_runmake
+        ./espeak-phoneme-data "${S}/espeak-data"
+        cp -f phondata phonindex phontab "${S}/espeak-data"
+}
+
+do_install() {
+        install -d ${D}${layout_datadir}/espeak-data
+        install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data
+}
+
+do_stage() {
+        :
+}
diff --git a/packages/espeak/espeak.inc b/packages/espeak/espeak.inc
index c0502b6ca3..9a31dfdadd 100644
--- a/packages/espeak/espeak.inc
+++ b/packages/espeak/espeak.inc
@@ -5,3 +5,5 @@ LICENSE = "GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
 
 S = "${WORKDIR}/espeak-${PV}-source"
+
+DEPENDS = "portaudio-v19"
diff --git a/packages/espeak/espeak_1.35.bb b/packages/espeak/espeak_1.35.bb
deleted file mode 100644
index f7dacf54bc..0000000000
--- a/packages/espeak/espeak_1.35.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-require espeak.inc
-
-EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be",  "espeak-data (= ${PV})", "", d)}'
-RDEPENDS = "portaudio-v19 ${EXTRA_PHONEMES}"
-
-PR = "r1"
-
-CXXFLAGS += "-DUSE_PORTAUDIO"
-
-FILES_${PN} += "${datadir}/espeak-data"
-
-do_configure() {
-       #  "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19
-       cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
-}
-
-do_compile() {
-       cd src
-       oe_runmake
-}
-
-do_install() {
-        install -d ${D}${bindir}
-        install -d ${D}${libdir}
-        install -d ${D}${includedir}
-        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}
-
-	if [ "${SITEINFO_ENDIANESS}" = "be" ] ; then
-		# the big-endian phon* files are provided by the package espeak-data
-		rm -f ${S}/espeak-data/phon*
-	fi
-
-        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/
-        oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
-}
diff --git a/packages/espeak/espeak_1.37.bb b/packages/espeak/espeak_1.37.bb
new file mode 100644
index 0000000000..4ea82e14b4
--- /dev/null
+++ b/packages/espeak/espeak_1.37.bb
@@ -0,0 +1,45 @@
+require espeak.inc
+
+EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be",  "espeak-data (= ${PV})", "", d)}'
+RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
+
+PR = "r0"
+
+CXXFLAGS += "-DUSE_PORTAUDIO"
+
+FILES_${PN} += "${datadir}/espeak-data"
+
+do_configure() {
+       #  "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19
+       cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
+}
+
+do_compile() {
+       cd src
+       oe_runmake
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${libdir}
+        install -d ${D}${includedir}
+        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}
+
+	if [ "${SITEINFO_ENDIANESS}" = "be" ] ; then
+		# the big-endian phon* files are provided by the package espeak-data
+		rm -f ${S}/espeak-data/phon*
+	fi
+
+        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/
+        oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
+}
-- 
cgit v1.2.3