ports/126354: multimedia/mplayer vs. ffmpeg compile-Error (redefine)

[Thomas E. Zander]

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

From: "Thomas E. Zander" <riggs at rrr.de>
To: bug-followup at 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--