aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-03-01 16:37:52 +0000
committerTom Rini <tom_rini@mentor.com>2011-03-01 14:03:49 -0700
commit8c6a3711e329522bf1fd2e6c020509c122c235ab (patch)
tree365cea2667b3266b0d3dd7005ec87fbe0546026c
parent2bd8ccc0627edd10eca5716f607773d0f289e9e9 (diff)
downloadopenembedded-8c6a3711e329522bf1fd2e6c020509c122c235ab.zip
openembedded-8c6a3711e329522bf1fd2e6c020509c122c235ab.tar.gz
openembedded-8c6a3711e329522bf1fd2e6c020509c122c235ab.tar.bz2
libvpx: force arm mode to be able to link with ffmpeg where arm mode already is forcedrelease-2011.03
* v2: updated INC_PR after 0478950960e5c600efc77c25559fc7eee311f686 Signed-off-by: Tom Rini <tom_rini@mentor.com>
-rw-r--r--recipes/webm/libvpx.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc
index a1e02b1..fd82d77 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