Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Oct 2013 13:43:39 GMT
From:      Vladimir Kondratiev <wulf@mail.mipt.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/183364: [patch] audio/sdl2_mixer fix staging; add mp3 playback support
Message-ID:  <201310271343.r9RDhdvP003114@oldred.freebsd.org>
Resent-Message-ID: <201310271350.r9RDo16l092844@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         183364
>Category:       ports
>Synopsis:       [patch] audio/sdl2_mixer fix staging; add mp3 playback 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:   Sun Oct 27 13:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Vladimir Kondratiev
>Release:        
>Organization:
>Environment:
>Description:
1. Fix staging regexp so SDL2_mixer.pc installs in the right place
2. Add MP3 support via multimedia/smpeg2 (depends on ports/183360)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: sdl2_mixer/Makefile
===================================================================
--- sdl2_mixer/Makefile	(revision 331750)
+++ sdl2_mixer/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	sdl2_mixer
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL2_mixer-${PORTVERSION}
@@ -19,8 +19,8 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		FLUIDSYNTH FLAC VORBIS
-OPTIONS_DEFAULT=	FLUIDSYNTH MODPLUG FLAC VORBIS
+OPTIONS_DEFINE=		FLUIDSYNTH SMPEG FLAC VORBIS
+OPTIONS_DEFAULT=	FLUIDSYNTH MODPLUG SMPEG FLAC VORBIS
 OPTIONS_RADIO=		MOD
 OPTIONS_RADIO_MOD=	MIKMOD MODPLUG
 
@@ -27,6 +27,7 @@
 FLUIDSYNTH_DESC=	Enable SoundFont2 Midi support via fluidsynth
 MIKMOD_DESC=	Enable MOD music via libMikMod
 MODPLUG_DESC=	Enable MOD music via libModPlug
+SMPEG_DESC=	Enable MP3 music via SMPEG2
 FLAC_DESC=	Enable FLAC encoding support via flac
 VORBIS_DESC=	Enable Ogg Vorbis music
 
@@ -36,6 +37,10 @@
 MODPLUG_LIB_DEPENDS=		libmodplug.so:${PORTSDIR}/audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	music-mod-modplug
 
+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
+
 FLAC_LIB_DEPENDS=		libFLAC.so:${PORTSDIR}/audio/flac
 FLAC_CONFIGURE_ENABLE=		music-flac
 
@@ -47,7 +52,7 @@
 VORBIS_CONFIGURE_ENABLE=	music-ogg
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$(prefix)/libdata/pkgconfig|$(DESTDIR)$(prefix)/libdata/pkgconfig|' \
+	@${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310271343.r9RDhdvP003114>