From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 16 Mar 2007 10:06:45 +0000 (+0000)
Subject: mplayer: disable the ffvorbis codec (ffmpeg) in mplayer on ARM machines
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ce0b99e32d18063644e813bb4dc5964f2c85a0;p=openembedded.git

mplayer: disable the ffvorbis codec (ffmpeg) in mplayer on ARM machines
- instead of this floating point codec, the fixed point vorbis codec
  (tremor) is used instead.
---

diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index ff3fab3d7b..3a388d21e3 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -33,7 +33,7 @@ PACKAGE_ARCH_mencoder_collie = "collie"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r10"
+PR = "r11"
 
 PARALLEL_MAKE = ""
 
@@ -173,6 +173,9 @@ EXTRA_OECONF = " \
         --disable-runtime-cpudetection \
         "
 
+EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
+			    --disable-encoder=vorbis_encoder"
+
 EXTRA_OECONF_append_c7x0 = " --enable-w100 --enable-imageon "
 EXTRA_OECONF_append_hx4700 = " --enable-imageon "
 EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"