From nobody@FreeBSD.org  Sun Oct 27 13:43:40 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 18E8EFC5
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Oct 2013 13:43:40 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id E149B28C4
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Oct 2013 13:43:39 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9RDhddb003117
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Oct 2013 13:43:39 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9RDhdvP003114;
	Sun, 27 Oct 2013 13:43:39 GMT
	(envelope-from nobody)
Message-Id: <201310271343.r9RDhdvP003114@oldred.freebsd.org>
Date: Sun, 27 Oct 2013 13:43:39 GMT
From: Vladimir Kondratiev <wulf@mail.mipt.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] audio/sdl2_mixer fix staging; add mp3 playback support
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183364
>Category:       ports
>Synopsis:       [patch] audio/sdl2_mixer fix staging; add mp3 playback support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mva
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 27 13:50:00 UTC 2013
>Closed-Date:    Wed Nov 13 21:37:18 UTC 2013
>Last-Modified:  Wed Nov 13 21:40:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->mva 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Oct 27 13:50:09 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183364 
State-Changed-From-To: open->closed 
State-Changed-By: mva 
State-Changed-When: Wed Nov 13 21:37:17 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183364 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183364: commit references a PR
Date: Wed, 13 Nov 2013 21:36:43 +0000 (UTC)

 Author: mva
 Date: Wed Nov 13 21:36:36 2013
 New Revision: 333729
 URL: http://svnweb.freebsd.org/changeset/ports/333729
 
 Log:
   - Add MP3 support via multimedia/smpeg2 (new option SMPEG)
   
   PR:		ports/183364
   Submitted by:	Vladimir Kondratiev <wulf@mail.mipt.ru>
 
 Modified:
   head/audio/sdl2_mixer/Makefile
 
 Modified: head/audio/sdl2_mixer/Makefile
 ==============================================================================
 --- head/audio/sdl2_mixer/Makefile	Wed Nov 13 21:28:29 2013	(r333728)
 +++ head/audio/sdl2_mixer/Makefile	Wed Nov 13 21:36:36 2013	(r333729)
 @@ -2,7 +2,7 @@
  
  PORTNAME=	sdl2_mixer
  PORTVERSION=	2.0.0
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	audio
  MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
  DISTNAME=	SDL2_mixer-${PORTVERSION}
 @@ -19,8 +19,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
  CPPFLAGS+=	-I${LOCALBASE}/include
  USE_LDCONFIG=	yes
  
 -OPTIONS_DEFINE=		FLUIDSYNTH FLAC VORBIS
 -OPTIONS_DEFAULT=	FLUIDSYNTH MODPLUG FLAC VORBIS
 +OPTIONS_DEFINE=		FLUIDSYNTH FLAC SMPEG VORBIS
 +OPTIONS_DEFAULT=	FLUIDSYNTH MODPLUG FLAC SMPEG VORBIS
  OPTIONS_RADIO=		MOD
  OPTIONS_RADIO_MOD=	MIKMOD MODPLUG
  
 @@ -28,6 +28,7 @@ FLUIDSYNTH_DESC=	Enable SoundFont2 Midi 
  MIKMOD_DESC=	Enable MOD music via libMikMod
  MODPLUG_DESC=	Enable MOD music via libModPlug
  FLAC_DESC=	Enable FLAC encoding support via flac
 +SMPEG_DESC=	Enable MP3 music via SMPEG2
  VORBIS_DESC=	Enable Ogg Vorbis music
  
  MIKMOD_LIB_DEPENDS=		libmikmod.so:${PORTSDIR}/audio/libmikmod
 @@ -43,6 +44,10 @@ FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.s
  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
  
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
