diff options
-rw-r--r-- | meta/recipes-multimedia/speex/speex-fpu.inc | 4 | ||||
-rw-r--r-- | meta/recipes-multimedia/speex/speex_1.2rc2.bb (renamed from meta/recipes-multimedia/speex/speex_1.2rc1.bb) | 18 |
2 files changed, 7 insertions, 15 deletions
diff --git a/meta/recipes-multimedia/speex/speex-fpu.inc b/meta/recipes-multimedia/speex/speex-fpu.inc deleted file mode 100644 index 2571d32484..0000000000 --- a/meta/recipes-multimedia/speex/speex-fpu.inc +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | def get_speex_fpu_setting(bb, d): | ||
2 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: | ||
3 | return "--enable-fixed-point --disable-float-api --disable-vbr" | ||
4 | return "" | ||
diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc2.bb index 5ff50b7383..f7d23dbd7c 100644 --- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb +++ b/meta/recipes-multimedia/speex/speex_1.2rc2.bb | |||
@@ -4,20 +4,16 @@ HOMEPAGE = "http://www.speex.org" | |||
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "BSD" | 5 | LICENSE = "BSD" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \ |
7 | file://include/speex/speex.h;beginline=1;endline=34;md5=a68129f78d7fe66e07163f73aba143b3" | 7 | file://include/speex/speex.h;beginline=1;endline=34;md5=ef8c8ea4f7198d71cf3509c6ed05ea50" |
8 | DEPENDS = "libogg" | 8 | DEPENDS = "libogg speexdsp" |
9 | |||
10 | PR = "r2" | ||
11 | 9 | ||
12 | SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz" | 10 | SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz" |
13 | 11 | ||
14 | SRC_URI[md5sum] = "c4438b22c08e5811ff10e2b06ee9b9ae" | 12 | SRC_URI[md5sum] = "6ae7db3bab01e1d4b86bacfa8ca33e81" |
15 | SRC_URI[sha256sum] = "342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6" | 13 | SRC_URI[sha256sum] = "caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891" |
16 | 14 | ||
17 | inherit autotools pkgconfig lib_package | 15 | inherit autotools pkgconfig lib_package |
18 | 16 | ||
19 | EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \ | 17 | EXTRA_OECONF = "\ |
20 | --with-ogg-includes=${STAGING_INCDIR} --disable-oggtest" | 18 | ${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point --disable-float-api --disable-vbr', '', d)} \ |
21 | 19 | " | |
22 | require speex-fpu.inc | ||
23 | EXTRA_OECONF += "${@get_speex_fpu_setting(bb, d)}" | ||