From owner-freebsd-ports-bugs@FreeBSD.ORG  Mon Aug 18 13:40:04 2008
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
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 2BB1C1065683
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Mon, 18 Aug 2008 13:40:04 +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 202258FC12
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Mon, 18 Aug 2008 13:40:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IDe3UG098403
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Mon, 18 Aug 2008 13:40:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7IDe3wW098402;
	Mon, 18 Aug 2008 13:40:03 GMT (envelope-from gnats)
Date: Mon, 18 Aug 2008 13:40:03 GMT
Message-Id: <200808181340.m7IDe3wW098402@freefall.freebsd.org>
To: freebsd-ports-bugs@FreeBSD.org
From: "Thomas E. Zander" <riggs@rrr.de>
Cc: 
Subject: Re: ports/126354: multimedia/mplayer vs. ffmpeg compile-Error
	(redefine)
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: "Thomas E. Zander" <riggs@rrr.de>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Aug 2008 13:40:04 -0000

The following reply was made to PR ports/126354; it has been noted by GNATS.

From: "Thomas E. Zander" <riggs@rrr.de>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/126354: multimedia/mplayer vs. ffmpeg compile-Error
	(redefine)
Date: Mon, 18 Aug 2008 21:28:57 +0800

 --FCuugMFkClbJLl1L
 Content-Type: text/plain; charset=iso-8859-15
 Content-Disposition: inline
 
 Here is the fix.
 
 Diff to the current mplayer port is attached. This also fixes the build
 of mencoder which obviously suffers the same issue.
 
 It uses a similar hack as in
 http://lists.freebsd.org/pipermail/freebsd-multimedia/2008-July/008856.html
 but does it directly in mplayer's configure script.
 
 Riggs
 
 --FCuugMFkClbJLl1L
 Content-Type: text/plain; charset=iso-8859-15
 Content-Disposition: attachment; filename="mplayer_diff.txt"
 
 diff -ruN /usr/ports/multimedia/mplayer/files/patch-ad mplayer/files/patch-ad
 --- /usr/ports/multimedia/mplayer/files/patch-ad	2007-12-16 13:05:16.000000000 +0800
 +++ mplayer/files/patch-ad	2008-08-18 20:38:00.000000000 +0800
 @@ -1,5 +1,5 @@
  --- configure.orig	2007-10-08 03:49:33.000000000 +0800
 -+++ configure	2007-11-11 13:09:59.000000000 +0800
 ++++ configure	2008-08-18 20:37:59.000000000 +0800
  @@ -62,9 +62,9 @@
     echo >> "$TMPLOG"
     cat "$1" >> "$TMPLOG"
 @@ -47,6 +47,15 @@
         macppc|ppc|ppc64) host_arch=ppc ;;
         alpha) host_arch=alpha ;;
         sparc) host_arch=sparc ;;
 +@@ -1307,7 +1299,7 @@
 + 
 + if freebsd ; then
 +   _ld_extra="$_ld_extra -L/usr/local/lib"
 +-  _inc_extra="$_inc_extra -I/usr/local/include"
 ++  _inc_extra="$_inc_extra -I... -I.../libavutil"
 + fi
 + 
 + if darwin; then
  @@ -1524,25 +1516,10 @@
   
   # Cygwin has /proc/cpuinfo, but only supports Intel CPUs
 
 --FCuugMFkClbJLl1L--