From 7dbc0ca1103d3ce445947979272038502ccf6cb0 Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Thu, 12 Apr 2012 22:19:52 +0100
Subject: [PATCH] libav_0.7.4: Add bbappend to fix the build on ARMv6 for now.

* Having to disable armvfp feels VERY wrong so this is not going upstream until I work out why.
---
 .../libavcodec-ac3dsp_armv6-patch-out-armv7.patch    | 12 ++++++++++++
 recipes-multimedia/libav/libav_0.7.4.bbappend        |  8 ++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 recipes-multimedia/libav/libav/libavcodec-ac3dsp_armv6-patch-out-armv7.patch
 create mode 100644 recipes-multimedia/libav/libav_0.7.4.bbappend

diff --git a/recipes-multimedia/libav/libav/libavcodec-ac3dsp_armv6-patch-out-armv7.patch b/recipes-multimedia/libav/libav/libavcodec-ac3dsp_armv6-patch-out-armv7.patch
new file mode 100644
index 0000000..6efa559
--- /dev/null
+++ b/recipes-multimedia/libav/libav/libavcodec-ac3dsp_armv6-patch-out-armv7.patch
@@ -0,0 +1,12 @@
+diff  a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S
+--- a/libavcodec/arm/ac3dsp_armv6.S
++++ b/libavcodec/arm/ac3dsp_armv6.S
+@@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
+         ldrb            r10, [r4], #1
+ 1:
+         ldrsh           r9,  [r0], #2                   @ mask[band]
+-        movw            r8,  #0x1fe0
++        ldr             r8,  =0x1fe0
+         sub             r9,  r9,  r12                   @   - snr_offset
+         mov             r11, r10
+         ldrb            r10, [r4], #1                   @ band_start_tab[band++]
diff --git a/recipes-multimedia/libav/libav_0.7.4.bbappend b/recipes-multimedia/libav/libav_0.7.4.bbappend
new file mode 100644
index 0000000..ec1edd7
--- /dev/null
+++ b/recipes-multimedia/libav/libav_0.7.4.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PRINC = "1"
+
+SRC_URI_append = " file://libavcodec-ac3dsp_armv6-patch-out-armv7.patch"
+
+EXTRA_OECONF_append_raspberrypi = " \
+        --cpu=arm1176jzf-s --disable-armvfp --disable-neon \
+"