From d68a6d8a5b3a7c35d6cfdcf35e9f74f88f2202eb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 23 Nov 2008 23:26:26 +0100 Subject: mplayer svn: make omapfb armv7a specific, since it contains armv7a and NEON assembler which makes gcc choke on non armv7a platforms --- packages/mplayer/mplayer_svn.bb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'packages/mplayer') diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index 4ab8d79054..d532a9f018 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -24,7 +24,9 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://mru-neon-vector-fmul.diff;patch=1 \ file://configh \ file://configmak \ - file://omapfb.patch;patch=1 \ + " + +SRC_URI_append_armv7a = " file://omapfb.patch;patch=1 \ file://vo_omapfb.c \ file://yuv.S \ " @@ -201,17 +203,19 @@ 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 ${WORKDIR}/yuv.S ${S}/libvo + 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 +} + do_configure() { sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure - cp ${WORKDIR}/yuv.S ${S}/libvo - 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 - ./configure ${EXTRA_OECONF} cat ${WORKDIR}/configh >> ${S}/config.h -- cgit v1.2.3