2 files changed, 24 insertions, 31 deletions

diff --git a/meta/packages/speex/speex_1.1.12+1.2beta2.bb b/meta/packages/speex/speex_1.1.12+1.2beta2.bb
new file mode 100644
index 0000000000..f60408d50a
--- /dev/null
+++ b/meta/packages/speex/speex_1.1.12+1.2beta2.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
+SECTION = "libs"
+LICENSE = "BSD"
+HOMEPAGE = "http://www.speex.org"
+DEPENDS = "libogg"
+
+SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta2.tar.gz"
+S = "${WORKDIR}/${PN}-1.2beta2"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
+                 --with-ogg-includes=${STAGING_INCDIR} --disable-oggtest"
+
+do_stage() {
+    autotools_stage_all
+}
+
+PACKAGES += "${PN}-bin"
+FILES_${PN} = "${libdir}/libspeex.so.*"
+FILES_${PN}-dev += "${libdir}/libspeex.so.*"
+FILES_${PN}-bin = "${bindir}"
diff --git a/meta/packages/speex/speex_1.1.7.bb b/meta/packages/speex/speex_1.1.7.bb
deleted file mode 100644
index 624f76287c..0000000000
--- a/meta/packages/speex/speex_1.1.7.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
-SECTION = "libs"
-LICENSE = "BSD"
-HOMEPAGE = "http://www.speex.org"
-DEPENDS = "libogg"
-PR = "r1"
-
-SRC_URI = "http://downloads.us.xiph.org/releases/speex/${PN}-${PV}.tar.gz"
-
-inherit autotools
-
-# Some interesting options are:
-#
-#       --enable-arm4-asm
-#       --enable-arm5e-asm
-#       --enable-fixed-point
-#
-# NB: the arm assembly is currently broken :(
-#
-
-EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} --with-ogg-includes=${STAGING_INCDIR}"
-
-do_stage() {
-        oe_libinstall -C libspeex/.libs -so libspeex ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}/speex
-        install -m 0644 include/speex/speex.h ${STAGING_INCDIR}/speex
-        install -m 0644 include/speex/speex_bits.h ${STAGING_INCDIR}/speex
-        install -m 0644 include/speex/speex_callbacks.h ${STAGING_INCDIR}/speex
-        install -m 0644 include/speex/speex_header.h ${STAGING_INCDIR}/speex
-        install -m 0644 include/speex/speex_stereo.h ${STAGING_INCDIR}/speex
-}