ports/155168: [MAINTAINER] Fix port: audio/musicpd: Incorporate upstream fix for 24-bit

[Chris Rees]

>Number:         155168
>Category:       ports
>Synopsis:       [MAINTAINER] Fix port: audio/musicpd: Incorporate upstream fix for 24-bit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 01 18:40:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 8.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD zeus.bayofrum.net 8.1-RELEASE-p2 FreeBSD 8.1-RELEASE-p2 #0: Wed Feb 23 16:10:57 UTC 2011 root at zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	I've had many complaints about musicpd giving white noise since the update; since talking with upstream a temporary workaround has been added [1].
	[1] http://git.musicpd.org/cgit/master/mpd.git/commit/?h=v0.16.x&id=a1d1c2beaa54f76bbf92b2a5fd83c4a582a0316b
>How-To-Repeat:
>Fix:

	- Disable 24-bit audio (upstream fix)
	- While here, silence a REINPLACE

	Submitted by: Chris Rees (utisoft_at_gmail.com) (maintainer)

Disclaimer: I know it's a nasty sed-by-address, but it's only until the next version bump, so I didn't think it's worth making a patchfile.

If you want to see the results, I've diffed src/output/oss_plugin.c against the .bak before the sed [2].

[2] http://www.bayofrum.net/~chris/patches/musicpd-src-output-oss-plugin-c.diff

--- musicpd-fix-24-bit.diff begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/audio/musicpd/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile	8 Feb 2011 19:37:20 -0000	1.60
+++ Makefile	1 Mar 2011 17:45:40 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.16.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
 DISTNAME=	mpd-${PORTVERSION}
@@ -226,9 +226,13 @@
 .endif
 
 post-patch:
+# Fix issues with garbled sound for 24-bit on FreeBSD. This is fixed in git,
+# so should be removed with next update.
+	@${REINPLACE_CMD} -e '383,395d;421,430d' \
+		${WRKSRC}/src/output/oss_plugin.c
 	@${REINPLACE_CMD} -e "s/%%MPDDIR%%/${PREFIX:C/\//\\\//g}\/${MPDDIR:C/\//\\\//g}/g" -e "s/%%MPDUSER%%/${MPDUSER}/g" \
 		${WRKSRC}/doc/mpdconf.example
-	${REINPLACE_CMD} -e 's/tremor == xno/tremor = xno/' \
+	@${REINPLACE_CMD} -e 's/tremor == xno/tremor = xno/' \
 		${WRKSRC}/configure
 .if (${OSVERSION} < 800000)
 	${REINPLACE_CMD} -e 's/nan[f]\{0,1\}(\"\")/NAN/g' \
--- musicpd-fix-24-bit.diff ends here ---




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