summaryrefslogtreecommitdiff
path: root/recipes/mplayer/mplayer_svn.bb
diff options
context:
space:
mode:
authorGregoire Gentil <gregoire@gentil.com>2009-04-24 09:16:02 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-24 09:16:02 +0200
commitb4d5cf802d35f58a5c357864eb137c9b45b1cd01 (patch)
treeb6a2dac433495495190b916074fd34c908e7004d /recipes/mplayer/mplayer_svn.bb
parentf5daa62a4430164c4f9f7c34e8d7c53e37af8875 (diff)
mplayer: reenable vo_omapfb patch
Diffstat (limited to 'recipes/mplayer/mplayer_svn.bb')
-rw-r--r--recipes/mplayer/mplayer_svn.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index fa39d796fd..3042a3ced0 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -16,7 +16,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
"
SRC_URI_append_armv7a = " \
-# file://omapfb.patch;patch=1 \
+ file://omapfb.patch;patch=1 \
file://vo_omapfb.c \
file://yuv.S \
"
@@ -37,7 +37,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
PV = "0.0+1.0rc2+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -198,6 +198,8 @@ do_configure_prepend_armv7a() {
cp ${WORKDIR}/vo_omapfb.c ${S}/libvo
cp ${STAGING_KERNEL_DIR}/arch/arm/plat-omap/include/mach/omapfb.h ${S}/libvo/omapfb.h || true
cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S}/libvo/omapfb.h || true
+ cp ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ${S}/libvo/omapfb.h || true
+ sed -e 's/__user//g' -i ${S}/libvo/omapfb.h || true
}
CFLAGS_append = " -I${S}/libdvdread4 "