git: 5b634162c6b6 - main - audio/sdl2_mixer: sort options, remove stray OGG option

The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5b634162c6b63002436e316c8f35b442bb58f41c

commit 5b634162c6b63002436e316c8f35b442bb58f41c
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2024-04-22 18:12:51 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2024-04-22 18:20:02 +0000

    audio/sdl2_mixer: sort options, remove stray OGG option
    
    PR:             278510
    Submitted by:   diizzy
---
 audio/sdl2_mixer/Makefile | 53 ++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/audio/sdl2_mixer/Makefile b/audio/sdl2_mixer/Makefile
index 36373676be37..a67ef45319b7 100644
--- a/audio/sdl2_mixer/Makefile
+++ b/audio/sdl2_mixer/Makefile
@@ -15,61 +15,54 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	libsdl-org
 GH_PROJECT=	SDL_mixer
 USE_SDL=	sdl2
-CMAKE_OFF=	SDL2MIXER_SAMPLES \
-		SDL2MIXER_DEPS_SHARED \
-		SDL2MIXER_FLAC_LIBFLAC_SHARED \
-		SDL2MIXER_MOD_MODPLUG_SHARED \
-		SDL2MIXER_MOD_XMP_SHARED \
-		SDL2MIXER_MP3_MPG123_SHARED \
-		SDL2MIXER_MIDI_FLUIDSYNTH_SHARED \
-		SDL2MIXER_OPUS_SHARED \
-		SDL2MIXER_VORBIS_VORBISFILE_SHARED \
+CMAKE_OFF=	SDL2MIXER_DEPS_SHARED \
 		SDL2MIXER_FLAC_DRFLAC \
-		SDL2MIXER_MP3_MINIMP3 \
-		SDL2MIXER_MIDI_TIMIDITY \
 		SDL2MIXER_GME_SHARED \
-		SDL2MIXER_WAVPACK_SHARED
+		SDL2MIXER_MIDI_TIMIDITY \
+		SDL2MIXER_MOD_XMP_LITE \
+		SDL2MIXER_MP3_MINIMP3 \
+		SDL2MIXER_SAMPLES
 CMAKE_ARGS=	-DSDL2MIXER_DEBUG_POSTFIX:STRING=
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		FLAC OPUS MPG123 FLUIDSYNTH GME WAVPACK VORBIS
-OPTIONS_RADIO=		MOD OGG
+OPTIONS_DEFINE=		FLAC FLUIDSYNTH GME MPG123 OPUS VORBIS WAVPACK
+OPTIONS_RADIO=		MOD
 OPTIONS_RADIO_MOD=	MODPLUG XMP
-OPTIONS_DEFAULT=	FLUIDSYNTH XMP OPUS MPG123 VORBIS
+OPTIONS_DEFAULT=	FLUIDSYNTH MPG123 OPUS VORBIS XMP
 
+GME_DESC=		GME music support via game-music-emu
 MOD_DESC=		Tracker music support
+XMP_DESC=		MOD music support via libxmp
 
-MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
-MODPLUG_CMAKE_BOOL=	SDL2MIXER_MOD_MODPLUG
-
-XMP_DESC=		MOD music via libxmp
-XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
-XMP_CMAKE_BOOL=		SDL2MIXER_MOD_XMP
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
+FLAC_CMAKE_BOOL=	SDL2MIXER_FLAC SDL2MIXER_FLAC_LIBFLAC
 
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_BOOL=	SDL2MIXER_MIDI SDL2MIXER_MIDI_FLUIDSYNTH
 # TODO: add timidity?
 
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
-VORBIS_CMAKE_ON=	-DSDL2MIXER_VORBIS="VORBISFILE"
-VORBIS_CMAKE_OFF=	-DSDL2MIXER_VORBIS=""
+GME_LIB_DEPENDS=	libgme.so:audio/libgme
+GME_CMAKE_BOOL=		SDL2MIXER_GME
+
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
+MODPLUG_CMAKE_BOOL=	SDL2MIXER_MOD_MODPLUG
 
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CMAKE_BOOL=	SDL2MIXER_MP3 SDL2MIXER_MP3_MPG123
 
-FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
-FLAC_CMAKE_BOOL=	SDL2MIXER_FLAC SDL2MIXER_FLAC_LIBFLAC
-
 OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
 OPUS_CMAKE_BOOL=	SDL2MIXER_OPUS
 
-GME_LIB_DEPENDS=	libgme.so:audio/libgme
-GME_CMAKE_BOOL=		SDL2MIXER_GME
-GME_DESC=		WavPack DSD music support
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
+VORBIS_CMAKE_OFF=	-DSDL2MIXER_VORBIS=""
+VORBIS_CMAKE_ON=	-DSDL2MIXER_VORBIS="VORBISFILE"
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CMAKE_BOOL=	SDL2MIXER_WAVPACK
 
+XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
+XMP_CMAKE_BOOL=		SDL2MIXER_MOD_XMP
+
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MXMP} && !${PORT_OPTIONS:MMODPLUG}