summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch62
-rw-r--r--meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch13
-rw-r--r--meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb (renamed from meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb)14
3 files changed, 5 insertions, 84 deletions
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
deleted file mode 100644
index d19b514e6b..0000000000
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 957ebce3837588f71016e37ffaf9aad0a9d41cec Mon Sep 17 00:00:00 2001
2From: Tanu Kaskinen <tanuk@iki.fi>
3Date: Fri, 23 Sep 2016 12:02:06 +0300
4Subject: [PATCH] configure.ac: improve alsa handling
5
6Three improvements:
7
81) "--enable-alsa" or "--disable-alsa" caused a warning about an
9unsupported configure option, because AC_ARG_ENABLE was not used.
10
112) If alsa was disabled, the "Have ALSA" item in the summary would print
12an empty string instead of "no".
13
143) If "--enable-alsa" was passed to configure, but the headers were not
15found, configure would still succeed (with alsa disabled). It's better
16to fail and abort configure if a feature that was explicitly requested
17can't be enabled.
18
19Upstream-Status: Submitted [sent to src@mega-nerd.com]
20
21Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
22---
23 configure.ac | 9 ++++++++-
24 1 file changed, 8 insertions(+), 1 deletion(-)
25
26diff --git a/configure.ac b/configure.ac
27index 474c6ab..bad597e 100644
28--- a/configure.ac
29+++ b/configure.ac
30@@ -101,6 +101,9 @@ AC_ARG_ENABLE(cpu-clip,
31 AC_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper]),
32 ac_arg_cpu_clip="N", ac_arg_cpu_clip="Y")
33
34+AC_ARG_ENABLE(alsa,
35+ AC_HELP_STRING([--disable-alsa], [disable ALSA support in the varispeed-play example program]))
36+
37 #====================================================================================
38 # Check types and their sizes.
39
40@@ -194,6 +197,10 @@ if test x$enable_alsa != xno ; then
41 if test x$ac_cv_header_alsa_asoundlib_h = xyes ; then
42 ALSA_LIBS="-lasound"
43 enable_alsa=yes
44+ elif test x$enable_alsa = xyes ; then
45+ AC_MSG_ERROR(["ALSA headers not found"])
46+ else
47+ enable_alsa=no
48 fi
49 fi
50
51@@ -340,7 +347,7 @@ AC_MSG_RESULT([
52 Have FFTW : ................... ${ac_cv_fftw3}])
53
54 AC_MSG_RESULT([ Have libsndfile : ............. ${ac_cv_sndfile}])
55-AC_MSG_RESULT([ Have ALSA : ................... ${ac_cv_header_alsa_asoundlib_h}
56+AC_MSG_RESULT([ Have ALSA : ................... ${enable_alsa}
57 ])
58
59 AC_MSG_RESULT([ Installation directories :
60--
612.9.3
62
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch b/meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch
deleted file mode 100644
index b42d564b4b..0000000000
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: libsamplerate-0.1.8/configure.ac
2===================================================================
3--- libsamplerate-0.1.8.orig/configure.ac
4+++ libsamplerate-0.1.8/configure.ac
5@@ -53,7 +53,7 @@ AC_PROG_LN_S
6 # 6. If any interfaces have been removed since the last public release, then set age
7 # to 0.
8
9-SHARED_VERSION_INFO="1:8:1"
10+SHARED_VERSION_INFO="1:9:1"
11
12
13
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
index 8345d6880f..ed2b6437dd 100644
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb
+++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
@@ -1,24 +1,20 @@
1SUMMARY = "Audio Sample Rate Conversion library" 1SUMMARY = "Audio Sample Rate Conversion library"
2DESCRIPTION = "Also known as Secret Rabbit Code - a library for performing sample rate conversion of audio data." 2DESCRIPTION = "Also known as Secret Rabbit Code - a library for performing sample rate conversion of audio data."
3HOMEPAGE = "http://www.mega-nerd.com/SRC/" 3HOMEPAGE = "https://libsndfile.github.io/libsamplerate/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "BSD-2-Clause" 5LICENSE = "BSD-2-Clause"
6LIC_FILES_CHKSUM = "file://COPYING;md5=336d6faf40fb600bafb0061f4052f1f4 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=336d6faf40fb600bafb0061f4052f1f4 \
7 file://src/samplerate.c;beginline=1;endline=7;md5=5b6982a8c2811c7312c13cccbf55f55e" 7 file://src/samplerate.c;beginline=1;endline=7;md5=7a4238289dc36bfb70968ccaa5bd0d4f"
8DEPENDS = "libsndfile1" 8DEPENDS = "libsndfile1"
9PR = "r1"
10 9
11SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \ 10SRC_URI = "https://github.com/libsndfile/libsamplerate/releases/download/${PV}/libsamplerate-${PV}.tar.xz \
12 file://0001-configure.ac-improve-alsa-handling.patch \
13 file://shared_version_info.patch \
14" 11"
15 12
16SRC_URI[md5sum] = "2b78ae9fe63b36b9fbb6267fad93f259" 13SRC_URI[sha256sum] = "3258da280511d24b49d6b08615bbe824d0cacc9842b0e4caf11c52cf2b043893"
17SRC_URI[sha256sum] = "0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1"
18 14
19CVE_PRODUCT = "libsamplerate" 15CVE_PRODUCT = "libsamplerate"
20 16
21UPSTREAM_CHECK_URI = "http://www.mega-nerd.com/SRC/download.html" 17UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsamplerate/releases"
22 18
23S = "${WORKDIR}/libsamplerate-${PV}" 19S = "${WORKDIR}/libsamplerate-${PV}"
24 20