aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-01-31 10:25:19 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-01-31 10:25:42 +0100
commitc9da23eca69958718b63b47e34e6db638f0e4676 (patch)
tree020cd7c38592efb2eaac24b0ae064ea4ef0b10ca
parenta0b2f222c859d69d2b69426d05d4c80f268428dd (diff)
downloadopenembedded-c9da23eca69958718b63b47e34e6db638f0e4676.tar.gz
mplayer_git: bump SRCREV
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/mplayer/mplayer/0001-video-out-for-omapfb-support.patch2
-rw-r--r--recipes/mplayer/mplayer_git.bb7
2 files changed, 2 insertions, 7 deletions
diff --git a/recipes/mplayer/mplayer/0001-video-out-for-omapfb-support.patch b/recipes/mplayer/mplayer/0001-video-out-for-omapfb-support.patch
index aec7a15f81..dd1bd2ac9b 100644
--- a/recipes/mplayer/mplayer/0001-video-out-for-omapfb-support.patch
+++ b/recipes/mplayer/mplayer/0001-video-out-for-omapfb-support.patch
@@ -110,7 +110,7 @@ index 0000000..b26ee3a
+#include "video_out.h"
+#include "video_out_internal.h"
+#include "fastmemcpy.h"
-+#include "sub.h"
++#include "sub/sub.h"
+#include "mp_msg.h"
+#include "omapfb.h"
+#include "x11_common.h"
diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
index a762da81a5..dcfdf94820 100644
--- a/recipes/mplayer/mplayer_git.bb
+++ b/recipes/mplayer/mplayer_git.bb
@@ -20,7 +20,7 @@ SRC_URI_append_armv7a = " \
# ie. for all armv4 machines.
SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
-SRCREV = "81f0b8dacff926d46438faedb1a56da3946a8d2a"
+SRCREV = "17c4546a5123774a8832c083b9227a5abb3b2716"
PACKAGE_ARCH_collie = "collie"
PACKAGE_ARCH_c7x0 = "c7x0"
@@ -93,18 +93,14 @@ EXTRA_OECONF = " \
--disable-xanim \
--disable-real \
--disable-xvid \
- --disable-x264 \
\
--enable-tremor-low \
\
--disable-speex \
--enable-theora \
- --disable-faac \
--disable-ladspa \
--disable-libdv \
--enable-mad \
- --disable-toolame \
- --disable-twolame \
--disable-xmms \
--disable-mp3lib \
--enable-libmpeg2 \
@@ -130,7 +126,6 @@ EXTRA_OECONF = " \
--disable-xinerama \
--enable-x11 \
--enable-fbdev \
- --disable-mlib \
--disable-3dfx \
--disable-tdfxfb \
--disable-s3fb \