blob: cb1778bede995f129aefe37b6856e7e63cac7e27 [file] [log] [blame]
Patrick Williams03907ee2022-05-01 06:28:52 -05001From 593256a3e386a4e17fe26cfbfb813cf4996447d7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 4 Apr 2022 19:46:44 +0200
4Subject: [PATCH] Disable opus library
5
6We don't have opus in OE-Core which causes all the external libs to be disabled
Andrew Geissler9aee5002022-03-30 16:27:02 +00007silently. The silent issue is discussed in the link below and hints a patch
8to make things configurable may be accepted.
9
10This patch removing the opus piece at least gets most of the functionality
11we previously used back whilst the issue is discussed.
12
Patrick Williams03907ee2022-05-01 06:28:52 -050013Upstream-Status: Denied [https://github.com/libsndfile/libsndfile/pull/812]
Andrew Geissler9aee5002022-03-30 16:27:02 +000014
15Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patrick Williams03907ee2022-05-01 06:28:52 -050016Signed-off-by: Alexander Kanavin <alex@linutronix.de>
17---
18 configure.ac | 10 +++++-----
19 src/ogg_opus.c | 2 +-
20 2 files changed, 6 insertions(+), 6 deletions(-)
Andrew Geissler9aee5002022-03-30 16:27:02 +000021
Patrick Williams03907ee2022-05-01 06:28:52 -050022diff --git a/configure.ac b/configure.ac
23index 727b67bc..f9d2e447 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -373,13 +373,13 @@ AS_IF([test -n "$PKG_CONFIG"], [
Andrew Geissler9aee5002022-03-30 16:27:02 +000027 enable_external_libs=yes
28 ])
29
30- AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyesyes"], [
31+ AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc" = "xyesyesyesyes"], [
32 HAVE_EXTERNAL_XIPH_LIBS=1
33 enable_external_libs=yes
34
35- EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS "
36- EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS "
37- EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc opus"
38+ EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OGG_CFLAGS "
39+ EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OGG_LIBS "
40+ EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc"
41
42 if test x$ac_cv_speex = "xyes" ; then
43 EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex"
Patrick Williams03907ee2022-05-01 06:28:52 -050044@@ -788,7 +788,7 @@ AC_MSG_RESULT([
Andrew Geissler9aee5002022-03-30 16:27:02 +000045
46 Experimental code : ................... ${enable_experimental:-no}
47 Using ALSA in example programs : ...... ${enable_alsa:-no}
48- External FLAC/Ogg/Vorbis/Opus : ....... ${enable_external_libs:-no}
49+ External FLAC/Ogg/Vorbis : ....... ${enable_external_libs:-no}
Patrick Williams03907ee2022-05-01 06:28:52 -050050 External MPEG Lame/MPG123 : ........... ${enable_mpeg:-no}
Andrew Geissler9aee5002022-03-30 16:27:02 +000051 Building Octave interface : ........... ${OCTAVE_BUILD}
52
Patrick Williams03907ee2022-05-01 06:28:52 -050053diff --git a/src/ogg_opus.c b/src/ogg_opus.c
54index dfa446ee..0d4fe57b 100644
55--- a/src/ogg_opus.c
56+++ b/src/ogg_opus.c
Andrew Geissler9aee5002022-03-30 16:27:02 +000057@@ -159,7 +159,7 @@
58 #include "sfendian.h"
59 #include "common.h"
60
61-#if HAVE_EXTERNAL_XIPH_LIBS
62+#if 0
63
64 #include <ogg/ogg.h>
65 #include <opus/opus.h>
Patrick Williams03907ee2022-05-01 06:28:52 -050066--
672.30.2
68