From 59d6d86266e194c7c32f11dfad5fbed21e9e1933 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 3 Apr 2020 12:32:10 +0200 Subject: [PATCH 1/2] Add libmpg123 package for better MP3 support. --- pkgdef/libmpg123.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 pkgdef/libmpg123.sh diff --git a/pkgdef/libmpg123.sh b/pkgdef/libmpg123.sh new file mode 100644 index 0000000..7dc19c4 --- /dev/null +++ b/pkgdef/libmpg123.sh @@ -0,0 +1,7 @@ +description "Fast console MPEG Audio Player and decoder library" +check_library mpg123 +variant stable fetch_download \ + https://www.mpg123.de/download/mpg123-1.25.13.tar.bz2 \ + 90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a +build_autotools + From 2a077082e8c07b603980391e8fff0205230e9220 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 3 Apr 2020 12:34:43 +0200 Subject: [PATCH 2/2] Let SDL2_Mixer prefer libmpg123 over libmad. --- pkgdef/SDL2_mixer.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgdef/SDL2_mixer.sh b/pkgdef/SDL2_mixer.sh index caae0a0..2752f4b 100644 --- a/pkgdef/SDL2_mixer.sh +++ b/pkgdef/SDL2_mixer.sh @@ -11,6 +11,7 @@ variant latest fetch_hg https://hg.libsdl.org/SDL_mixer config_options=" --disable-music-mod --disable-music-flac-shared --disable-music-ogg-shared + --disable-music-mp3-mpg123-shared " # ...except ones we have installed: @@ -28,7 +29,9 @@ else config_options+=" --disable-music-midi-fluidsynth" fi -if chocpkg installed ${PACKAGE_TYPE}:libmad; then +if chocpkg installed ${PACKAGE_TYPE}:libmpg123; then + config_options+=" --enable-music-mp3 --disable-music-mp3-mad-gpl --enable-music-mp3-mpg123" +elif chocpkg installed ${PACKAGE_TYPE}:libmad; then config_options+=" --enable-music-mp3 --enable-music-mp3-mad-gpl" else config_options+=" --disable-music-mp3 --disable-music-mp3-mad-gpl"