Attachment 160396 Details for Bug 202689 – v1

[patch] v1

sdl.tremor.diff (text/plain), 4.21 KB, created by Jan Beich on 2015-08-27 07:46:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-08-27 07:46:16 UTC

Size: 4.21 KB

patch

obsolete

>commit 95bb887 (HEAD -> tremor)
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Thu Aug 27 07:03:26 2015 +0000
>
>    audio/sdl{,2}_mixer: add TREMOR option
>    
>    TREMOR is enabled by default on platforms without hardware floating point.
>    
>    PR:		202689
>    Approved by:	mva (maintainer) ?
>---
> audio/sdl2_mixer/Makefile                   | 18 ++++++++++++++----
> audio/sdl2_mixer/files/patch-dynamic__ogg.h | 11 +++++++++++
> audio/sdl2_mixer/files/patch-music__ogg.h   | 11 +++++++++++
> audio/sdl_mixer/Makefile                    | 18 ++++++++++++++----
> 4 files changed, 50 insertions(+), 8 deletions(-)
>
>diff --git audio/sdl2_mixer/Makefile audio/sdl2_mixer/Makefile
>index b17633c..8641595 100644
>--- audio/sdl2_mixer/Makefile
>+++ audio/sdl2_mixer/Makefile
>@@ -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
> 
> FLUIDSYNTH_DESC=	Enable SoundFont2 Midi support via fluidsynth
> MIKMOD_DESC=	Enable MOD music via libMikMod
>@@ -51,6 +58,9 @@ 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
>diff --git audio/sdl2_mixer/files/patch-dynamic__ogg.h audio/sdl2_mixer/files/patch-dynamic__ogg.h
>new file mode 100644
>index 0000000..634f933
>--- /dev/null
>+++ audio/sdl2_mixer/files/patch-dynamic__ogg.h
>@@ -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
>diff --git audio/sdl2_mixer/files/patch-music__ogg.h audio/sdl2_mixer/files/patch-music__ogg.h
>new file mode 100644
>index 0000000..21159d3
>--- /dev/null
>+++ audio/sdl2_mixer/files/patch-music__ogg.h
>@@ -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
>diff --git audio/sdl_mixer/Makefile audio/sdl_mixer/Makefile
>index b729517..fe59b35 100644
>--- audio/sdl_mixer/Makefile
>+++ audio/sdl_mixer/Makefile
>@@ -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
>@@ -47,6 +54,9 @@ SMPEG_CONFIGURE_ENABLE=		music-mp3
> 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
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MTIMIDITYPLUS}

Actions: View | Diff

Attachments on bug 202689: 160395 | 160396 | 160397 | 160398 | 160399