Date: Mon, 3 Dec 2012 21:11:00 GMT From: Green Dog <fiziologus@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174097: [audio/sdl_mixer] fix midi support Message-ID: <201212032111.qB3LB0S6038941@red.freebsd.org> Resent-Message-ID: <201212032120.qB3LK0lT077014@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174097 >Category: ports >Synopsis: [audio/sdl_mixer] fix midi support >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: Mon Dec 03 21:20:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Green Dog >Release: FreeBSD-9.0 >Organization: >Environment: >Description: [audio/sdl_mixer] fix midi support (location timidity.cfg) OptionNg >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN sdl_mixer.orig/Makefile sdl_mixer/Makefile --- sdl_mixer.orig/Makefile 2012-12-03 05:46:53.000000000 +0400 +++ sdl_mixer/Makefile 2012-12-04 00:56:04.000000000 +0400 @@ -7,7 +7,7 @@ PORTNAME= sdl_mixer PORTVERSION= 1.2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL_mixer-${PORTVERSION} @@ -20,52 +20,62 @@ USE_GNOME= pkgconfig gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-music-wave --enable-music-midi LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include #CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY=\"${LOCALBASE}/etc/timidity.cfg\" -CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY=\"${LOCALBASE}/share/timidity/timidity.cfg\" +#CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY=\"${LOCALBASE}/share/timidity/timidity.cfg\" USE_LDCONFIG= yes -OPTIONS= MIKMOD "Enable MOD music via libMikMod" On \ - SMPEG "Enable MP3 music via SMPEG" On \ - FLAC "Enable FLAC encoding support via flac" On \ - VORBIS "Enable Ogg Vorbis music" On \ - TIMIDITYPLUS "Use Timidity++ instead of Timidity" Off +OPTIONS_DEFINE= MIKMOD SMPEG FLAC VORBIS TIMIDITYPLUS +OPTIONS_DEFAULT= MIKMOD SMPEG FLAC VORBIS + +MIKMOD_DESC= Enable MOD music via libMikMod +SMPEG_DESC= Enable MP3 music via SMPEG +FLAC_DESC= Enable FLAC encoding support via flac +VORBIS_DESC= Enable Ogg Vorbis music +TIMIDITYPLUS_DESC= Use Timidity++ instead of Timidity (soundfont) .include <bsd.port.pre.mk> -.if defined(WITHOUT_MIKMOD) -CONFIGURE_ARGS+=--disable-music-mod -.else -LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod +.if ${PORT_OPTIONS:MMIKMOD} +LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod CONFIGURE_ARGS+=--enable-music-mod +.else +CONFIGURE_ARGS+=--disable-music-mod .endif -.if defined(WITHOUT_FLAC) -CONFIGURE_ARGS+=--disable-music-flac -.else -LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac CONFIGURE_ARGS+=--enable-music-flac +.else +CONFIGURE_ARGS+=--disable-music-flac .endif -.if defined(WITHOUT_SMPEG) -CONFIGURE_ARGS+=--disable-music-mp3 -.else -LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg +.if ${PORT_OPTIONS:MSMPEG} +LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg CONFIGURE_ARGS+=--enable-music-mp3 +.else +CONFIGURE_ARGS+=--disable-music-mp3 .endif -.if defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} +LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis +CONFIGURE_ARGS+=--enable-music-ogg +.else CONFIGURE_ARGS+=--disable-music-ogg +.endif + +.if ${PORT_OPTIONS:MTIMIDITYPLUS} +RUN_DEPENDS+= ${PREFIX}/share/timidity/timidity.cfg-eawpats:${PORTSDIR}/audio/eawpats +CONFIG_FILE= ${PREFIX}/share/timidity/timidity.cfg-eawpats .else -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis -CONFIGURE_ARGS+=--enable-music-ogg +RUN_DEPENDS+= ${PREFIX}/lib/timidity/timidity.cfg:${PORTSDIR}/audio/timidity +CONFIG_FILE= ${PREFIX}/lib/timidity/timidity.cfg .endif post-patch: -.if defined(WITH_TIMIDITYPLUS) - @${REINPLACE_CMD} -e 's|"${LOCALBASE}/lib/timidity"|"${LOCALBASE}/share/timidity"|g' \ + @${REINPLACE_CMD} -e 's|%%CONFIG_FILE%%|${CONFIG_FILE}|g' \ ${WRKSRC}/timidity/config.h -.endif .include <bsd.port.post.mk> diff -ruN sdl_mixer.orig/files/patch-timidity-config.h sdl_mixer/files/patch-timidity-config.h --- sdl_mixer.orig/files/patch-timidity-config.h 1970-01-01 03:00:00.000000000 +0300 +++ sdl_mixer/files/patch-timidity-config.h 2012-12-04 00:13:53.000000000 +0400 @@ -0,0 +1,11 @@ +--- timidity/config.h.orig 2012-01-16 02:01:05.000000000 +0400 ++++ timidity/config.h 2012-12-04 00:12:31.000000000 +0400 +@@ -161,7 +161,7 @@ + /* You could specify a complete path, e.g. "/etc/timidity.cfg", and + then specify the library directory in the configuration file. */ + #define CONFIG_FILE "timidity.cfg" +-#define CONFIG_FILE_ETC "/etc/timidity.cfg" ++#define CONFIG_FILE_ETC "%%CONFIG_FILE%%" + + #if defined(__WIN32__) || defined(__OS2__) + #define DEFAULT_PATH "C:\\TIMIDITY" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212032111.qB3LB0S6038941>