5 files changed, 33 insertions, 53 deletions
diff --git a/packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb b/packages/spandsp/spandsp.inc
index 2c0ffa0845..9f4e5e5fbc 100644
--- a/packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb
+++ b/packages/spandsp/spandsp.inc
@@ -1,17 +1,13 @@
 DESCRIPTION = "A library of many DSP functions for telephony."
 HOMEPAGE = "http://www.soft-switch.org"
-DEPENDS = "tiff libxml2"
 SECTION = "voip"
 LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz"
-S = "${WORKDIR}/${PN}-0.0.3"
+DEPENDS = "tiff libxml2"
 
 inherit autotools
 
-PARALLEL_MAKE = ""
+do_stage () {
+    autotools_stage_all
+}
 
-do_stage () { 
-    autotools_stage_all 
-}
-\ No newline at end of file
+PARALLEL_MAKE = ""
diff --git a/packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb b/packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb
deleted file mode 100644
index bbb1c0c3b2..0000000000
--- a/packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "A library of many DSP functions for telephony."
-HOMEPAGE = "http://www.soft-switch.org"
-DEPENDS = "tiff libxml2"
-SECTION = "voip"
-LICENSE = "GPL"
-
-PR = "r0"
-
-SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.4pre16.tgz"
-
-S = "${WORKDIR}/spandsp-0.0.4"
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-# *cough*
-do_configure_append() {
-	rm config.log
-}
-
-do_stage () { 
-    autotools_stage_all 
-}
diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb
index ec5b6aa784..2dc402ffcb 100644
--- a/packages/spandsp/spandsp_0.0.3.bb
+++ b/packages/spandsp/spandsp_0.0.3.bb
@@ -1,21 +1,10 @@
-DESCRIPTION = "A library of many DSP functions for telephony."
-HOMEPAGE = "http://www.soft-switch.org"
-SECTION = "voip"
-LICENSE = "GPL"
-DEPENDS = "tiff libxml2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz"
 
-inherit autotools
-
-PARALLEL_MAKE = ""
-
 # *cough*
 do_configure_append() {
         rm config.log
 }
 
-do_stage () { 
-    autotools_stage_all 
-}
+require spandsp.inc
diff --git a/packages/spandsp/spandsp_0.0.4-pre16.bb b/packages/spandsp/spandsp_0.0.4-pre16.bb
new file mode 100644
index 0000000000..d1e717ecd4
--- /dev/null
+++ b/packages/spandsp/spandsp_0.0.4-pre16.bb
@@ -0,0 +1,14 @@
+PR = "r1"
+
+SRC_URI = "http://www.soft-switch.org/downloads/spandsp/${PN}-0.0.4pre16.tgz"
+
+S = "${WORKDIR}/spandsp-0.0.4"
+
+# *cough*
+do_configure_append() {
+      rm config.log
+}
+
+require spandsp.inc
+
+DEFAULT_PREFERENCE = "-16"
diff --git a/packages/speex/speex_1.1.12+1.2beta1.bb b/packages/speex/speex_1.2-beta3.bb
index 51ad2f506e..5f060c2321 100644
--- a/packages/speex/speex_1.1.12+1.2beta1.bb
+++ b/packages/speex/speex_1.2-beta3.bb
@@ -3,26 +3,31 @@ SECTION = "libs"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz"
-S = "${WORKDIR}/${PN}-1.2beta1"
+SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta3.tar.gz"
+S = "${WORKDIR}/${PN}-1.2beta3"
 
 PARALLEL_MAKE = ""
 
 inherit autotools pkgconfig
 
+LEAD_SONAME = "libspeex.so"
+
 # Some interesting options are:
 #
 #	--enable-arm4-asm
 #	--enable-arm5e-asm
+#       --enable-blackfin-asm
 #	--enable-fixed-point
+#       --disable-float-api --disable-vbr (must disable-vbr if disable-float-api)
 #
 
-EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point"
-EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point"
-EXTRA_OECONF_append_arm = " --enable-fixed-point "
-EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point "
+EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --diable-vbr "
+EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --diable-vbr "
+EXTRA_OECONF_append_arm = " --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point --disable-float-api --disable-vbr "
 
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile