libsdl2-mixer: drop deprecated modplug PACKAGECONFIG

libmodplug support has been removed in master branch
https://github.com/libsdl-org/SDL_mixer/pull/673

Remove the option as we still provide libxmp to handle .mod

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
index ecfc0b147a..b24c8782cf 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
@@ -20,14 +20,11 @@ do_configure:prepend() {
         touch ${STAGING_BINDIR}/wvtag
 }
 
-EXTRA_OECMAKE += "${@bb.utils.contains_any('PACKAGECONFIG', 'xmp modplug', '-DSDL2MIXER_MOD=ON', '-DSDL2MIXER_MOD=OFF', d)}"
-
 PACKAGECONFIG ?= "flac wave vorbis"
 PACKAGECONFIG[opusfile] = "-DSDL2MIXER_OPUS=ON -DSDL2MIXER_OPUS_ENABLED=ON, -DSDL2MIXER_OPUS=OFF,opusfile"
 PACKAGECONFIG[vorbis] = "-DSDL2MIXER_VORBIS=VORBISFILE -DSDL2MIXER_VORBIS_VORBISFILE=ON, -DSDL2MIXER_VORBIS=OFF,libvorbis"
 PACKAGECONFIG[flac] = "-DSDL2MIXER_FLAC=ON, -DSDL2MIXER_FLAC=OFF,flac"
-PACKAGECONFIG[xmp] = "-DSDL2MIXER_MOD_XMP=ON, -DSDL2MIXER_MOD_XMP=OFF,libxmp,libxmp"
-PACKAGECONFIG[modplug] = "-DSDL2MIXER_MOD_MODPLUG=ON, -DSDL2MIXER_MOD_MODPLUG=OFF,libmodplug"
+PACKAGECONFIG[xmp] = "-DSDL2MIXER_MOD=ON -DSDL2MIXER_MOD_XMP=ON, -DSDL2MIXER_MOD=OFF,libxmp,libxmp"
 PACKAGECONFIG[fluidsynth] = "-DSDL2MIXER_MIDI=ON -DSDL2MIXER_MIDI_FLUIDSYNTH_ENABLED=ON, -DSDL2MIXER_MIDI=OFF,fluidsynth,fluidsynth-bin"
 PACKAGECONFIG[wave] = "-DSDL2MIXER_WAVE=ON -DSDL2MIXER_WAVPACK=ON, -DSDL2MIXER_WAVE=OFF,wavpack,wavpack wavpack-bin"
 PACKAGECONFIG[mpg123] = "-DSDL2MIXER_MP3=ON -DSDL2MIXER_MP3_MPG123=ON, -DSDL2MIXER_MP3=OFF,mpg123"