[oe-commits] Tom Rini : Revert "libvpx: force arm mode to be able to link with ffmpeg where arm mode already is forced "

[git version control]

Module: openembedded.git
Branch: master
Commit: 5205a53c996769f1e1156c175619db48ce4ef4ac
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5205a53c996769f1e1156c175619db48ce4ef4ac

Author: Tom Rini <tom_rini at mentor.com>
Date:   Tue Mar  1 14:04:34 2011 -0700

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.

---

 recipes/webm/libvpx.inc |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc
index fd82d77..a1e02b1 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