Attachment #160396 for bug #202689

View | Details | Raw Unified | Return to bug 202689
Collapse All | Expand All

Lines 2-8 Link Here

(-)audio/sdl2_mixer/Makefile (-4 / +14 lines)
2		2
3	PORTNAME= sdl2_mixer	3	PORTNAME= sdl2_mixer
4	PORTVERSION= 2.0.0	4	PORTVERSION= 2.0.0
5	PORTREVISION= 9	5	PORTREVISION= 10
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/	7	MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
8	DISTNAME= SDL2_mixer-${PORTVERSION}	8	DISTNAME= SDL2_mixer-${PORTVERSION}
Lines 19-28 LDFLAGS+= -L${LOCALBASE}/lib Link Here
19	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21		21
22	OPTIONS_DEFINE= FLUIDSYNTH FLAC SMPEG VORBIS	22	OPTIONS_DEFINE= FLUIDSYNTH FLAC SMPEG
23	OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC SMPEG VORBIS	23	OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC SMPEG
24	OPTIONS_RADIO= MOD	24	OPTIONS_RADIO= MOD OGG
25	OPTIONS_RADIO_MOD= MIKMOD MODPLUG	25	OPTIONS_RADIO_MOD= MIKMOD MODPLUG
		26	OPTIONS_RADIO_OGG= VORBIS TREMOR
		27
		28	.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp}
		29	OPTIONS_DEFAULT+= TREMOR
		30	.else
		31	OPTIONS_DEFAULT+= VORBIS
		32	.endif
26		33
27	FLUIDSYNTH_DESC= Enable SoundFont2 Midi support via fluidsynth	34	FLUIDSYNTH_DESC= Enable SoundFont2 Midi support via fluidsynth
28	MIKMOD_DESC= Enable MOD music via libMikMod	35	MIKMOD_DESC= Enable MOD music via libMikMod
Lines 51-56 SMPEG_CONFIGURE_OFF= --disable-music-mp3 --disable-music-mp3-smpeg Link Here
51	VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis	58	VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
52	VORBIS_CONFIGURE_ENABLE= music-ogg	59	VORBIS_CONFIGURE_ENABLE= music-ogg
53		60
		61	TREMOR_LIB_DEPENDS= libvorbisidec.so:${PORTSDIR}/audio/libtremor
		62	TREMOR_CONFIGURE_ENABLE= music-ogg music-ogg-tremor
		63
54	post-patch:	64	post-patch:
55	@${REINPLACE_CMD} -e 's\|$$$(prefix)/libdata/pkgconfig$\|$$(DESTDIR)\1\|' \	65	@${REINPLACE_CMD} -e 's\|$$$(prefix)/libdata/pkgconfig$\|$$(DESTDIR)\1\|' \
56	${WRKSRC}/Makefile.in	66	${WRKSRC}/Makefile.in

Added Link Here

(-)audio/sdl2_mixer/files/patch-dynamic__ogg.h (+11 lines)
1	--- dynamic_ogg.h.orig 2013-08-10 17:39:55 UTC
2	+++ dynamic_ogg.h
3	@@ -21,7 +21,7 @@
4
5	#ifdef OGG_MUSIC
6	#ifdef OGG_USE_TREMOR
7	-#include <ivorbisfile.h>
8	+#include <tremor/ivorbisfile.h>
9	#else
10	#include <vorbis/vorbisfile.h>
11	#endif

Added Link Here

(-)audio/sdl2_mixer/files/patch-music__ogg.h (+11 lines)
1	--- music_ogg.h.orig 2013-08-10 17:39:58 UTC
2	+++ music_ogg.h
3	@@ -26,7 +26,7 @@
4	/* This file supports Ogg Vorbis music streams */
5
6	#ifdef OGG_USE_TREMOR
7	-#include <ivorbisfile.h>
8	+#include <tremor/ivorbisfile.h>
9	#else
10	#include <vorbis/vorbisfile.h>
11	#endif

Lines 3-9 Link Here

(-)audio/sdl_mixer/Makefile (-4 / +14 lines)
3		3
4	PORTNAME= sdl_mixer	4	PORTNAME= sdl_mixer
5	PORTVERSION= 1.2.12	5	PORTVERSION= 1.2.12
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/	8	MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
9	DISTNAME= SDL_mixer-${PORTVERSION}	9	DISTNAME= SDL_mixer-${PORTVERSION}
Lines 20-29 LDFLAGS+= -L${LOCALBASE}/lib Link Here
20	CPPFLAGS+= -I${LOCALBASE}/include	20	CPPFLAGS+= -I${LOCALBASE}/include
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22		22
23	OPTIONS_DEFINE= SMPEG FLAC VORBIS TIMIDITYPLUS	23	OPTIONS_DEFINE= SMPEG FLAC TIMIDITYPLUS
24	OPTIONS_DEFAULT= SMPEG FLAC VORBIS MIKMOD	24	OPTIONS_DEFAULT= SMPEG FLAC MIKMOD
25	OPTIONS_RADIO= MOD	25	OPTIONS_RADIO= MOD OGG
26	OPTIONS_RADIO_MOD= MIKMOD MODPLUG	26	OPTIONS_RADIO_MOD= MIKMOD MODPLUG
		27	OPTIONS_RADIO_OGG= VORBIS TREMOR
		28
		29	.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp}
		30	OPTIONS_DEFAULT+= TREMOR
		31	.else
		32	OPTIONS_DEFAULT+= VORBIS
		33	.endif
27		34
28	MIKMOD_DESC= Enable MOD music via libMikMod	35	MIKMOD_DESC= Enable MOD music via libMikMod
29	MODPLUG_DESC= Enable MOD music via libModPlug	36	MODPLUG_DESC= Enable MOD music via libModPlug
Lines 47-52 SMPEG_CONFIGURE_ENABLE= music-mp3 Link Here
47	VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis	54	VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
48	VORBIS_CONFIGURE_ENABLE= music-ogg	55	VORBIS_CONFIGURE_ENABLE= music-ogg
49		56
		57	TREMOR_LIB_DEPENDS= libvorbisidec.so:${PORTSDIR}/audio/libtremor
		58	TREMOR_CONFIGURE_ENABLE= music-ogg music-ogg-tremor
		59
50	.include <bsd.port.options.mk>	60	.include <bsd.port.options.mk>
51		61
52	.if ${PORT_OPTIONS:MTIMIDITYPLUS}	62	.if ${PORT_OPTIONS:MTIMIDITYPLUS}

Return to bug 202689