From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 31 01:10:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 24C7FC69 for ; Sat, 31 Aug 2013 01:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0501C2C0D for ; Sat, 31 Aug 2013 01:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7V1A196078127 for ; Sat, 31 Aug 2013 01:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7V1A16u078126; Sat, 31 Aug 2013 01:10:01 GMT (envelope-from gnats) Resent-Date: Sat, 31 Aug 2013 01:10:01 GMT Resent-Message-Id: <201308310110.r7V1A16u078126@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jan Beich Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8C149B56 for ; Sat, 31 Aug 2013 01:07:48 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6B8032BFB for ; Sat, 31 Aug 2013 01:07:48 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7V17mXp007312 for ; Sat, 31 Aug 2013 01:07:48 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7V17m2h007311; Sat, 31 Aug 2013 01:07:48 GMT (envelope-from nobody) Message-Id: <201308310107.r7V17m2h007311@oldred.freebsd.org> Date: Sat, 31 Aug 2013 01:07:48 GMT From: Jan Beich To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181695: [patch] audio/sdl_mixer, audio/sdl2_mixer: let user choose MOD library X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2013 01:10:02 -0000 >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 +.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 .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: