From 308bbb0a550a70439701834dae44447f24383fa7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Mar 2009 18:40:37 +0100
Subject: x264: fix a few bugs * quoting EXTRA_OECONF = "something"$FOO"" is
 wrong * passing --enable-shared and then doing CFLAGS += -static is wrong as
 well * the beagleboard 'optimizations' were duplicating flags already there,
 and worse passed in O3 when O4 was the default * adding machine optimizations
 without changing package arch is wrong as well

---
 recipes/vlc/x264_r2245.bb | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'recipes/vlc')

diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
index f7d43eaba5..e16e96b8b6 100644
--- a/recipes/vlc/x264_r2245.bb
+++ b/recipes/vlc/x264_r2245.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "H.264 encoder"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 X264PV = "snapshot-20090127-2245"
 
@@ -13,19 +13,12 @@ inherit autotools lib_package
 # default --extra-cflags
 X264_ECFLAGS = ""
 
-# optimizing --extra-cflags for beagleboard
-X264_ECFLAGS_beagleboard = " \
-        -s -save-temps -static -Wall -O3 -march=armv7-a \
-        -mtune=cortex-a8 -mcpu=cortex-a8 -mfloat-abi=softfp \
-        -mfpu=neon -ftree-vectorize -fomit-frame-pointer -ffast-math \
-"
-
 # disable use of assembler written functions
 X264_DISABLE_ASM = "--disable-asm"
 # use assembler written functions for those archs supporting this
 #X264_DISABLE_ASM_x86 = ""
 
-EXTRA_OECONF = "--enable-shared ${X264_DISABLE_ASM} --extra-cflags="${X264_ECFLAGS}""
+EXTRA_OECONF = '--enable-shared ${X264_DISABLE_ASM} --extra-cflags="${X264_ECFLAGS}"'
 
 do_stage() {
         autotools_stage_all
-- 
cgit 1.2.3-korg