From rsmith@xs4all.nl  Sun Oct  8 11:02:12 2006
Return-Path: <rsmith@xs4all.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C257C16A40F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Oct 2006 11:02:12 +0000 (UTC)
	(envelope-from rsmith@xs4all.nl)
Received: from smtp-vbr14.xs4all.nl (smtp-vbr14.xs4all.nl [194.109.24.34])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3915243D55
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Oct 2006 11:02:12 +0000 (GMT)
	(envelope-from rsmith@xs4all.nl)
Received: from slackbox.xs4all.nl (slackbox.xs4all.nl [213.84.242.160])
	by smtp-vbr14.xs4all.nl (8.13.8/8.13.8) with ESMTP id k98B2A7j020472
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 8 Oct 2006 13:02:11 +0200 (CEST)
	(envelope-from rsmith@xs4all.nl)
Received: by slackbox.xs4all.nl (Postfix, from userid 1001)
	id 44446B845; Sun,  8 Oct 2006 13:02:10 +0200 (CEST)
Message-Id: <20061008110210.44446B845@slackbox.xs4all.nl>
Date: Sun,  8 Oct 2006 13:02:10 +0200 (CEST)
From: Roland Smith <rsmith@xs4all.nl>
Reply-To: Roland Smith <rsmith@xs4all.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] enable optional FLAC support for multimedia/audacious
X-Send-Pr-Version: 3.113
X-GNATS-Notify: redchrom@gmail.com

>Number:         104155
>Category:       ports
>Synopsis:       [PATCH] enable optional FLAC support for multimedia/audacious
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lawrance
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 08 11:10:21 GMT 2006
>Closed-Date:    Tue Oct 31 08:36:03 GMT 2006
>Last-Modified:  Tue Oct 31 08:36:03 GMT 2006
>Originator:     Roland Smith
>Release:        FreeBSD 6.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD slackbox.xs4all.nl 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat Sep 9 14:46:57 CEST 2006 rsmith@slackbox.xs4all.nl:/usr/obj/usr/src/sys/RFS amd64


	
>Description:
	FLAC support in multimedia/audacious is currently disabled. 
>How-To-Repeat:
	cd /usr/ports/multimedia/audacious; make config install clean
>Fix:
Apply the following patches to the port Makefile and plist. They make FLAC
an optional dependency. 

Note that this also fixes a typo in CONFIGURE_ARGS; '--disable-flc' should
be '--disable-flac', according to the configure script for audacious.

---------- Makefile patch ----------
--- Makefile.orig	Sun Oct  8 12:24:06 2006
+++ Makefile	Sun Oct  8 12:40:06 2006
@@ -32,8 +32,8 @@
 		INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
-CONFIGURE_ARGS=	--disable-jack --disable-flc --disable-adplug \
-	--disable-lirc --disable-alsa --disable-amidiplug --disable-arts --disable-wma
+CONFIGURE_ARGS=	--disable-jack --disable-adplug --disable-lirc \
+--disable-alsa --disable-amidiplug --disable-arts --disable-wma
 
 MAN1=		audacious.1
 
@@ -46,6 +46,7 @@
 
 OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		MODPLUG	"Enable modplug input" off \
+		FLAC	"Enable FLAC input" off \
 		SID	"Enable sid input" off \
 		MPC	"Enable mpc input" off \
 		ESOUND	"Enable Esound output"  off \
@@ -74,6 +75,15 @@
 .else
 PLIST_SUB+=	MODPLUG="@comment "
 CONFIGURE_ARGS+=	--disable-modplug
+.endif
+
+.if !defined(WITHOUT_FLAC)
+INPUT_PLUGINS+=	flac
+PLIST_SUB+=	FLACPLUGIN=""
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+.else
+PLIST_SUB+=	FLACPLUGIN="@comment "
+CONFIGURE_ARGS+=	--disable-flac
 .endif
 
 .if !defined(WITHOUT_SID)
---------- Makefile patch ----------

---------- pkg-plist patch ----------
--- pkg-plist.orig	Sun Oct  8 12:36:20 2006
+++ pkg-plist	Sun Oct  8 12:37:44 2006
@@ -29,6 +29,7 @@
 lib/audacious/Input/libtimidity.so
 %%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
 %%MODPLUG%%lib/audacious/Input/libmodplug.so
+%%FLACPLUGIN%%lib/audacious/Input/libflac.so
 %%MPCPLUGIN%%lib/audacious/Input/libmpc.so
 %%SIDPLUGIN%%lib/audacious/Input/libsid.so
 lib/audacious/Input/libwav.so
---------- pkg-plist patch ----------


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Oct 8 11:10:41 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104155 
Responsible-Changed-From-To: freebsd-ports-bugs->lawrance 
Responsible-Changed-By: lawrance 
Responsible-Changed-When: Sun Oct 8 11:31:42 UTC 2006 
Responsible-Changed-Why:  
Looking at audacious lately.  Take it. 

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

From: Sam Lawrance <lawrance@FreeBSD.org>
To: bug-followup@FreeBSD.org,  rsmith@xs4all.nl
Cc:  
Subject: Re: ports/104155: [PATCH] enable optional FLAC support for multimedia/audacious
Date: Sun, 15 Oct 2006 22:51:35 +1000

 Roland,
 
 This change will have to wait until after the ports freeze.
 
 Cheers
 Sam
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104155: commit references a PR
Date: Tue, 31 Oct 2006 08:28:08 +0000 (UTC)

 lawrance    2006-10-31 08:28:03 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/audacious Makefile pkg-plist 
   Log:
   Add a port option to build with FLAC support.
   
   PR:             ports/104155
   Submitted by:   Roland Smith <rsmith@xs4all.nl>
   Approved by:    Stepan Zastupov <redchrom@gmail.com> (maintainer, timeout 3 weeks)
   
   Revision  Changes    Path
   1.20      +12 -2     ports/multimedia/audacious/Makefile
   1.15      +1 -0      ports/multimedia/audacious/pkg-plist
 _______________________________________________
 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"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: lawrance 
State-Changed-When: Tue Oct 31 08:35:51 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104155 
>Unformatted:
