From crees@zeus.bayofrum.net  Tue Mar  1 18:31:43 2011
Return-Path: <crees@zeus.bayofrum.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CDDC61065676
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 Mar 2011 18:31:43 +0000 (UTC)
	(envelope-from crees@zeus.bayofrum.net)
Received: from relay.ptn-ipout02.plus.net (relay.ptn-ipout02.plus.net [212.159.7.36])
	by mx1.freebsd.org (Postfix) with ESMTP id 64B1B8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 Mar 2011 18:31:37 +0000 (UTC)
Received: from outmx01.plus.net ([84.93.230.227])
  by relay.ptn-ipout02.plus.net with ESMTP; 01 Mar 2011 18:02:32 +0000
Received: from [91.125.147.237] (helo=zeus.bayofrum.net)
	 by outmx01.plus.net with esmtp (Exim) id 1PuTu3-0002kT-5f
	for FreeBSD-gnats-submit@freebsd.org; Tue, 01 Mar 2011 18:02:31 +0000
Received: from zeus.bayofrum.net (crees@localhost [127.0.0.1])
	by zeus.bayofrum.net (8.14.4/8.14.4) with ESMTP id p21I27cV072047
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 1 Mar 2011 18:02:07 GMT
	(envelope-from crees@zeus.bayofrum.net)
Received: (from crees@localhost)
	by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p21I278P072046;
	Tue, 1 Mar 2011 18:02:07 GMT
	(envelope-from crees)
Message-Id: <201103011802.p21I278P072046@zeus.bayofrum.net>
Date: Tue, 1 Mar 2011 18:02:07 GMT
From: Chris Rees <utisoft@gmail.com>
Reply-To: Chris Rees <utisoft@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] Fix port: audio/musicpd: Incorporate upstream fix for 24-bit
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         155168
>Category:       ports
>Synopsis:       [MAINTAINER] Fix port: audio/musicpd: Incorporate upstream fix for 24-bit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 01 18:40:09 UTC 2011
>Closed-Date:    Tue Mar 01 19:49:46 UTC 2011
>Last-Modified:  Tue Mar  1 19:50:04 UTC 2011
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Tue Mar 1 19:41:20 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155168 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Tue Mar 1 19:49:45 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/155168: commit references a PR
Date: Tue,  1 Mar 2011 19:49:45 +0000 (UTC)

 wxs         2011-03-01 19:49:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/musicpd        Makefile 
   Log:
   Include upstream fix for 24-bit audio (disable it).
   Silence a REINPLACE_CMD while we are here.
   
   PR:             ports/155168
   Submitted by:   Chris Rees <utisoft@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.61      +6 -2      ports/audio/musicpd/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
