From 25b7dc640f3cb3a77a9aef7d2b0a4d1e9b75de93 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Mon, 5 Oct 2009 20:58:45 +0200
Subject: [PATCH] mplayer: - remove fribidi support - build against ffmpeg

---
 packages/multimedia/mplayer/build   | 14 ++------------
 packages/multimedia/mplayer/install |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/multimedia/mplayer/build b/packages/multimedia/mplayer/build
index c06874f6b1..8b917d26bf 100755
--- a/packages/multimedia/mplayer/build
+++ b/packages/multimedia/mplayer/build
@@ -6,11 +6,10 @@ $SCRIPTS/build toolchain
 $SCRIPTS/build zlib
 $SCRIPTS/build alsa-lib
 $SCRIPTS/build freetype
-$SCRIPTS/build fribidi
 $SCRIPTS/build libiconv
 $SCRIPTS/build libcdio
 $SCRIPTS/build lame
-$SCRIPTS/build ffmpeg-mt
+$SCRIPTS/build ffmpeg
 $SCRIPTS/build libdvdread
 $SCRIPTS/build libdvdcss
 $SCRIPTS/build libdvdnav
@@ -40,10 +39,6 @@ else
                       --disable-xf86keysym"
 fi
 
-#$SCRIPTS/build vesautils
-
-# setup_toolchain --optimize target
-
 EXTRA_LIBDIR="-L$SYSROOT_PREFIX/usr/lib"
 EXTRA_INCDIR="-I$SYSROOT_PREFIX/usr/include"
 EXTRA_LIBS="-liconv"
@@ -63,11 +58,6 @@ else
                 --disable-crash-debug"
 fi
 
-#            --nm=$NM \
-#            --ar=$AR \
-#            --ranlib=$RANLIB \
-#\
-
 cd $PKG_BUILD
 ./configure --prefix=/usr \
             --confdir=/usr/etc/mplayer \
@@ -149,7 +139,7 @@ cd $PKG_BUILD
             --disable-unrarexec \
             --enable-menu \
             --disable-sortsub \
-            --enable-fribidi \
+            --disable-fribidi \
             --with-fribidi-config="$ROOT/$TOOLCHAIN/bin/fribidi-config" \
             --disable-enca \
             --disable-maemo \
diff --git a/packages/multimedia/mplayer/install b/packages/multimedia/mplayer/install
index 7bbb5b31e7..f9179d7fd7 100755
--- a/packages/multimedia/mplayer/install
+++ b/packages/multimedia/mplayer/install
@@ -8,7 +8,7 @@ $SCRIPTS/install freetype
 $SCRIPTS/install libiconv
 $SCRIPTS/install libcdio
 #$SCRIPTS/install faad2
-$SCRIPTS/install ffmpeg-mt
+$SCRIPTS/install ffmpeg
 $SCRIPTS/install libdvdread
 $SCRIPTS/install libdvdcss
 $SCRIPTS/install libdvdnav