- Update to 2.0.4

- Disable dynamic linking
- Regroup options

3 files changed, 48 insertions, 23 deletions

diff --git a/audio/sdl2_mixer/Makefile b/audio/sdl2_mixer/Makefile
index f068442cc505..fc33e14a1eba 100644
--- a/audio/sdl2_mixer/Makefile
+++ b/audio/sdl2_mixer/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sdl2_mixer
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.0.4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL2_mixer-${PORTVERSION}
@@ -11,18 +10,29 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Sample multi-channel audio mixer library
 
 LICENSE=	ZLIB
-LICENSE_FILE=	${WRKSRC}/COPYING.txt
+LICENSE_FILE_ZLIB=${WRKSRC}/COPYING.txt
 
 USES=		gmake pathfix pkgconfig libtool localbase
 USE_SDL=	sdl2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		FLUIDSYNTH FLAC SMPEG
-OPTIONS_DEFAULT=	FLUIDSYNTH MODPLUG FLAC SMPEG
-OPTIONS_RADIO=		MOD OGG
+# disabled dynamic loading of shared libraries, not shared linking
+CONFIGURE_ARGS=	--disable-music-mod-modplug-shared \
+		--disable-music-mod-mikmod-shared \
+		--disable-music-midi-fluidsynth-shared \
+		--disable-music-ogg-shared \
+		--disable-music-flac-shared \
+		--disable-music-mp3-mpg123-shared \
+		--disable-music-opus-shared
+
+OPTIONS_DEFINE=		FLAC OPUS
+OPTIONS_RADIO=		MOD MIDI OGG MP3
 OPTIONS_RADIO_MOD=	MIKMOD MODPLUG
+OPTIONS_RADIO_MIDI=	FLUIDSYNTH
 OPTIONS_RADIO_OGG=	VORBIS TREMOR
+OPTIONS_RADIO_MP3=	MAD MPG123
+OPTIONS_DEFAULT=	FLUIDSYNTH MODPLUG FLAC OPUS MPG123
 
 .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp}
 OPTIONS_DEFAULT+=	TREMOR
@@ -30,8 +40,8 @@ OPTIONS_DEFAULT+=	TREMOR
 OPTIONS_DEFAULT+=	VORBIS
 .endif
 
-MOD_DESC=	Tracker music support
-SMPEG_DESC=	MP3 audio support via SMPEG2
+# MOD
+MOD_DESC=			Tracker music support
 
 MIKMOD_LIB_DEPENDS=		libmikmod.so:audio/libmikmod
 MIKMOD_CONFIGURE_ENABLE=	music-mod-mikmod
@@ -39,30 +49,44 @@ MIKMOD_CONFIGURE_ENABLE=	music-mod-mikmod
 MODPLUG_LIB_DEPENDS=		libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	music-mod-modplug
 
-FLAC_LIB_DEPENDS=		libFLAC.so:audio/flac
-FLAC_CONFIGURE_ENABLE=		music-flac
+# MIDI
+MIDI_DESC=			MIDI music support
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
-FLUIDSYNTH_CONFIGURE_ON=	--enable-music-midi --enable-music-midi-fluidsynth
-FLUIDSYNTH_CONFIGURE_OFF=	--disable-music-midi --disable-music-midi-fluidsynth
+FLUIDSYNTH_CONFIGURE_ENABLE=	music-midi-fluidsynth
 
-SMPEG_LIB_DEPENDS=		libsmpeg2.so:multimedia/smpeg2
-SMPEG_CONFIGURE_ON=		--enable-music-mp3 --enable-music-mp3-smpeg
-SMPEG_CONFIGURE_OFF=		--disable-music-mp3 --disable-music-mp3-smpeg
+# TODO: add timidity?
 
+# OGG
 VORBIS_LIB_DEPENDS=		libvorbis.so:audio/libvorbis
-VORBIS_CONFIGURE_ENABLE=	music-ogg
 
 TREMOR_LIB_DEPENDS=		libvorbisidec.so:audio/libtremor
-TREMOR_CONFIGURE_ON=		--enable-music-ogg
-# TREMOR_CONFIGURE_OFF is handled by VORBIS=off
 TREMOR_CONFIGURE_ENABLE=	music-ogg-tremor
 
+# MP3
+MAD_LIB_DEPENDS=		libmad.so:audio/libmad
+MAD_CONFIGURE_ENABLE=		music-mp3-mad-gpl
+MAD_VARS=			LICENSE+=GPLv2+ LICENSE_COMB=multi
+
+MPG123_LIB_DEPENDS=		libmpg123.so:audio/mpg123
+MPG123_CONFIGURE_ENABLE=	music-mp3-mpg123
+
+# Others
+FLAC_LIB_DEPENDS=		libFLAC.so:audio/flac
+FLAC_CONFIGURE_ENABLE=		music-flac
+
+OPUS_LIB_DEPENDS=		libopusfile.so:audio/opusfile
+OPUS_CONFIGURE_ENABLE=		music-opus
+
+.include <bsd.port.options.mk>
+
+.if !${PORT_OPTIONS:MVORBIS} && !${PORT_OPTIONS:MTREMOR}
+CONFIGURE_ARGS+=		--disable-music-ogg
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|"modplug.h"|"libmodplug/modplug.h"|' \
-		${WRKSRC}/dynamic_modplug.h ${WRKSRC}/music_modplug.h
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDL2_mixer.so
diff --git a/audio/sdl2_mixer/distinfo b/audio/sdl2_mixer/distinfo
index ad7b5a04107e..e5fbcf8afbe5 100644
--- a/audio/sdl2_mixer/distinfo
+++ b/audio/sdl2_mixer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (SDL2_mixer-2.0.1.tar.gz) = 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f
-SIZE (SDL2_mixer-2.0.1.tar.gz) = 10213891
+TIMESTAMP = 1549290781
+SHA256 (SDL2_mixer-2.0.4.tar.gz) = b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419
+SIZE (SDL2_mixer-2.0.4.tar.gz) = 11125077
diff --git a/audio/sdl2_mixer/pkg-plist b/audio/sdl2_mixer/pkg-plist
index 3e730b4e4139..bf341efbfe8f 100644
--- a/audio/sdl2_mixer/pkg-plist
+++ b/audio/sdl2_mixer/pkg-plist
@@ -1,6 +1,6 @@
 include/SDL2/SDL_mixer.h
 lib/libSDL2_mixer-2.0.so.0
-lib/libSDL2_mixer-2.0.so.0.0.1
+lib/libSDL2_mixer-2.0.so.0.2.2
 lib/libSDL2_mixer.a
 lib/libSDL2_mixer.so
 libdata/pkgconfig/SDL2_mixer.pc