From b0f63ca68ccaf2116fa275e8551f8d78af9d3ac2 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Mon, 8 Feb 2016 15:07:51 +0100 Subject: libopus: upgrade to version 1.1.2 This release includes support for Ne10 to improve performance on ARM NEON capable CPUs. Also, packageconfigs are introduced for controlling whether Opus uses fixed or floating point processing and whether or not fast floating point approximations are enabled. libopus-fpu.inc wasn't doing much, and was fully integrated into the main recipe. Signed-off-by: Carlos Rafael Giani Signed-off-by: Martin Jansa --- meta-oe/recipes-multimedia/libopus/libopus-fpu.inc | 6 --- .../recipes-multimedia/libopus/libopus_1.1.2.bb | 50 ++++++++++++++++++++++ meta-oe/recipes-multimedia/libopus/libopus_1.1.bb | 34 --------------- 3 files changed, 50 insertions(+), 40 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libopus/libopus-fpu.inc create mode 100644 meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb delete mode 100644 meta-oe/recipes-multimedia/libopus/libopus_1.1.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-multimedia/libopus/libopus-fpu.inc b/meta-oe/recipes-multimedia/libopus/libopus-fpu.inc deleted file mode 100644 index 8464664d86..0000000000 --- a/meta-oe/recipes-multimedia/libopus/libopus-fpu.inc +++ /dev/null @@ -1,6 +0,0 @@ - -def get_libopus_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', True) in [ 'soft' ]: - return "--enable-fixed-point" - return "" - diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb new file mode 100644 index 0000000000..9d9a6342e6 --- /dev/null +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb @@ -0,0 +1,50 @@ +SUMMARY = "Opus Audio Codec" +DESCRIPTION = "The Opus codec is designed for interactive \ +speech and audio transmission over the Internet. It is \ +designed by the IETF Codec Working Group and incorporates \ +technology from Skype's SILK codec and Xiph.Org's CELT codec." +HOMEPAGE = "http://www.opus-codec.org/" +SECTION = "libs/multimedia" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" + +SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" +SRC_URI[md5sum] = "1f08a661bc72930187893a07f3741a91" +SRC_URI[sha256sum] = "0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd" + +S = "${WORKDIR}/opus-${PV}" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[fixed-point] = "--enable-fixed-point,," +PACKAGECONFIG[float-approx] = "--enable-float-approx,," + +EXTRA_OECONF = "--with-NE10-includes=${STAGING_DIR_TARGET}${includedir} \ + --with-NE10-libraries=${STAGING_DIR_TARGET}${libdir} \ + --enable-asm \ + --enable-intrinsics \ + " + +python () { + if d.getVar('TARGET_FPU', True) in [ 'soft' ]: + d.appendVar('PACKAGECONFIG', ' fixed-point') + + # Ne10 is only available for armv7 and aarch64 + if any((t.startswith('armv7') or t.startswith('aarch64')) for t in d.getVar('TUNE_FEATURES', True).split()): + d.appendVar('DEPENDS', ' ne10') +} + +# Fails to build with thumb-1 (qemuarm) +#| {standard input}: Assembler messages: +#| {standard input}:389: Error: selected processor does not support Thumb mode `smull r5,r7,r1,r4' +#| {standard input}:418: Error: selected processor does not support Thumb mode `smull r5,r6,r4,r1' +#| {standard input}:448: Error: selected processor does not support Thumb mode `smull r4,r5,r1,r0' +#| {standard input}:474: Error: selected processor does not support Thumb mode `smull r0,r4,r8,r1' +#| {standard input}:510: Error: selected processor does not support Thumb mode `smull fp,r0,r10,r1' +#| {standard input}:553: Error: selected processor does not support Thumb mode `smull fp,r1,r10,r3' +#| {standard input}:741: Error: selected processor does not support Thumb mode `smull r3,r0,r6,r10' +#| {standard input}:761: Error: selected processor does not support Thumb mode `smull fp,r2,r3,r9' +#| {standard input}:773: Error: selected processor does not support Thumb mode `smull fp,r3,r5,r8' +#| make[2]: *** [celt/celt.lo] Error 1 +ARM_INSTRUCTION_SET = "arm" diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.1.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.1.bb deleted file mode 100644 index 948d4df36c..0000000000 --- a/meta-oe/recipes-multimedia/libopus/libopus_1.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Opus Audio Codec" -DESCRIPTION = "The Opus codec is designed for interactive \ -speech and audio transmission over the Internet. It is \ -designed by the IETF Codec Working Group and incorporates \ -technology from Skype's SILK codec and Xiph.Org's CELT codec." -HOMEPAGE = "http://www.opus-codec.org/" -SECTION = "libs/multimedia" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" - -SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" -SRC_URI[md5sum] = "c5a8cf7c0b066759542bc4ca46817ac6" -SRC_URI[sha256sum] = "b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95" - -S = "${WORKDIR}/opus-${PV}" - -inherit autotools pkgconfig - -require libopus-fpu.inc -EXTRA_OECONF = "${@get_libopus_fpu_setting(bb, d)}" - -# Fails to build with thumb-1 (qemuarm) -#| {standard input}: Assembler messages: -#| {standard input}:389: Error: selected processor does not support Thumb mode `smull r5,r7,r1,r4' -#| {standard input}:418: Error: selected processor does not support Thumb mode `smull r5,r6,r4,r1' -#| {standard input}:448: Error: selected processor does not support Thumb mode `smull r4,r5,r1,r0' -#| {standard input}:474: Error: selected processor does not support Thumb mode `smull r0,r4,r8,r1' -#| {standard input}:510: Error: selected processor does not support Thumb mode `smull fp,r0,r10,r1' -#| {standard input}:553: Error: selected processor does not support Thumb mode `smull fp,r1,r10,r3' -#| {standard input}:741: Error: selected processor does not support Thumb mode `smull r3,r0,r6,r10' -#| {standard input}:761: Error: selected processor does not support Thumb mode `smull fp,r2,r3,r9' -#| {standard input}:773: Error: selected processor does not support Thumb mode `smull fp,r3,r5,r8' -#| make[2]: *** [celt/celt.lo] Error 1 -ARM_INSTRUCTION_SET = "arm" -- cgit 1.2.3-korg