update to 0.99.6

PR:		77882
Submitted by:	maintainer

1 files changed, 39 insertions, 20 deletions

diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index c80f3683b83e..cacd0e3812d9 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jul 15 00:04:42 2004
-+++ configure	Thu Jul 22 22:13:22 2004
-@@ -344,7 +344,7 @@
+--- configure.orig	Thu Dec 23 16:36:00 2004
++++ configure	Tue Feb  8 23:24:26 2005
+@@ -359,7 +359,7 @@
  
  
  # 1st pass checking for vital options
@@ -9,7 +9,23 @@
  _ranlib=ranlib
  _cc=cc
  test "$CC" && _cc="$CC"
-@@ -601,22 +601,10 @@
+@@ -461,14 +461,7 @@
+       case "`( uname -m ) 2>&1`" in
+       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
+       ia64) host_arch=ia64 ;;
+-      x86_64|amd64)
+-        if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
+-             -z "`echo $CFLAGS | grep -- -m32`"  ]; then
+-          host_arch=x86_64
+-        else
+-          host_arch=i386
+-        fi
+-      ;;
++      x86_64|amd64) host_arch=x86_64 ;;
+       macppc|ppc) host_arch=ppc ;;
+       alpha) host_arch=alpha ;;
+       sparc) host_arch=sparc ;;
+@@ -681,22 +674,10 @@
  _cpuinfo="echo"
  # Cygwin has /proc/cpuinfo, but only supports Intel CPUs
  # FIXME: Remove the cygwin check once AMD CPUs are supported
@@ -30,9 +46,9 @@
    _cpuinfo="TOOLS/cpuinfo"
 -fi
  
- case "$host_arch" in
-   i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
-@@ -1687,8 +1675,8 @@
+ x86_exts_check()
+ {
+@@ -1843,8 +1824,8 @@
      ;;
  
    *)
@@ -43,7 +59,7 @@
      ;;
  
    esac
-@@ -1698,7 +1686,7 @@
+@@ -1854,7 +1835,7 @@
  test -z "$_bindir" && _bindir="$_prefix/bin"
  test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
  test -z "$_mandir" && _mandir="$_prefix/man"
@@ -52,7 +68,7 @@
  test -z "$_libdir" && _libdir="$_prefix/lib"
  test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
  
-@@ -2371,13 +2359,7 @@
+@@ -2576,13 +2557,7 @@
  
  
  echocheck "memalign()"
@@ -66,8 +82,8 @@
  if test "$_memalign" = yes ; then
   _def_memalign='#define HAVE_MEMALIGN 1'
  else
-@@ -2465,45 +2447,10 @@
- 
+@@ -2671,48 +2646,11 @@
+ _def_threads='#undef HAVE_THREADS'
  
  echocheck "pthread"
 -cat > $TMPC << EOF
@@ -77,6 +93,8 @@
 -EOF
 -if mingw32 ; then
 -  _ld_pthread=''
+-elif hpux ; then
+-  _ld_pthread=''
 -elif ( cc_check && $TMPO ) ; then              # QNX
 -  _ld_pthread=''
 -elif ( cc_check -lpthread && $TMPO ) ; then
@@ -104,6 +122,7 @@
    echores "yes (using $_ld_pthread)"
    _pthreads='yes'
    _def_pthreads='#define HAVE_PTHREADS 1'
+   _def_threads='#define HAVE_THREADS 1'
 -else
 -  echores "no"
 -  _pthreads=''
@@ -113,7 +132,7 @@
  
  echocheck "sys/soundcard.h"
  cat > $TMPC << EOF
-@@ -4670,11 +4617,11 @@
+@@ -5000,11 +4938,11 @@
  
  
  echocheck "RTC"
@@ -127,16 +146,16 @@
  int main(void) { return RTC_IRQP_READ; }
  EOF
      _rtc=no
-@@ -5909,7 +5856,7 @@
+@@ -6314,7 +6252,7 @@
+   fi
    _stripbinaries=no
  elif test -z "$CFLAGS" ; then
-   if test "$host_arch" != "mips" ; then
--    CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
+-    CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
 +    CFLAGS="-O"
-   else
-     CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer"
-   fi
-@@ -5919,6 +5866,9 @@
+   # always compile with '-g' if .developer:
+   if test -f ".developer" ; then
+     CFLAGS="-g $CFLAGS"
+@@ -6324,6 +6262,9 @@
      _stripbinaries=no
    fi
  else
@@ -146,7 +165,7 @@
    cat <<EOF
  
  MPlayer compilation will use the CFLAGS set by you, but:
-@@ -5948,7 +5898,7 @@
+@@ -6363,7 +6304,7 @@
    CFLAGS="$CFLAGS -D_REENTRANT"
  elif bsd ; then
    # FIXME bsd needs this so maybe other OS'es