svn commit: r410689 - in head/audio: sdl2_mixer sdl2_mixer/files sdl_mixer
Jan Beich
jbeich at FreeBSD.org
Wed Mar 9 05:18:52 UTC 2016
Author: jbeich
Date: Wed Mar 9 05:18:50 2016
New Revision: 410689
URL: https://svnweb.freebsd.org/changeset/ports/410689
Log:
audio/sdl{,2}_mixer: add TREMOR option
TREMOR is enabled by default on platforms without hardware floating point.
PR: 202689
Approved by: maintainer timeout (6 months)
Added:
head/audio/sdl2_mixer/files/
head/audio/sdl2_mixer/files/patch-dynamic__ogg.h (contents, props changed)
head/audio/sdl2_mixer/files/patch-music__ogg.h (contents, props changed)
Modified:
head/audio/sdl2_mixer/Makefile (contents, props changed)
head/audio/sdl_mixer/Makefile (contents, props changed)
Modified: head/audio/sdl2_mixer/Makefile
==============================================================================
--- head/audio/sdl2_mixer/Makefile Wed Mar 9 05:06:24 2016 (r410688)
+++ head/audio/sdl2_mixer/Makefile Wed Mar 9 05:18:50 2016 (r410689)
@@ -2,7 +2,7 @@
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}
@@ -19,10 +19,17 @@ 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
@@ -46,6 +53,9 @@ SMPEG_CONFIGURE_OFF= --disable-music-mp
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
Added: head/audio/sdl2_mixer/files/patch-dynamic__ogg.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/sdl2_mixer/files/patch-dynamic__ogg.h Wed Mar 9 05:18:50 2016 (r410689)
@@ -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 <ivorbisfile.h>
++#include <tremor/ivorbisfile.h>
+ #else
+ #include <vorbis/vorbisfile.h>
+ #endif
Added: head/audio/sdl2_mixer/files/patch-music__ogg.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/sdl2_mixer/files/patch-music__ogg.h Wed Mar 9 05:18:50 2016 (r410689)
@@ -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 <ivorbisfile.h>
++#include <tremor/ivorbisfile.h>
+ #else
+ #include <vorbis/vorbisfile.h>
+ #endif
Modified: head/audio/sdl_mixer/Makefile
==============================================================================
--- head/audio/sdl_mixer/Makefile Wed Mar 9 05:06:24 2016 (r410688)
+++ head/audio/sdl_mixer/Makefile Wed Mar 9 05:18:50 2016 (r410689)
@@ -3,7 +3,7 @@
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}
@@ -20,10 +20,17 @@ 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
@@ -53,6 +60,9 @@ TIMIDITYPLUS_VARS= CONFIG_FILE=${LOCALB
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
More information about the svn-ports-all
mailing list