1 files changed, 13 insertions, 2 deletions

diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc
index fbece03ac..8434f3841 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx.inc
+++ b/meta-oe/recipes-multimedia/webm/libvpx.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "vpx Multi-Format Codec SDK"
 LICENSE = "BSD"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
 S = "${WORKDIR}/libvpx-v${PV}"
@@ -10,7 +10,18 @@ S = "${WORKDIR}/libvpx-v${PV}"
 # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
 ARM_INSTRUCTION_SET = "arm"
 
-CFLAGS += "-fPIC"
+#-ftree-vectorize was causing ICE with gcc-4.6 from meta-oe, see
+# http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html
+#|     [CC] vpx_scale/generic/gen_scalers.c.o
+#| vpx_scale/generic/gen_scalers.c: In function 'vp8cx_vertical_band_3_4_scale_c':
+#| vpx_scale/generic/gen_scalers.c:537:6: internal compiler error: in vect_get_vec_def_for_stmt_copy, at tree-vect-stmts.c:1390
+#| Please submit a full bug report,
+#| with preprocessed source if appropriate.
+#| See <http://gcc.gnu.org/bugs.html> for instructions.
+#| make[1]: *** [vpx_scale/generic/gen_scalers.c.o] Error 1
+#| make: *** [.DEFAULT] Error 2
+
+CFLAGS += "-fPIC -fno-tree-vectorize"
 
 export CC
 export LD = "${CC}"