diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-multimedia/libsamplerate | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-multimedia/libsamplerate')
-rw-r--r-- | poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch | 62 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb | 28 |
2 files changed, 90 insertions, 0 deletions
diff --git a/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch new file mode 100644 index 000000000..d19b514e6 --- /dev/null +++ b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch @@ -0,0 +1,62 @@ +From 957ebce3837588f71016e37ffaf9aad0a9d41cec Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <tanuk@iki.fi> +Date: Fri, 23 Sep 2016 12:02:06 +0300 +Subject: [PATCH] configure.ac: improve alsa handling + +Three improvements: + +1) "--enable-alsa" or "--disable-alsa" caused a warning about an +unsupported configure option, because AC_ARG_ENABLE was not used. + +2) If alsa was disabled, the "Have ALSA" item in the summary would print +an empty string instead of "no". + +3) If "--enable-alsa" was passed to configure, but the headers were not +found, configure would still succeed (with alsa disabled). It's better +to fail and abort configure if a feature that was explicitly requested +can't be enabled. + +Upstream-Status: Submitted [sent to src@mega-nerd.com] + +Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> +--- + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 474c6ab..bad597e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,6 +101,9 @@ AC_ARG_ENABLE(cpu-clip, + AC_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper]), + ac_arg_cpu_clip="N", ac_arg_cpu_clip="Y") + ++AC_ARG_ENABLE(alsa, ++ AC_HELP_STRING([--disable-alsa], [disable ALSA support in the varispeed-play example program])) ++ + #==================================================================================== + # Check types and their sizes. + +@@ -194,6 +197,10 @@ if test x$enable_alsa != xno ; then + if test x$ac_cv_header_alsa_asoundlib_h = xyes ; then + ALSA_LIBS="-lasound" + enable_alsa=yes ++ elif test x$enable_alsa = xyes ; then ++ AC_MSG_ERROR(["ALSA headers not found"]) ++ else ++ enable_alsa=no + fi + fi + +@@ -340,7 +347,7 @@ AC_MSG_RESULT([ + Have FFTW : ................... ${ac_cv_fftw3}]) + + AC_MSG_RESULT([ Have libsndfile : ............. ${ac_cv_sndfile}]) +-AC_MSG_RESULT([ Have ALSA : ................... ${ac_cv_header_alsa_asoundlib_h} ++AC_MSG_RESULT([ Have ALSA : ................... ${enable_alsa} + ]) + + AC_MSG_RESULT([ Installation directories : +-- +2.9.3 + diff --git a/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb new file mode 100644 index 000000000..ae0818944 --- /dev/null +++ b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb @@ -0,0 +1,28 @@ +SUMMARY = "Audio Sample Rate Conversion library" +HOMEPAGE = "http://www.mega-nerd.com/SRC/" +SECTION = "libs" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=336d6faf40fb600bafb0061f4052f1f4 \ + file://src/samplerate.c;beginline=1;endline=7;md5=5b6982a8c2811c7312c13cccbf55f55e" +DEPENDS = "libsndfile1" +PR = "r1" + +SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \ + file://0001-configure.ac-improve-alsa-handling.patch \ +" + +SRC_URI[md5sum] = "2b78ae9fe63b36b9fbb6267fad93f259" +SRC_URI[sha256sum] = "0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1" + +CVE_PRODUCT = "libsamplerate" + +UPSTREAM_CHECK_URI = "http://www.mega-nerd.com/SRC/download.html" + +S = "${WORKDIR}/libsamplerate-${PV}" + +inherit autotools pkgconfig + +# FFTW and ALSA are only used in tests and examples, so they don't affect +# normal builds. It should be safe to ignore these, but explicitly disabling +# them adds some extra certainty that builds are deterministic. +EXTRA_OECONF = "--disable-fftw --disable-alsa" |