ports/131204: audio/musicpd: fix aac decoding

[Henrik Friedrichsen]

>Number:         131204
>Category:       ports
>Synopsis:       audio/musicpd: fix aac decoding
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 31 13:10:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Henrik Friedrichsen
>Release:        7.1-STABLE
>Organization:
>Environment:
FreeBSD kiwi.icecap 7.1-STABLE FreeBSD 7.1-STABLE #0: Thu Jan 29 23:20:34 CET 2009     root at kiwi.icecap:/usr/obj/usr/src/sys/PLUTONIUM  i386

>Description:
Since the musicpd update in ports, compilation with libfaad2 won't work anymore.
In order to still play mp4/m4a/aac files, musicpd has to rely on a ffmpeg built with libfaad support. This patch adds that option to the musicpd port and removes the AAC knob.
While ffmpeg will play AAC audio, it won't provide metadata yet, however this is better than not having AAC support at all.

There are also other knobs that should be updated:
configure: WARNING: unrecognized options: --enable-mpd-id3tag, --disable-shout
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Naur ./Makefile ../musicpd/Makefile
--- ./Makefile	2009-01-31 13:53:15.000000000 +0100
+++ ../musicpd/Makefile	2009-01-31 13:47:46.000000000 +0100
@@ -40,9 +40,9 @@
 		VORBIS		"Support OGG Vorbis audio format"	on \
 		TREMOR		"Support Tremor (integer-only Vorbis)"	off \
 		WAV		"Support WAV audio format"		on \
-		AAC		"Support MP4/AAC audio format"		off \
 		MUSEPACK	"Support MPC audio format"		off \
 		MOD		"Support MOD audio format"		off \
+		FFMPEG		"Support FFMPEG library"		on \
 		ICONV		"Support international characters"	on \
 	        ID3TAG		"Support id3v1 tag encoding"		off \
 		IPV6		"Support IPv6 protocol"			on \
@@ -73,12 +73,6 @@
 LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
 .endif
 
-.if defined(WITH_AAC)
-LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
-.else
-CONFIGURE_ARGS+=--disable-aac
-.endif
-
 .if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 .endif
@@ -101,6 +95,13 @@
 CONFIGURE_ARGS+=--disable-mod
 .endif
 
+.if defined(WITH_FFMPEG)
+CONFIGURE_ARGS+=--enable-ffmpeg
+LIB_DEPENDS+=	avformat:${PORTSDIR}/multimedia/ffmpeg
+.else
+CONFIGURE_ARGS+=--disable-ffmpeg
+.endif
+
 .if defined(WITHOUT_ICONV)
 CONFIGURE_ARGS+=--disable-iconv
 .else


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