xref: /OK3568_Linux_fs/yocto/poky/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1*4882a593SmuzhiyunWe don't have opus in OE-Core which causes all the external libs to be disabled
2*4882a593Smuzhiyunsilently. The silent issue is discussed in the link below and hints a patch
3*4882a593Smuzhiyunto make things configurable may be accepted.
4*4882a593Smuzhiyun
5*4882a593SmuzhiyunThis patch removing the opus piece at least gets most of the functionality
6*4882a593Smuzhiyunwe previously used back whilst the issue is discussed.
7*4882a593Smuzhiyun
8*4882a593SmuzhiyunUpstream-Status: Pending [https://github.com/libsndfile/libsndfile/pull/812]
9*4882a593Smuzhiyun
10*4882a593SmuzhiyunSigned-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunIndex: libsndfile-1.0.31/configure.ac
13*4882a593Smuzhiyun===================================================================
14*4882a593Smuzhiyun--- libsndfile-1.0.31.orig/configure.ac
15*4882a593Smuzhiyun+++ libsndfile-1.0.31/configure.ac
16*4882a593Smuzhiyun@@ -361,13 +361,13 @@ AS_IF([test -n "$PKG_CONFIG"], [
17*4882a593Smuzhiyun 				enable_external_libs=yes
18*4882a593Smuzhiyun 			])
19*4882a593Smuzhiyun
20*4882a593Smuzhiyun-			AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyesyes"], [
21*4882a593Smuzhiyun+			AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc" = "xyesyesyesyes"], [
22*4882a593Smuzhiyun 					HAVE_EXTERNAL_XIPH_LIBS=1
23*4882a593Smuzhiyun 					enable_external_libs=yes
24*4882a593Smuzhiyun
25*4882a593Smuzhiyun-					EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS "
26*4882a593Smuzhiyun-					EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS "
27*4882a593Smuzhiyun-					EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc opus"
28*4882a593Smuzhiyun+					EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OGG_CFLAGS "
29*4882a593Smuzhiyun+					EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OGG_LIBS "
30*4882a593Smuzhiyun+					EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc"
31*4882a593Smuzhiyun
32*4882a593Smuzhiyun 					if test x$ac_cv_speex = "xyes" ; then
33*4882a593Smuzhiyun 						EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex"
34*4882a593Smuzhiyun@@ -716,7 +716,7 @@ AC_MSG_RESULT([
35*4882a593Smuzhiyun
36*4882a593Smuzhiyun     Experimental code : ................... ${enable_experimental:-no}
37*4882a593Smuzhiyun     Using ALSA in example programs : ...... ${enable_alsa:-no}
38*4882a593Smuzhiyun-    External FLAC/Ogg/Vorbis/Opus : ....... ${enable_external_libs:-no}
39*4882a593Smuzhiyun+    External FLAC/Ogg/Vorbis : ....... ${enable_external_libs:-no}
40*4882a593Smuzhiyun     Building Octave interface : ........... ${OCTAVE_BUILD}
41*4882a593Smuzhiyun
42*4882a593Smuzhiyun   Tools :
43*4882a593SmuzhiyunIndex: libsndfile-1.0.31/src/ogg_opus.c
44*4882a593Smuzhiyun===================================================================
45*4882a593Smuzhiyun--- libsndfile-1.0.31.orig/src/ogg_opus.c
46*4882a593Smuzhiyun+++ libsndfile-1.0.31/src/ogg_opus.c
47*4882a593Smuzhiyun@@ -159,7 +159,7 @@
48*4882a593Smuzhiyun #include "sfendian.h"
49*4882a593Smuzhiyun #include "common.h"
50*4882a593Smuzhiyun
51*4882a593Smuzhiyun-#if HAVE_EXTERNAL_XIPH_LIBS
52*4882a593Smuzhiyun+#if 0
53*4882a593Smuzhiyun
54*4882a593Smuzhiyun #include <ogg/ogg.h>
55*4882a593Smuzhiyun #include <opus/opus.h>
56