diff options
Diffstat (limited to 'poky/meta/recipes-multimedia/libsndfile')
-rw-r--r-- | poky/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch | 39 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.1.0.bb (renamed from poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb) | 5 |
2 files changed, 28 insertions, 16 deletions
diff --git a/poky/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch b/poky/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch index 6bcb932429..cb1778bede 100644 --- a/poky/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch +++ b/poky/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 <alex@linutronix.de> +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 <richard.purdie@linuxfoundation.org> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + 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 <ogg/ogg.h> #include <opus/opus.h> +-- +2.30.2 + diff --git a/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb b/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.1.0.bb index ea14fe29cb..70626b3c16 100644 --- a/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb +++ b/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.1.0.bb @@ -8,13 +8,12 @@ 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 \ +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[md5sum] = "3f3b2a86a032f064ef922a2c8c191f7b" -SRC_URI[sha256sum] = "a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163" +SRC_URI[sha256sum] = "0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41" LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a" |