From 0e40b8193c755b1be3a9d2cc3a0b534021f0fb46 Mon Sep 17 00:00:00 2001 From: jabdoa2 Date: Thu, 31 Dec 2020 17:48:11 +0100 Subject: [PATCH 1/2] Fix ogg/vorbis support in libsdl2-mixer Remove --enable-music-ogg-tremor as it broke vorbis support: ``` checking tremor/ivorbisfile.h usability... no checking tremor/ivorbisfile.h presence... no checking for tremor/ivorbisfile.h... no checking for ov_open_callbacks in -lvorbisidec... no configure: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/) configure: WARNING: Ogg Vorbis support disabled ``` With this change: ``` checking vorbis/vorbisfile.h usability... yes checking vorbis/vorbisfile.h presence... yes checking for vorbis/vorbisfile.h... yes checking for ov_open_callbacks in -lvorbisfile... yes -- dynamic libvorbisfile -> libvorbisfile.so.3 ``` --- meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index aa246f99951..77e50d3841d 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/SDL2_mixer-${PV}" inherit autotools-brokensep pkgconfig EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg LIBS=-L${STAGING_LIBDIR}" PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" From 7d7e116efa01854d705d02812d15daf8af6a6d0e Mon Sep 17 00:00:00 2001 From: jabdoa2 Date: Thu, 31 Dec 2020 18:07:43 +0100 Subject: [PATCH 2/2] Update libsdl2-mixer_2.0.4.bb Also set --disable-music-ogg-shared to lib statically --- meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index 77e50d3841d..8f1960d8ad7 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/SDL2_mixer-${PV}" inherit autotools-brokensep pkgconfig EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg LIBS=-L${STAGING_LIBDIR}" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}" PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"