From cd610f1dcaed81ed235886f77411d9447a9be82a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 17 Nov 2021 16:35:12 +0100 Subject: libsamplerate0: update 0.1.9 -> 0.2.2 Upstream moved to github. Drop both patches: alsa configuration merged upstream, shared version info fixed upstream. License-Update: urls changed to github. (From OE-Core rev: 7676e4964ab53b101f95aef469490643f9d1f52c) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-configure.ac-improve-alsa-handling.patch | 62 ---------------------- .../libsamplerate0/shared_version_info.patch | 13 ----- .../libsamplerate/libsamplerate0_0.1.9.bb | 30 ----------- .../libsamplerate/libsamplerate0_0.2.2.bb | 26 +++++++++ 4 files changed, 26 insertions(+), 105 deletions(-) delete mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch delete mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch delete mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb create mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb 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 @@ -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/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 @@ -Index: libsamplerate-0.1.8/configure.ac -=================================================================== ---- libsamplerate-0.1.8.orig/configure.ac -+++ libsamplerate-0.1.8/configure.ac -@@ -53,7 +53,7 @@ AC_PROG_LN_S - # 6. If any interfaces have been removed since the last public release, then set age - # to 0. - --SHARED_VERSION_INFO="1:8:1" -+SHARED_VERSION_INFO="1:9:1" - - - diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb deleted file mode 100644 index 8345d6880f..0000000000 --- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Audio Sample Rate Conversion library" -DESCRIPTION = "Also known as Secret Rabbit Code - a library for performing sample rate conversion of audio data." -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 \ - file://shared_version_info.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" diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb new file mode 100644 index 0000000000..ed2b6437dd --- /dev/null +++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "Audio Sample Rate Conversion library" +DESCRIPTION = "Also known as Secret Rabbit Code - a library for performing sample rate conversion of audio data." +HOMEPAGE = "https://libsndfile.github.io/libsamplerate/" +SECTION = "libs" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=336d6faf40fb600bafb0061f4052f1f4 \ + file://src/samplerate.c;beginline=1;endline=7;md5=7a4238289dc36bfb70968ccaa5bd0d4f" +DEPENDS = "libsndfile1" + +SRC_URI = "https://github.com/libsndfile/libsamplerate/releases/download/${PV}/libsamplerate-${PV}.tar.xz \ +" + +SRC_URI[sha256sum] = "3258da280511d24b49d6b08615bbe824d0cacc9842b0e4caf11c52cf2b043893" + +CVE_PRODUCT = "libsamplerate" + +UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsamplerate/releases" + +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" -- cgit v1.2.3-54-g00ecf