From 78add3cb4853a6c50ac4f8b41f92b85d6c31a6b3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 7 Nov 2011 12:22:49 +0100 Subject: mplayer2: drop omapfb patch and support, this can be applied from bsp layer if needed * example of working omapfb patch and optimizations is in meta-smartphone layer http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=483afbee82869a0b2dacadc4b9580c47dcb59d26 Signed-off-by: Martin Jansa --- meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb') diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 10a69a9961..f3b254e6d8 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb @@ -17,10 +17,6 @@ SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=master \ file://cross.compile.codec-cfg.patch \ " -SRC_URI_append_aarmv7a = " \ - file://0001-video-out-for-omapfb-support.patch \ - " - SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac" ARM_INSTRUCTION_SET = "ARM" @@ -40,9 +36,6 @@ CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ inherit autotools pkgconfig -# We want a kernel header for armv7a, but we don't want to make mplayer machine specific for that -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" - EXTRA_OECONF = " \ --prefix=/usr \ --mandir=${mandir} \ @@ -142,14 +135,6 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math" BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" -do_configure_prepend_armv7a() { - 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 - cp ${STAGING_DIR_TARGET}/kernel/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 " do_configure() { -- cgit 1.2.3-korg