merge of 'aeb1ac8ac964032ee256054d8009fd226a984570'

     and 'b86db14f5edd4f268d21ba089697b479d09548ce'

4 files changed, 14 insertions, 107 deletions

diff --git a/packages/speex/speex_1.0.4.bb b/packages/speex/speex_1.0.4.bb
deleted file mode 100644
index e1af8d18da..0000000000
--- a/packages/speex/speex_1.0.4.bb
+++ /dev/null
@@ -1,27 +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 = "r0"
-
-SRC_URI = "http://www.speex.org/download/speex-${PV}.tar.gz"
-
-inherit autotools
-
-do_configure_append() {
-  sed -i s/"^OGG_INCLUDES.*$"/"OGG_INCLUDES = "/g src/Makefile
-  sed -i s/"^OGG_LDFLAGSS.*$"/"OGG_LDFLAGS = "/g src/Makefile
-}
-
-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
-  install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
-}
-
diff --git a/packages/speex/speex_1.1.12.bb b/packages/speex/speex_1.1.12.bb
deleted file mode 100644
index 7417ce4504..0000000000
--- a/packages/speex/speex_1.1.12.bb
+++ /dev/null
@@ -1,36 +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 = "r2"
-
-SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz"
-
-PARALLEL_MAKE = ""
-
-inherit autotools pkgconfig
-
-# Some interesting options are:
-#
-#	--enable-arm4-asm
-#	--enable-arm5e-asm
-#	--enable-fixed-point
-#
-
-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 "
-
-do_configure_append() {
-	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
-	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
-}
-
-do_stage() {
-	oe_libinstall -C libspeex -so libspeex ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/speex
-	install -m 0644 include/speex/*.h ${STAGING_INCDIR}/speex
-	install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/speex/speex_1.1.7.bb b/packages/speex/speex_1.1.7.bb
deleted file mode 100644
index ef818794de..0000000000
--- a/packages/speex/speex_1.1.7.bb
+++ /dev/null
@@ -1,36 +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://www.speex.org/download/speex-${PV}.tar.gz"
-
-inherit autotools
-
-# Some interesting options are:
-#
-#	--enable-arm4-asm
-#	--enable-arm5e-asm
-#	--enable-fixed-point
-#
-
-EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point"
-
-do_configure_append() {
-	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
-	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
-}
-
-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
-	install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/speex/speex_1.2-beta3.bb b/packages/speex/speex_1.2.bb
index a2aa6652f7..9701646b1e 100644
--- a/packages/speex/speex_1.2-beta3.bb
+++ b/packages/speex/speex_1.2.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
-SECTION = "libs"
+SECTION = "libs/multimedia"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
+BETA = "1.2rc1"
+PV = "1.1+${BETA}"
 PR = "r0"
 
-SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta3.tar.gz"
-S = "${WORKDIR}/${PN}-1.2beta3"
+SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${BETA}.tar.gz"
+S = "${WORKDIR}/speex-${BETA}"
 
 PARALLEL_MAKE = ""
 
@@ -29,15 +31,19 @@ EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disabl
 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
 	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
+	find . -name "Makefile" -exec sed -i s,-I/usr/include,, {} \;
 }
 
 do_stage() {
-	oe_libinstall -C libspeex -so libspeex ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/speex
-	install -m 0644 include/speex/*.h ${STAGING_INCDIR}/speex
-	install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
+	autotools_stage_all
 }
+
+PACKAGES =+ "${PN}-utils ${PN}-dsp"
+FILES_${PN}-utils = "${bindir}/speex*"
+FILES_${PN}-dsp = "${libdir}/libspeexdsp.so.*"
+FILES_${PN} = "${libdir}/libspeex.so.*"