mplayer:

- various cleanups
- mplayer depends on libpng
- build with libva support
- include patches to support libva
- various patches

packages/multimedia/mplayer/build

@@ -6,6 +6,7 @@ $SCRIPTS/build toolchain
 $SCRIPTS/build zlib
 $SCRIPTS/build alsa-lib
 $SCRIPTS/build freetype
+$SCRIPTS/build libpng
 $SCRIPTS/build libiconv
 $SCRIPTS/build libcdio
 $SCRIPTS/build lame
@@ -13,35 +14,18 @@ $SCRIPTS/build ffmpeg
 $SCRIPTS/build libdvdread
 $SCRIPTS/build libdvdcss
 $SCRIPTS/build libdvdnav
+$SCRIPTS/build libva
+$SCRIPTS/build libX11
+$SCRIPTS/build libXv
+$SCRIPTS/build libXvMC
+$SCRIPTS/build $MESA
+$SCRIPTS/build xorg-server
+$SCRIPTS/build xf86-video-intel
 
-if [ "$DISPLAYSERVER" = xorg-server ]; then
-  $SCRIPTS/build libX11
-  $SCRIPTS/build libXv
-  $SCRIPTS/build libXvMC
-  $SCRIPTS/build $MESA
-  $SCRIPTS/build xorg-server
-  $SCRIPTS/build xf86-video-intel
-
-  MPLAYER_CONFIGOPTS="--enable-xv \
-                      --enable-xvmc \
-                      --disable-vdpau \
-                      --disable-vm \
-                      --disable-xinerama \
-                      --enable-x11 \
-                      --enable-xf86keysym"
-else
-  MPLAYER_CONFIGOPTS="--disable-xv \
-                      --disable-xvmc \
-                      --disable-vdpau \
-                      --disable-vm \
-                      --disable-xinerama \
-                      --disable-x11 \
-                      --disable-xf86keysym"
-fi
 
 EXTRA_LIBDIR="-L$SYSROOT_PREFIX/usr/lib"
 EXTRA_INCDIR="-I$SYSROOT_PREFIX/usr/include"
-EXTRA_LIBS="-liconv"
+EXTRA_LIBS="-liconv -lstdc++"
 EXTRA_LIBS="$EXTRA_LIBS -lavcodec -lavformat -lavutil -lpostproc -lswscale"
 CFLAGS="$CFLAGS -ffast-math -DFIXED_POINT"
 
@@ -81,7 +65,14 @@ cd $PKG_BUILD
             --extra-libs="$EXTRA_LIBS" \
 \
             $DEBUG_CONFIG \
-            $MPLAYER_CONFIG \
+            --enable-xv \
+            --enable-xvmc \
+            --disable-vdpau \
+            --enable-vaapi \
+            --disable-vm \
+            --disable-xinerama \
+            --enable-x11 \
+            --enable-xf86keysym \
 \
             --disable-dynamic-plugins \
             --disable-shm \
@@ -234,9 +225,9 @@ cd $PKG_BUILD
             --disable-dxr2 \
             --disable-dxr3 \
             --disable-ivtv \
-            --disable-v4l2 \
-            --disable-dvb \
-            --disable-dvbhead \
+            --enable-v4l2 \
+            --enable-dvb \
+            --enable-dvbhead \
             --disable-mga \
             --disable-xmga \
             --disable-xshape \

packages/multimedia/mplayer/install

@@ -5,6 +5,7 @@
 $SCRIPTS/install zlib
 $SCRIPTS/install alsa
 $SCRIPTS/install freetype
+$SCRIPTS/install libpng
 $SCRIPTS/install libiconv
 $SCRIPTS/install libcdio
 #$SCRIPTS/install faad2
@@ -12,15 +13,14 @@ $SCRIPTS/install ffmpeg
 $SCRIPTS/install libdvdread
 $SCRIPTS/install libdvdcss
 $SCRIPTS/install libdvdnav
+$SCRIPTS/install libX11
+$SCRIPTS/install libXv
+$SCRIPTS/install libXvMC
+$SCRIPTS/install libva
+$SCRIPTS/install $MESA
+$SCRIPTS/install xorg-server
+$SCRIPTS/install xf86-video-intel
 
-if [ "$DISPLAYSERVER" = xorg-server ]; then
-  $SCRIPTS/install libX11
-  $SCRIPTS/install libXv
-  $SCRIPTS/install libXvMC
-  $SCRIPTS/install $MESA
-  $SCRIPTS/install xorg-server
-  $SCRIPTS/install xf86-video-intel
-fi
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 

packages/multimedia/mplayer/patches/MPlayer-gcc_4.4.0_hack.diff

@@ -0,0 +1,32 @@
+diff -Naur MPlayer-29725-old/configure MPlayer-29725-new/configure
+--- MPlayer-29725-old/configure	2009-09-27 15:37:17.000000000 -0700
++++ MPlayer-29725-new/configure	2009-09-27 15:37:17.000000000 -0700
+@@ -2422,8 +2422,8 @@
+ __attribute__((noinline)) static int foo3(int i1, int i2, int i3) { return i3; }
+ int main(void) { return foo3(1,2,3) == 3 ? 0 : 1; }
+ EOF
+-  cc_check -O4 -mstackrealign && tmp_run && cflags_stackrealign=-mstackrealign
+-  test -z "$cflags_stackrealign" && cc_check -O4 -mstackrealign -fno-unit-at-a-time \
++  cc_check -O2 -mstackrealign && tmp_run && cflags_stackrealign=-mstackrealign
++  test -z "$cflags_stackrealign" && cc_check -O2 -mstackrealign -fno-unit-at-a-time \
+     && tmp_run && cflags_stackrealign="-mstackrealign -fno-unit-at-a-time"
+   test -n "$cflags_stackrealign" && echores "yes" || echores "no"
+ fi # if darwin && test "$cc_vendor" = "gnu" ; then
+@@ -2440,7 +2440,7 @@
+   elif test "$cc_vendor" != "gnu" ; then
+     CFLAGS="-O2 $_march $_mcpu $_pipe"
+   else
+-    CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
++    CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O2 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
+     extra_ldflags="$extra_ldflags -ffast-math"
+   fi
+ else
+@@ -6620,7 +6620,7 @@
+ EOF
+   _faac=no
+   for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do
+-    cc_check -O4 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
++    cc_check -O2 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
+   done
+ fi
+ if test "$_faac" = yes ; then