From c7cb0ce17dc2ec3999f26d594e755c8fb9609cee Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Wed, 2 Nov 2016 17:39:09 +0200 Subject: libsamplerate0: clean up dependencies The flac dependency was completely bogus. Flac isn't used at all. FFTW is only used by tests, so we don't need to provide a packageconfig for that. ALSA is only used by example code that isn't part of the packaged files, so even if ALSA is enabled, it doesn't affect the build result. Nevertheless, I prefer to disable it explicitly to be extra sure. --disable-alsa resulted in a warning about an unsupported configure option, although by some magic it seemed to actually work as expected. A patch is added to get rid of that warning. Signed-off-by: Tanu Kaskinen Signed-off-by: Ross Burton --- .../0001-configure.ac-improve-alsa-handling.patch | 62 ++++++++++++++++++++++ .../libsamplerate/libsamplerate0_0.1.9.bb | 11 ++-- 2 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch (limited to 'meta') diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch b/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch new file mode 100644 index 0000000000..d19b514e6b --- /dev/null +++ b/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 +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 +--- + 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/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb index a24b8c7abc..5473bffca4 100644 --- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb +++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb @@ -4,10 +4,12 @@ SECTION = "libs" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=336d6faf40fb600bafb0061f4052f1f4 \ file://src/samplerate.c;beginline=1;endline=7;md5=5b6982a8c2811c7312c13cccbf55f55e" -DEPENDS = "flac libsndfile1" +DEPENDS = "libsndfile1" PR = "r1" -SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz" +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" @@ -18,4 +20,7 @@ S = "${WORKDIR}/libsamplerate-${PV}" inherit autotools pkgconfig -PACKAGECONFIG[fftw] = ",--disable-fftw,fftw" +# 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" -- cgit 1.2.3-korg