SDL2_mixer: updated to 2.0.2

2.0.2:
* Implemented 24-bit and surround sound support for FLAC audio files
* Updated external libraries flac-1.3.2, libmodplug-0.8.9.0, libogg-1.3.2 and libvorbis-1.3.5
* Updated for SDL 2.0.6 and newer
* Added support for MP3 playback using mpg123
* Added support for UWP / Windows 10 apps
* Added Mix_OpenAudioDevice() so you can specify the audio device to open

4 files changed, 21 insertions, 28 deletions

diff --git a/audio/SDL2_mixer/Makefile b/audio/SDL2_mixer/Makefile
index a4ddf07dde0..376ec5b619b 100644
--- a/audio/SDL2_mixer/Makefile
+++ b/audio/SDL2_mixer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2017/09/16 19:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/06/24 10:28:45 adam Exp $
 
-DISTNAME=	SDL2_mixer-2.0.1
-CATEGORIES=	audio
+DISTNAME=	SDL2_mixer-2.0.2
+CATEGORIES=	audio devel
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -9,11 +9,10 @@ HOMEPAGE=	http://www.libsdl.org/projects/SDL_mixer/
 COMMENT=	Sample multi-channel audio mixer library
 LICENSE=	zlib
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
-USE_LANGUAGES=	c c++
-
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	SDL2_mixer.pc.in
 PKGCONFIG_OVERRIDE+=	external/flac-1.2.1/src/libFLAC/flac.pc.in
 PKGCONFIG_OVERRIDE+=	external/flac-1.2.1/src/libFLAC++/flac++.pc.in
diff --git a/audio/SDL2_mixer/buildlink3.mk b/audio/SDL2_mixer/buildlink3.mk
index 22f5e314988..18e0ce0b244 100644
--- a/audio/SDL2_mixer/buildlink3.mk
+++ b/audio/SDL2_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/04/25 14:20:17 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/06/24 10:28:45 adam Exp $
 
 BUILDLINK_TREE+=	SDL2_mixer
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	SDL2_mixer
 SDL2_MIXER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.0
-BUILDLINK_ABI_DEPENDS.SDL2_mixer?=	SDL2_mixer>=2.0.0nb2
+BUILDLINK_ABI_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.SDL2_mixer?=	../../audio/SDL2_mixer
 
 .include "../../devel/SDL2/buildlink3.mk"
diff --git a/audio/SDL2_mixer/distinfo b/audio/SDL2_mixer/distinfo
index 7a1f33e9dab..8cf3cfba305 100644
--- a/audio/SDL2_mixer/distinfo
+++ b/audio/SDL2_mixer/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/02/09 15:54:27 wiz Exp $
+$NetBSD: distinfo,v 1.5 2018/06/24 10:28:45 adam Exp $
 
-SHA1 (SDL2_mixer-2.0.1.tar.gz) = 6e75f68db5713f98be5971232e3f1fdbf0501153
-RMD160 (SDL2_mixer-2.0.1.tar.gz) = 1b7420e4320be401e5a27fad5b6dfa2c16778f03
-SHA512 (SDL2_mixer-2.0.1.tar.gz) = bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
-Size (SDL2_mixer-2.0.1.tar.gz) = 10213891 bytes
+SHA1 (SDL2_mixer-2.0.2.tar.gz) = 24af8db6e3e0e2a3f4af53fe08e891423d02f1d4
+RMD160 (SDL2_mixer-2.0.2.tar.gz) = f748e93033cf5e2fb9fbd8bed86459a7b4d40c76
+SHA512 (SDL2_mixer-2.0.2.tar.gz) = c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
+Size (SDL2_mixer-2.0.2.tar.gz) = 9620763 bytes
diff --git a/audio/SDL2_mixer/options.mk b/audio/SDL2_mixer/options.mk
index 6fa46abd2c5..2518bd2fb1a 100644
--- a/audio/SDL2_mixer/options.mk
+++ b/audio/SDL2_mixer/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2014/02/02 15:39:01 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2018/06/24 10:28:45 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.SDL2_mixer
-PKG_SUPPORTED_OPTIONS=	flac fluidsynth modplug smpeg2 static vorbis
-PKG_SUGGESTED_OPTIONS+=	flac modplug smpeg2 static vorbis
+PKG_SUPPORTED_OPTIONS=	flac fluidsynth modplug mpg123 vorbis
+PKG_SUGGESTED_OPTIONS+=	flac modplug mpg123 vorbis
 
 .include "../../mk/bsd.options.mk"
 
@@ -27,17 +27,11 @@ CONFIGURE_ARGS+=	--enable-music-mod-modplug=yes
 CONFIGURE_ARGS+=	--enable-music-mod-modplug=no
 .endif
 
-.if !empty(PKG_OPTIONS:Msmpeg2)
-.include "../../multimedia/smpeg2/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-music-mp3-smpeg=yes
+.if !empty(PKG_OPTIONS:Mmpg123)
+.include "../../audio/mpg123/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-music-mp3-mpg123=yes
 .else
-CONFIGURE_ARGS+=	--enable-music-mp3-smpeg=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mstatic)
-CONFIGURE_ARGS+=	--enable-static=yes
-.else
-CONFIGURE_ARGS+=	--enable-static=no
+CONFIGURE_ARGS+=	--enable-music-mp3-mpg123=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)