From nobody@FreeBSD.org  Sat Dec 14 20:42:32 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 ESMTPS id 8F4ED211
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Dec 2013 20:42:32 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 7B7F11D7E
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Dec 2013 20:42:32 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rBEKgWtr070843
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Dec 2013 20:42:32 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rBEKgW5k070829;
	Sat, 14 Dec 2013 20:42:32 GMT
	(envelope-from nobody)
Message-Id: <201312142042.rBEKgW5k070829@oldred.freebsd.org>
Date: Sat, 14 Dec 2013 20:42:32 GMT
From: Thomas Zander <thomas.e.zander@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] audio/musicpd does not play wma files
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         184768
>Category:       ports
>Synopsis:       [PATCH] audio/musicpd does not play wma files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 14 20:50:00 UTC 2013
>Closed-Date:    Sun Dec 15 18:49:34 UTC 2013
>Last-Modified:  Sun Dec 15 18:50:00 UTC 2013
>Originator:     Thomas Zander
>Release:        
>Organization:
>Environment:
>Description:
Since musicpd uses ffmpeg >= 1.0, it does no longer play wma files.

A trivial patch for this change to the ffmpeg API has been committed upstream but did not make it into a release yet, see

https://github.com/bjaglin/mpd/commit/a84774fd46e4f3b6147bfd3d19ff4841bde8c98d

Since we don't know when the next release of mpd with this patch will be, we should include this into our ports tree for now.
>How-To-Repeat:
Play any wma or asf file that works in mplayer. It won't work in the ports version of musicpd.
>Fix:
Patch is attached. Just place it in ${PORTSDIR}/audio/musicpd/files. Rebuild musicpd. All good :-)

Patch attached with submission follows:

--- src/decoder/ffmpeg_decoder_plugin.c.orig	2013-01-07 01:39:40.000000000 +0100
+++ src/decoder/ffmpeg_decoder_plugin.c	2013-12-14 21:22:19.284609914 +0100
@@ -395,6 +395,11 @@
 #endif
 		return SAMPLE_FORMAT_S32;
 
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
+	case AV_SAMPLE_FMT_FLTP:
+		return SAMPLE_FORMAT_FLOAT;
+#endif
+
 	default:
 		break;
 	}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Dec 14 20:50:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184768 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Sun Dec 15 18:49:33 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184768: commit references a PR
Date: Sun, 15 Dec 2013 18:49:23 +0000 (UTC)

 Author: crees
 Date: Sun Dec 15 18:49:15 2013
 New Revision: 336565
 URL: http://svnweb.freebsd.org/changeset/ports/336565
 
 Log:
   Fix WMA playback.
   
   0.18 update will come soon, but it's proving nontrivial
   due to a substantial rewrite in c++!
   
   PR:		ports/184768
   Submitted by:	Thomas Zander <thomas.e.zander@googlemail.com>
 
 Added:
   head/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c   (contents, props changed)
 Modified:
   head/audio/musicpd/Makefile
 
 Modified: head/audio/musicpd/Makefile
 ==============================================================================
 --- head/audio/musicpd/Makefile	Sun Dec 15 18:35:11 2013	(r336564)
 +++ head/audio/musicpd/Makefile	Sun Dec 15 18:49:15 2013	(r336565)
 @@ -2,7 +2,7 @@
  
  PORTNAME=	musicpd
  PORTVERSION=	0.17.3
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	audio ipv6
  MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
  DISTNAME=	mpd-${PORTVERSION}
 
 Added: head/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c	Sun Dec 15 18:49:15 2013	(r336565)
 @@ -0,0 +1,15 @@
 +--- src/decoder/ffmpeg_decoder_plugin.c.orig	2013-01-07 01:39:40.000000000 +0100
 ++++ src/decoder/ffmpeg_decoder_plugin.c	2013-12-14 21:22:19.284609914 +0100
 +@@ -395,6 +395,11 @@
 + #endif
 + 		return SAMPLE_FORMAT_S32;
 + 
 ++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
 ++	case AV_SAMPLE_FMT_FLTP:
 ++		return SAMPLE_FORMAT_FLOAT;
 ++#endif
 ++
 + 	default:
 + 		break;
 + 	}
 +
 _______________________________________________
 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:
