From 2921dfb021d98d37f8172fcec3a92255bc00452d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 7 Apr 2022 19:00:21 +0200 Subject: libsndfile1: update 1.0.31 -> 1.1.0 (From OE-Core rev: 808d63cf8a2cc4ee7ce22eb0ac18beab01885a04) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libsndfile/libsndfile1/noopus.patch | 39 ++++++++++++++-------- .../libsndfile/libsndfile1_1.0.31.bb | 33 ------------------ .../libsndfile/libsndfile1_1.1.0.bb | 32 ++++++++++++++++++ 3 files changed, 58 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1_1.1.0.bb diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch index 6bcb932429..cb1778bede 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch +++ b/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch @@ -1,19 +1,29 @@ -We don't have opus in OE-Core which causes all the external libs to be disabled +From 593256a3e386a4e17fe26cfbfb813cf4996447d7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 4 Apr 2022 19:46:44 +0200 +Subject: [PATCH] Disable opus library + +We don't have opus in OE-Core which causes all the external libs to be disabled silently. The silent issue is discussed in the link below and hints a patch to make things configurable may be accepted. This patch removing the opus piece at least gets most of the functionality we previously used back whilst the issue is discussed. -Upstream-Status: Pending [https://github.com/libsndfile/libsndfile/pull/812] +Upstream-Status: Denied [https://github.com/libsndfile/libsndfile/pull/812] Signed-off-by: Richard Purdie +Signed-off-by: Alexander Kanavin +--- + configure.ac | 10 +++++----- + src/ogg_opus.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) -Index: libsndfile-1.0.31/configure.ac -=================================================================== ---- libsndfile-1.0.31.orig/configure.ac -+++ libsndfile-1.0.31/configure.ac -@@ -361,13 +361,13 @@ AS_IF([test -n "$PKG_CONFIG"], [ +diff --git a/configure.ac b/configure.ac +index 727b67bc..f9d2e447 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -373,13 +373,13 @@ AS_IF([test -n "$PKG_CONFIG"], [ enable_external_libs=yes ]) @@ -31,19 +41,19 @@ Index: libsndfile-1.0.31/configure.ac if test x$ac_cv_speex = "xyes" ; then EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex" -@@ -716,7 +716,7 @@ AC_MSG_RESULT([ +@@ -788,7 +788,7 @@ AC_MSG_RESULT([ Experimental code : ................... ${enable_experimental:-no} Using ALSA in example programs : ...... ${enable_alsa:-no} - External FLAC/Ogg/Vorbis/Opus : ....... ${enable_external_libs:-no} + External FLAC/Ogg/Vorbis : ....... ${enable_external_libs:-no} + External MPEG Lame/MPG123 : ........... ${enable_mpeg:-no} Building Octave interface : ........... ${OCTAVE_BUILD} - Tools : -Index: libsndfile-1.0.31/src/ogg_opus.c -=================================================================== ---- libsndfile-1.0.31.orig/src/ogg_opus.c -+++ libsndfile-1.0.31/src/ogg_opus.c +diff --git a/src/ogg_opus.c b/src/ogg_opus.c +index dfa446ee..0d4fe57b 100644 +--- a/src/ogg_opus.c ++++ b/src/ogg_opus.c @@ -159,7 +159,7 @@ #include "sfendian.h" #include "common.h" @@ -53,3 +63,6 @@ Index: libsndfile-1.0.31/src/ogg_opus.c #include #include +-- +2.30.2 + diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb deleted file mode 100644 index ea14fe29cb..0000000000 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Audio format Conversion library" -DESCRIPTION = "Library for reading and writing files containing sampled \ -sound (such as MS Windows WAV and the Apple/SGI AIFF format) through \ -one standard library interface." -HOMEPAGE = "https://libsndfile.github.io/libsndfile/" -AUTHOR = "Erik de Castro Lopo" -DEPENDS = "flac libogg libvorbis" -SECTION = "libs/multimedia" -LICENSE = "LGPL-2.1-only" - -SRC_URI = "https://github.com/libsndfile/libsndfile/releases/download/${PV}/libsndfile-${PV}.tar.bz2 \ - file://noopus.patch \ - " -UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsndfile/releases/" - -SRC_URI[md5sum] = "3f3b2a86a032f064ef922a2c8c191f7b" -SRC_URI[sha256sum] = "a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163" - -LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a" - -CVE_PRODUCT = "libsndfile" - -S = "${WORKDIR}/libsndfile-${PV}" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" -PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3" - -inherit autotools lib_package pkgconfig multilib_header - -do_install:append() { - oe_multilib_header sndfile.h -} diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.1.0.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.1.0.bb new file mode 100644 index 0000000000..70626b3c16 --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.1.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "Audio format Conversion library" +DESCRIPTION = "Library for reading and writing files containing sampled \ +sound (such as MS Windows WAV and the Apple/SGI AIFF format) through \ +one standard library interface." +HOMEPAGE = "https://libsndfile.github.io/libsndfile/" +AUTHOR = "Erik de Castro Lopo" +DEPENDS = "flac libogg libvorbis" +SECTION = "libs/multimedia" +LICENSE = "LGPL-2.1-only" + +SRC_URI = "https://github.com/libsndfile/libsndfile/releases/download/${PV}/libsndfile-${PV}.tar.xz \ + file://noopus.patch \ + " +UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsndfile/releases/" + +SRC_URI[sha256sum] = "0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41" + +LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a" + +CVE_PRODUCT = "libsndfile" + +S = "${WORKDIR}/libsndfile-${PV}" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3" + +inherit autotools lib_package pkgconfig multilib_header + +do_install:append() { + oe_multilib_header sndfile.h +} -- cgit v1.2.3-54-g00ecf