summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc6
-rw-r--r--packages/speex/speex_1.0.4.bb27
-rw-r--r--packages/speex/speex_1.1.12.bb36
-rw-r--r--packages/speex/speex_1.1.7.bb36
-rw-r--r--packages/speex/speex_1.2.bb (renamed from packages/speex/speex_1.2-beta3.bb)22
5 files changed, 17 insertions, 110 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index a03f42fe0d..62fbfec9ff 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1555,8 +1555,8 @@ PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
PREFERRED_VERSION_python-pyrad ?= "0.8"
PREFERRED_VERSION_python-pyraf ?= "1.4"
PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
-PREFERRED_VERSION_python-pyrex ?= "0.9.8"
-PREFERRED_VERSION_python-pyrex-native ?= "0.9.8"
+PREFERRED_VERSION_python-pyrex ?= "0.9.8.4"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.4"
PREFERRED_VERSION_python-pyro ?= "3.7"
PREFERRED_VERSION_python-pyserial ?= "2.2"
PREFERRED_VERSION_python-pytester ?= "0.6.0"
@@ -1764,7 +1764,7 @@ PREFERRED_VERSION_sox-native ?= "13.0.0"
PREFERRED_VERSION_spandsp ?= "0.0.3"
PREFERRED_VERSION_spca5xx ?= "20060501"
PREFERRED_VERSION_spectrum-fw ?= "1.0"
-PREFERRED_VERSION_speex ?= "1.1.12"
+PREFERRED_VERSION_speex ?= "1.1+1.2rc1"
PREFERRED_VERSION_sphinxbase ?= "0.1"
PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2"
PREFERRED_VERSION_squashfs-lzma-tools-native ?= "3.1r2"
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.*"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 11:20:09 +0000