aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/mplayer
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-03-11 10:25:12 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-03-16 13:34:31 +0100
commit20b1ca2cc5ce58a80ea94acae571467af145eb31 (patch)
treece8662af7ac312622a752feef3f5ab80f7cdbcc0 /recipes/mplayer
parent69c1b8c1862b63220fb31c5152086a03064d6932 (diff)
downloadopenembedded-20b1ca2cc5ce58a80ea94acae571467af145eb31.tar.gz
mplayer_git: bump SRCREV and remove unsupported option
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/mplayer')
-rw-r--r--recipes/mplayer/mplayer_git.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
index 4f56241598..8e206dc573 100644
--- a/recipes/mplayer/mplayer_git.bb
+++ b/recipes/mplayer/mplayer_git.bb
@@ -13,7 +13,6 @@ SRC_URI_om-gta02 = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=maste
"
SRC_URI_append = " \
- file://pld-onlyarm5-svn.patch;patch=1 \
file://makefile-nostrip-svn.patch;patch=1 \
"
@@ -29,8 +28,8 @@ SRC_URI_append_armv7a = " \
# ie. for all armv4 machines.
SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
-SRCREV_om-gta02 = "71807fcbb1eb35c337ef03f4f62d181963173550"
-SRCREV = "e5bcd70bc5b0557635ae51c7093f0e887493d4ba"
+SRCREV_om-gta02 = "5b7a3c944e39b8dad17eeae2c3bdc038662f9352"
+SRCREV = "f4a1d6e36eb2e9a92894ea42276f9e1087c4bd57"
PACKAGE_ARCH_collie = "collie"
PACKAGE_ARCH_c7x0 = "c7x0"
@@ -41,7 +40,7 @@ ARM_INSTRUCTION_SET = "ARM"
RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
-PV = "0.0+1.0rc3+gitr${SRCREV}"
+PV = "0.0+1.0rc4+gitr${SRCREV}"
PR = "r0"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_om-gta02 = "2"
@@ -137,7 +136,6 @@ EXTRA_OECONF = " \
--disable-dxr2 \
--disable-dxr3 \
--disable-dvb \
- --disable-dvbhead \
--disable-mga \
--disable-xmga \
--enable-xv \