Date: Sat, 31 Aug 2013 01:07:48 GMT From: Jan Beich <jbeich@tormail.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181695: [patch] audio/sdl_mixer, audio/sdl2_mixer: let user choose MOD library Message-ID: <201308310107.r7V17m2h007311@oldred.freebsd.org> Resent-Message-ID: <201308310110.r7V1A16u078126@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181695
>Category: ports
>Synopsis: [patch] audio/sdl_mixer, audio/sdl2_mixer: let user choose MOD library
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 31 01:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release:
>Organization:
>Environment:
chiptunes sound differently depending on mod library
>Description:
>How-To-Repeat:
>Fix:
--- mod.diff begins here ---
Index: audio/sdl2_mixer/Makefile
===================================================================
--- audio/sdl2_mixer/Makefile (revision 325711)
+++ audio/sdl2_mixer/Makefile (working copy)
@@ -19,10 +19,13 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
-OPTIONS_DEFINE= FLUIDSYNTH MODPLUG FLAC VORBIS
+OPTIONS_DEFINE= FLUIDSYNTH FLAC VORBIS
OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC VORBIS
+OPTIONS_RADIO= MOD
+OPTIONS_RADIO_MOD= MIKMOD MODPLUG
FLUIDSYNTH_DESC= Enable SoundFont2 Midi support via fluidsynth
+MIKMOD_DESC= Enable MOD music via libMikMod
MODPLUG_DESC= Enable MOD music via libModPlug
FLAC_DESC= Enable FLAC encoding support via flac
VORBIS_DESC= Enable Ogg Vorbis music
@@ -29,11 +32,18 @@ VORBIS_DESC= Enable Ogg Vorbis music
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MMIKMOD}
+LIB_DEPENDS+= libmikmod.so:${PORTSDIR}/audio/libmikmod
+CONFIGURE_ARGS+= --enable-music-mod-mikmod
+.else
+CONFIGURE_ARGS+= --disable-music-mod-mikmod
+.endif
+
.if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug
-CONFIGURE_ARGS+= --enable-music-mod --enable-music-mod-modplug
+LIB_DEPENDS+= libmodplug.so:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+= --enable-music-mod-modplug
.else
-CONFIGURE_ARGS+= --disable-music-mod --disable-music-mod-modplug
+CONFIGURE_ARGS+= --disable-music-mod-modplug
.endif
.if ${PORT_OPTIONS:MFLAC}
Index: audio/sdl_mixer/Makefile
===================================================================
--- audio/sdl_mixer/Makefile (revision 325711)
+++ audio/sdl_mixer/Makefile (working copy)
@@ -22,10 +22,13 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
-OPTIONS_DEFINE= MIKMOD SMPEG FLAC VORBIS TIMIDITYPLUS
+OPTIONS_DEFINE= SMPEG FLAC VORBIS TIMIDITYPLUS
OPTIONS_DEFAULT= MIKMOD SMPEG FLAC VORBIS
+OPTIONS_RADIO= MOD
+OPTIONS_RADIO_MOD= MIKMOD MODPLUG
MIKMOD_DESC= Enable MOD music via libMikMod
+MODPLUG_DESC= Enable MOD music via libModPlug
SMPEG_DESC= Enable MP3 music via SMPEG
FLAC_DESC= Enable FLAC encoding support via flac
VORBIS_DESC= Enable Ogg Vorbis music
@@ -34,12 +37,19 @@ TIMIDITYPLUS_DESC= Use Timidity++ instead of Timid
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS+= libmikmod.so:${PORTSDIR}/audio/libmikmod
CONFIGURE_ARGS+= --enable-music-mod
.else
CONFIGURE_ARGS+= --disable-music-mod
.endif
+.if ${PORT_OPTIONS:MMODPLUG}
+LIB_DEPENDS+= libmodplug.so:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+= --enable-music-mod-modplug
+.else
+CONFIGURE_ARGS+= --disable-music-mod-modplug
+.endif
+
.if ${PORT_OPTIONS:MFLAC}
LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
CONFIGURE_ARGS+= --enable-music-flac
--- mod.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308310107.r7V17m2h007311>