diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch | 55 | ||||
-rw-r--r-- | meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb | 1 |
2 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch new file mode 100644 index 0000000000..6bcb932429 --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/libsndfile1/noopus.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | We don't have opus in OE-Core which causes all the external libs to be disabled | ||
2 | silently. The silent issue is discussed in the link below and hints a patch | ||
3 | to make things configurable may be accepted. | ||
4 | |||
5 | This patch removing the opus piece at least gets most of the functionality | ||
6 | we previously used back whilst the issue is discussed. | ||
7 | |||
8 | Upstream-Status: Pending [https://github.com/libsndfile/libsndfile/pull/812] | ||
9 | |||
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
11 | |||
12 | Index: libsndfile-1.0.31/configure.ac | ||
13 | =================================================================== | ||
14 | --- libsndfile-1.0.31.orig/configure.ac | ||
15 | +++ libsndfile-1.0.31/configure.ac | ||
16 | @@ -361,13 +361,13 @@ AS_IF([test -n "$PKG_CONFIG"], [ | ||
17 | enable_external_libs=yes | ||
18 | ]) | ||
19 | |||
20 | - AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyesyes"], [ | ||
21 | + AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc" = "xyesyesyesyes"], [ | ||
22 | HAVE_EXTERNAL_XIPH_LIBS=1 | ||
23 | enable_external_libs=yes | ||
24 | |||
25 | - EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS " | ||
26 | - EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS " | ||
27 | - EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc opus" | ||
28 | + EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OGG_CFLAGS " | ||
29 | + EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OGG_LIBS " | ||
30 | + EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc" | ||
31 | |||
32 | if test x$ac_cv_speex = "xyes" ; then | ||
33 | EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex" | ||
34 | @@ -716,7 +716,7 @@ AC_MSG_RESULT([ | ||
35 | |||
36 | Experimental code : ................... ${enable_experimental:-no} | ||
37 | Using ALSA in example programs : ...... ${enable_alsa:-no} | ||
38 | - External FLAC/Ogg/Vorbis/Opus : ....... ${enable_external_libs:-no} | ||
39 | + External FLAC/Ogg/Vorbis : ....... ${enable_external_libs:-no} | ||
40 | Building Octave interface : ........... ${OCTAVE_BUILD} | ||
41 | |||
42 | Tools : | ||
43 | Index: libsndfile-1.0.31/src/ogg_opus.c | ||
44 | =================================================================== | ||
45 | --- libsndfile-1.0.31.orig/src/ogg_opus.c | ||
46 | +++ libsndfile-1.0.31/src/ogg_opus.c | ||
47 | @@ -159,7 +159,7 @@ | ||
48 | #include "sfendian.h" | ||
49 | #include "common.h" | ||
50 | |||
51 | -#if HAVE_EXTERNAL_XIPH_LIBS | ||
52 | +#if 0 | ||
53 | |||
54 | #include <ogg/ogg.h> | ||
55 | #include <opus/opus.h> | ||
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb index 9f1a106600..ea14fe29cb 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb | |||
@@ -9,6 +9,7 @@ SECTION = "libs/multimedia" | |||
9 | LICENSE = "LGPL-2.1-only" | 9 | LICENSE = "LGPL-2.1-only" |
10 | 10 | ||
11 | SRC_URI = "https://github.com/libsndfile/libsndfile/releases/download/${PV}/libsndfile-${PV}.tar.bz2 \ | 11 | SRC_URI = "https://github.com/libsndfile/libsndfile/releases/download/${PV}/libsndfile-${PV}.tar.bz2 \ |
12 | file://noopus.patch \ | ||
12 | " | 13 | " |
13 | UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsndfile/releases/" | 14 | UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsndfile/releases/" |
14 | 15 | ||