Index: head/audio/sdl2_mixer/Makefile =================================================================== --- head/audio/sdl2_mixer/Makefile (revision 410688) +++ head/audio/sdl2_mixer/Makefile (revision 410689) @@ -1,55 +1,65 @@ # $FreeBSD$ PORTNAME= sdl2_mixer PORTVERSION= 2.0.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL2_mixer-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= Sample multi-channel audio mixer library LICENSE= ZLIB USES= gmake pathfix pkgconfig libtool USE_SDL= sdl2 GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= yes -OPTIONS_DEFINE= FLUIDSYNTH FLAC SMPEG VORBIS -OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC SMPEG VORBIS -OPTIONS_RADIO= MOD +OPTIONS_DEFINE= FLUIDSYNTH FLAC SMPEG +OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC SMPEG +OPTIONS_RADIO= MOD OGG OPTIONS_RADIO_MOD= MIKMOD MODPLUG +OPTIONS_RADIO_OGG= VORBIS TREMOR +.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp} +OPTIONS_DEFAULT+= TREMOR +.else +OPTIONS_DEFAULT+= VORBIS +.endif + SMPEG_DESC= MP3 audio support via SMPEG2 MIKMOD_LIB_DEPENDS= libmikmod.so:${PORTSDIR}/audio/libmikmod MIKMOD_CONFIGURE_ENABLE= music-mod-mikmod MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= music-mod-modplug FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_ENABLE= music-flac FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth FLUIDSYNTH_CONFIGURE_ON= --enable-music-midi --enable-music-midi-fluidsynth FLUIDSYNTH_CONFIGURE_OFF= --disable-music-midi --disable-music-midi-fluidsynth SMPEG_LIB_DEPENDS= libsmpeg2.so:${PORTSDIR}/multimedia/smpeg2 SMPEG_CONFIGURE_ON= --enable-music-mp3 --enable-music-mp3-smpeg SMPEG_CONFIGURE_OFF= --disable-music-mp3 --disable-music-mp3-smpeg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= music-ogg + +TREMOR_LIB_DEPENDS= libvorbisidec.so:${PORTSDIR}/audio/libtremor +TREMOR_CONFIGURE_ENABLE= music-ogg music-ogg-tremor 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 .include Index: head/audio/sdl2_mixer/files/patch-dynamic__ogg.h =================================================================== --- head/audio/sdl2_mixer/files/patch-dynamic__ogg.h (nonexistent) +++ head/audio/sdl2_mixer/files/patch-dynamic__ogg.h (revision 410689) @@ -0,0 +1,11 @@ +--- dynamic_ogg.h.orig 2013-08-10 17:39:55 UTC ++++ dynamic_ogg.h +@@ -21,7 +21,7 @@ + + #ifdef OGG_MUSIC + #ifdef OGG_USE_TREMOR +-#include ++#include + #else + #include + #endif Property changes on: head/audio/sdl2_mixer/files/patch-dynamic__ogg.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/sdl2_mixer/files/patch-music__ogg.h =================================================================== --- head/audio/sdl2_mixer/files/patch-music__ogg.h (nonexistent) +++ head/audio/sdl2_mixer/files/patch-music__ogg.h (revision 410689) @@ -0,0 +1,11 @@ +--- music_ogg.h.orig 2013-08-10 17:39:58 UTC ++++ music_ogg.h +@@ -26,7 +26,7 @@ + /* This file supports Ogg Vorbis music streams */ + + #ifdef OGG_USE_TREMOR +-#include ++#include + #else + #include + #endif Property changes on: head/audio/sdl2_mixer/files/patch-music__ogg.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/sdl_mixer/Makefile =================================================================== --- head/audio/sdl_mixer/Makefile (revision 410688) +++ head/audio/sdl_mixer/Makefile (revision 410689) @@ -1,64 +1,74 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= sdl_mixer PORTVERSION= 1.2.12 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL_mixer-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= Sample multi-channel audio mixer library LICENSE= ZLIB USES= gmake libtool pathfix pkgconfig USE_SDL= sdl GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= yes -OPTIONS_DEFINE= SMPEG FLAC VORBIS TIMIDITYPLUS -OPTIONS_DEFAULT= SMPEG FLAC VORBIS MIKMOD -OPTIONS_RADIO= MOD +OPTIONS_DEFINE= SMPEG FLAC TIMIDITYPLUS +OPTIONS_DEFAULT= SMPEG FLAC MIKMOD +OPTIONS_RADIO= MOD OGG OPTIONS_RADIO_MOD= MIKMOD MODPLUG +OPTIONS_RADIO_OGG= VORBIS TREMOR +.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp} +OPTIONS_DEFAULT+= TREMOR +.else +OPTIONS_DEFAULT+= VORBIS +.endif + 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 TIMIDITYPLUS_DESC= Use Timidity++ instead of Timidity (soundfont) MIKMOD_LIB_DEPENDS= libmikmod.so:${PORTSDIR}/audio/libmikmod MIKMOD_CONFIGURE_ENABLE= music-mod MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= music-mod-modplug FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_ENABLE= music-flac SMPEG_LIB_DEPENDS= libsmpeg.so:${PORTSDIR}/multimedia/smpeg SMPEG_CONFIGURE_ENABLE= music-mp3 VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= music-ogg TIMIDITYPLUS_RUN_DEPENDS= ${LOCALBASE}/share/timidity/timidity.cfg-eawpats:${PORTSDIR}/audio/eawpats TIMIDITYPLUS_VARS= CONFIG_FILE=${LOCALBASE}/share/timidity/timidity.cfg-eawpats TIMIDITYPLUS_RUN_DEPENDS_OFF= ${LOCALBASE}/lib/timidity/timidity.cfg:${PORTSDIR}/audio/timidity TIMIDITYPLUS_VARS_OFF= CONFIG_FILE=${LOCALBASE}/lib/timidity/timidity.cfg + +TREMOR_LIB_DEPENDS= libvorbisidec.so:${PORTSDIR}/audio/libtremor +TREMOR_CONFIGURE_ENABLE= music-ogg music-ogg-tremor post-patch: @${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|%%CONFIG_FILE%%|${CONFIG_FILE}|g' \ ${WRKSRC}/timidity/config.h @${REINPLACE_CMD} -e 's|"modplug.h"|"libmodplug/modplug.h"|' \ ${WRKSRC}/music_modplug.h .include