From: Tom Rini <tom_rini@mentor.com>
Date: Tue, 1 Mar 2011 21:04:34 +0000 (-0700)
Subject: Revert "libvpx: force arm mode to be able to link with ffmpeg where arm mode already... 
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5205a53c996769f1e1156c175619db48ce4ef4ac;p=openembedded.git

Revert "libvpx: force arm mode to be able to link with ffmpeg where arm mode already is forced"

We back this out after the release in order to not mask the problem.

This reverts commit 8c6a3711e329522bf1fd2e6c020509c122c235ab.
---

diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc
index fd82d77a6a..a1e02b112f 100644
--- a/recipes/webm/libvpx.inc
+++ b/recipes/webm/libvpx.inc
@@ -1,15 +1,11 @@
 DESCRIPTION = "vpx Multi-Format Codec SDK"
 LICENSE = "BSD"
 
-INC_PR = "r7"
+INC_PR = "r6"
 
 SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
 S = "${WORKDIR}/libvpx-v${PV}"
 
-# ffmpeg links with this and fails 
-# 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"
 
 export CC