From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 6 12:20:08 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D222106566C for ; Sun, 6 Feb 2011 12:20:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DC27E8FC12 for ; Sun, 6 Feb 2011 12:20:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p16CK7U9024990 for ; Sun, 6 Feb 2011 12:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p16CK7Qh024989; Sun, 6 Feb 2011 12:20:07 GMT (envelope-from gnats) Resent-Date: Sun, 6 Feb 2011 12:20:07 GMT Resent-Message-Id: <201102061220.p16CK7Qh024989@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52E4D106566C for ; Sun, 6 Feb 2011 12:13:54 +0000 (UTC) (envelope-from chris@amnesiac.bayofrum.net) Received: from relay.pcl-ipout02.plus.net (relay.pcl-ipout02.plus.net [212.159.7.100]) by mx1.freebsd.org (Postfix) with ESMTP id E11848FC08 for ; Sun, 6 Feb 2011 12:13:53 +0000 (UTC) Received: from outmx07.plus.net ([84.93.230.235]) by relay.pcl-ipout02.plus.net with ESMTP; 06 Feb 2011 12:13:52 +0000 Received: from [87.113.250.185] (helo=amnesiac.bayofrum.net) by outmx07.plus.net with esmtp (Exim) id 1Pm3V2-0002zP-6I for FreeBSD-gnats-submit@freebsd.org; Sun, 06 Feb 2011 12:13:52 +0000 Received: from amnesiac.bayofrum.net (localhost [127.0.0.1]) by amnesiac.bayofrum.net (8.14.3/8.14.3) with ESMTP id p16CDba8098720 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sun, 6 Feb 2011 12:13:39 GMT (envelope-from chris@amnesiac.bayofrum.net) Received: (from chris@localhost) by amnesiac.bayofrum.net (8.14.3/8.14.3/Submit) id p16CDbHW098719; Sun, 6 Feb 2011 12:13:37 GMT (envelope-from chris) Message-Id: <201102061213.p16CDbHW098719@amnesiac.bayofrum.net> Date: Sun, 6 Feb 2011 12:13:37 GMT From: Chris Rees To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/154549: [MAINTAINER UPDATE] audio/musicpd Update to 1.16.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Rees List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 12:20:08 -0000 >Number: 154549 >Category: ports >Synopsis: [MAINTAINER UPDATE] audio/musicpd Update to 1.16.1 >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: Sun Feb 06 12:20:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 8.1-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD amnesiac.bayofrum.net 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #0: Sun Dec 12 15:14:48 GMT 2010 root@amnesiac.bayofrum.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: - Update to 1.16.1 - Fix breakage on < 8 by replacing nan[f] calls with NAN macro PR: Submitted by: Chris Rees (utisoft_at_gmail.com) (maintainer) Tested on i386 for 7.3: http://tinderbox.bayofrum.net/index.php?action=display_mar 8.1: http://tinderbox.bayofrum.net/index.php?action=display_markup_log&build=8.1-amnesiac&id=249 9: http://tinderbox.bayofrum.net/index.php?action=display_markup_log&build=9-amnesiac&id=249 >How-To-Repeat: >Fix: Also at http://www.bayofrum.net/~chris/patches/musicpd-0_16_1.diff File removed: files/patch-doc_mpdconf.example --- musicpd-0_16_1.diff begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/audio/musicpd/Makefile,v retrieving revision 1.58 diff -u -r1.58 Makefile --- Makefile 16 Dec 2010 16:40:15 -0000 1.58 +++ Makefile 6 Feb 2011 12:07:05 -0000 @@ -6,7 +6,7 @@ # PORTNAME= musicpd -PORTVERSION= 0.15.15 +PORTVERSION= 0.16.1 CATEGORIES= audio ipv6 MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION} DISTNAME= mpd-${PORTVERSION} @@ -227,6 +227,12 @@ post-patch: @${REINPLACE_CMD} -e "s/%%MPDDIR%%/${PREFIX:C/\//\\\//g}\/${MPDDIR:C/\//\\\//g}/g" -e "s/%%MPDUSER%%/${MPDUSER}/g" \ ${WRKSRC}/doc/mpdconf.example +.if (${OSVERSION} < 800000) + ${REINPLACE_CMD} -e 's/nan[f]\{0,1\}(\"\")/NAN/g' \ + ${WRKSRC}/src/crossfade.c \ + ${WRKSRC}/src/player_thread.c \ + ${WRKSRC}/src/player_control.c +.endif .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's|install-docDATA ||' \ ${WRKSRC}/Makefile.in Index: distinfo =================================================================== RCS file: /exports/cvsroot-freebsd/ports/audio/musicpd/distinfo,v retrieving revision 1.24 diff -u -r1.24 distinfo --- distinfo 21 Nov 2010 16:06:14 -0000 1.24 +++ distinfo 6 Feb 2011 12:07:05 -0000 @@ -1,2 +1,2 @@ -SHA256 (mpd-0.15.15.tar.bz2) = db6dc242722e3178bcbff6b67ced8caccbb8dcddf867b8ab6bab42d6e55982ab -SIZE (mpd-0.15.15.tar.bz2) = 391688 +SHA256 (mpd-0.16.1.tar.bz2) = b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57 +SIZE (mpd-0.16.1.tar.bz2) = 480244 Index: files/patch-src_output_ao__plugin.c =================================================================== RCS file: /exports/cvsroot-freebsd/ports/audio/musicpd/files/patch-src_output_ao__plugin.c,v retrieving revision 1.1 diff -u -r1.1 patch-src_output_ao__plugin.c --- files/patch-src_output_ao__plugin.c 6 Jun 2010 20:39:14 -0000 1.1 +++ files/patch-src_output_ao__plugin.c 6 Feb 2011 12:07:05 -0000 @@ -1,13 +1,12 @@ +$FreeBSD$ -$FreeBSD: ports/audio/musicpd/files/patch-src_output_ao__plugin.c,v 1.1 2010/06/06 20:39:14 naddy Exp $ - ---- src/output/ao_plugin.c.orig -+++ src/output/ao_plugin.c -@@ -175,6 +175,7 @@ - if (audio_format->bits > 16) - audio_format->bits = 16; +--- src/output/ao_plugin.c.orig 2011-02-05 21:03:39.032765668 +0000 ++++ src/output/ao_plugin.c 2011-02-05 21:04:11.006777588 +0000 +@@ -188,6 +188,7 @@ + break; + } + memset(&format, 0, sizeof(format)); - format.bits = audio_format->bits; format.rate = audio_format->sample_rate; format.byte_format = AO_FMT_NATIVE; + format.channels = audio_format->channels; --- musicpd-0_16_1.diff ends here --- -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. >Release-Note: >Audit-Trail: >Unformatted: