[oe-commits] org.oe.dev sphinx: update to latest release

[koen commit]

sphinx: update to latest release

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 33f388a08761eb65bd3d76449ebc0f7b0407d304
ViewMTN: http://monotone.openembedded.org/revision/info/33f388a08761eb65bd3d76449ebc0f7b0407d304
Files:
1
packages/sphinx/pocketsphinx_0.4.1.bb
packages/sphinx/sphinx-fpu.inc
packages/sphinx/sphinxbase_0.3.bb
packages/sphinx/sphinxbase_0.1.bb
Diffs:

#
# mt diff -r57546c002aba07665ab9328a304b720be002f5f5 -r33f388a08761eb65bd3d76449ebc0f7b0407d304
#
#
#
# add_file "packages/sphinx/pocketsphinx_0.4.1.bb"
#  content [4745c21e4524c5e610b74131b218d823a9aca8b2]
# 
# add_file "packages/sphinx/sphinx-fpu.inc"
#  content [06f4db8c932cbdad484b83499f9fd11041f27fd0]
# 
# add_file "packages/sphinx/sphinxbase_0.3.bb"
#  content [3b1dd961ceead2fa3ddcee365c25a67a92bbf933]
# 
# patch "packages/sphinx/sphinxbase_0.1.bb"
#  from [12ca83d031a1c79571bd347ecd7b83bf8b1d76bf]
#    to [3b1dd961ceead2fa3ddcee365c25a67a92bbf933]
#
============================================================
--- packages/sphinx/pocketsphinx_0.4.1.bb	4745c21e4524c5e610b74131b218d823a9aca8b2
+++ packages/sphinx/pocketsphinx_0.4.1.bb	4745c21e4524c5e610b74131b218d823a9aca8b2
@@ -0,0 +1,13 @@
+DESCRIPTION = "CMU PocketSphinx - speech recognition engine for handhelds"
+HOMEPAGE = "http://www.speech.cs.cmu.edu/pocketsphinx/"
+LICENSE = "BSD"
+DEPENDS = "sphinxbase"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/${PN}-${PV}.tar.bz2 \
+           file://cross-compile.patch;patch=1"
+
+inherit autotools
+
+do_configure () {
+    CPPFLAGS="-I${STAGING_INCDIR}/sphinxbase" oe_runconf
+}
============================================================
--- packages/sphinx/sphinx-fpu.inc	06f4db8c932cbdad484b83499f9fd11041f27fd0
+++ packages/sphinx/sphinx-fpu.inc	06f4db8c932cbdad484b83499f9fd11041f27fd0
@@ -0,0 +1,6 @@
+
+def get_sphinx_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--enable-fixed"
+	return ""
+
============================================================
--- packages/sphinx/sphinxbase_0.3.bb	3b1dd961ceead2fa3ddcee365c25a67a92bbf933
+++ packages/sphinx/sphinxbase_0.3.bb	3b1dd961ceead2fa3ddcee365c25a67a92bbf933
@@ -0,0 +1,14 @@
+DESCRIPTION = "Base library for CMU Sphinx speech recognition engines"
+HOMEPAGE = "http://www.speech.cs.cmu.edu/pocketsphinx/"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/sphinxbase-${PV}.tar.bz2"
+
+inherit autotools
+
+require sphinx-fpu.inc
+EXTRA_OECONF += "${@get_sphinx_fpu_setting(bb, d)}"
+
+do_stage () {
+    autotools_stage_all
+}
============================================================
--- packages/sphinx/sphinxbase_0.1.bb	12ca83d031a1c79571bd347ecd7b83bf8b1d76bf
+++ packages/sphinx/sphinxbase_0.1.bb	3b1dd961ceead2fa3ddcee365c25a67a92bbf933
@@ -2,11 +2,12 @@ LICENSE = "BSD"
 HOMEPAGE = "http://www.speech.cs.cmu.edu/pocketsphinx/"
 LICENSE = "BSD"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/sphinxbase-0.1.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/sphinxbase-${PV}.tar.bz2"
 
 inherit autotools
 
-EXTRA_OECONF = "--enable-fixed"
+require sphinx-fpu.inc
+EXTRA_OECONF += "${@get_sphinx_fpu_setting(bb, d)}"
 
 do_stage () {
     autotools_stage_all