From nobody@FreeBSD.org  Wed Jun 29 18:34:32 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 642B31065707
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 29 Jun 2011 18:34:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 44FCB8FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 29 Jun 2011 18:34:32 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5TIYW6q064242
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 29 Jun 2011 18:34:32 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p5TIYVHX064241;
	Wed, 29 Jun 2011 18:34:31 GMT
	(envelope-from nobody)
Message-Id: <201106291834.p5TIYVHX064241@red.freebsd.org>
Date: Wed, 29 Jun 2011 18:34:31 GMT
From: David Demelier <demelier.david@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] multimedia/mplayer: faad dependency problem
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: riggs@rrr.de

>Number:         158501
>Category:       ports
>Synopsis:       [patch] multimedia/mplayer: faad dependency problem
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 29 18:40:06 UTC 2011
>Closed-Date:    Sun Aug 21 08:12:10 UTC 2011
>Last-Modified:  Sun Aug 21 08:20:05 UTC 2011
>Originator:     David Demelier
>Release:        8.2-STABLE
>Organization:
>Environment:
FreeBSD Melon.malikania.fr 8.2-STABLE FreeBSD 8.2-STABLE #2: Mon Jun 27 14:05:45 CEST 2011     root@Melon.malikania.fr:/usr/obj/usr/src/sys/Melon  amd64

>Description:
The mplayer port automatically links to faad if it's installed (autoconf feature). Thus if you have faad installed because of an other port dependency and you'll remove this port faad will be marked as leave but mplayer still need it.

This patch prevents this case and user must specify itself the action or not. I choose the ON option by default.
>How-To-Repeat:

>Fix:
--- mplayer.diff begins here ---
--- Makefile	2011-06-29 20:28:54.000000000 +0200
+++ Makefile.orig	2011-06-29 20:13:01.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	3
+PORTREVISION=	2
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
@@ -31,7 +31,6 @@
 OPTIONS+=	RTC "Add support for kernel real time clock timing" off
 OPTIONS+=	ARTS "Enable KDE sound system support" off
 OPTIONS+=	ESOUND "Enable GNOME esound support" off
-OPTIONS+=	FAAD "FAAD AAC and MP4 audio decoder support" on
 OPTIONS+=	JACK "Enable JackIt audio server support" off
 OPTIONS+=	NAS "Enable NAS sound server support" off
 OPTIONS+=	OPENAL "Enable OpenAL sound support" off
--- Makefile.options.orig	2011-06-29 20:12:43.000000000 +0200
+++ Makefile.options	2011-06-29 20:15:55.000000000 +0200
@@ -109,6 +109,12 @@
 CONFIGURE_ARGS+=	--disable-live
 .endif
 
+.if defined(WITH_FAAD)
+LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+.else
+CONFIGURE_ARGS+=	--disable-faad
+.endif
+
 .if defined(WITH_JACK)
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .else
--- mplayer.diff ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Jun 29 18:41:00 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: riggs@rrr.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/158501: [patch] multimedia/mplayer: faad dependency problem
Date: Wed, 29 Jun 2011 18:40:58 UT

 Maintainer of multimedia/mplayer,
 
 Please note that PR ports/158501 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/158501
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Fri Aug 19 17:06:58 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

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

From: Chris Rees <chris@bayofrum.net>
To: bug-followup@FreeBSD.org, demelier.david@gmail.com
Cc:  
Subject: Re: ports/158501: [patch] multimedia/mplayer: faad dependency problem
Date: Fri, 19 Aug 2011 18:10:42 +0100

 Hi David,
 
 I might suggest defaulting to off, or it'll drag in a new dependency to 
 the package. Unless you complain I'll change it before I commit :)
 
 Chris
 
 -- 
 This message has been scanned for viruses and
 dangerous content by MailScanner, and is
 believed to be clean.
 
State-Changed-From-To: feedback->open 
State-Changed-By: crees 
State-Changed-When: Sat Aug 20 10:43:44 UTC 2011 
State-Changed-Why:  
Maintainer has fixed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158501 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Sun Aug 21 08:12:09 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158501: commit references a PR
Date: Sun, 21 Aug 2011 08:12:09 +0000 (UTC)

 crees       2011-08-21 08:11:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/mplayer   Makefile Makefile.options Makefile.shared 
   Log:
   - As discussed with maintainer, disable linking to external faad.
   - While here, add $FreeBSD$ to other Makefiles
   
   PR:             ports/158501
   Submitted by:   David Demelier <demelier.david@gmail.com>
   Reviewed by:    Thomas Zander <riggs@rrr.de> (maintainer), naddy
   Approved by:    Thomas Zander <riggs@rrr.de> (maintainer)
   
   Revision  Changes    Path
   1.209     +1 -0      ports/multimedia/mplayer/Makefile
   1.21      +2 -0      ports/multimedia/mplayer/Makefile.options
   1.13      +2 -0      ports/multimedia/mplayer/Makefile.shared
 _______________________________________________
 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:
