From: Martin Jansa <martin.jansa@gmail.com>
Date: Tue, 1 Mar 2011 16:37:52 +0000 (+0000)
Subject: libvpx: force arm mode to be able to link with ffmpeg where arm mode already is forced
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6a3711e329522bf1fd2e6c020509c122c235ab;p=openembedded.git

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

* v2: updated INC_PR after 0478950960e5c600efc77c25559fc7eee311f686

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---

diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc
index a1e02b112f..fd82d77a6a 100644
--- a/recipes/webm/libvpx.inc
+++ b/recipes/webm/libvpx.inc
@@ -1,11 +1,15 @@
 DESCRIPTION = "vpx Multi-Format Codec SDK"
 LICENSE = "BSD"
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 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