[SCM] libav/experimental: Add patch 02 to fix build on armel without armv5te support.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Jan 20 18:24:32 UTC 2013


The following commit has been merged in the experimental branch:
commit 49ae9f8a3aa14b2a9186e5a34ab985063086f8c2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jan 20 15:54:22 2013 +0100

    Add patch 02 to fix build on armel without armv5te support.

diff --git a/debian/patches/02-fix-build-on-non-armv5te.patch b/debian/patches/02-fix-build-on-non-armv5te.patch
new file mode 100644
index 0000000..6f263ee
--- /dev/null
+++ b/debian/patches/02-fix-build-on-non-armv5te.patch
@@ -0,0 +1,28 @@
+Description: Fix build on armel without armv5te support.
+ libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that
+ assembling armv5te code will always succeed even if the default -march
+ flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code
+ with the default arch.
+ .
+ Fixes the missing symbol ff_prefetch_arm with --cpu= not including
+ armv5te.
+Origin: upstream, https://patches.libav.org/patch/33688/
+Author: Janne Grunau <janne-libav at jannau.net>
+Forwarded: yes
+Last-Update: 2013-01-20
+
+--- a/libavcodec/arm/videodsp_armv5te.S
++++ b/libavcodec/arm/videodsp_armv5te.S
+@@ -22,7 +22,6 @@
+ #include "config.h"
+ #include "libavutil/arm/asm.S"
+ 
+-#if HAVE_ARMV5TE_EXTERNAL
+ function ff_prefetch_arm, export=1
+         subs            r2,  r2,  #1
+         pld             [r0]
+@@ -30,4 +29,3 @@
+         bne             ff_prefetch_arm
+         bx              lr
+ endfunc
+-#endif
diff --git a/debian/patches/series b/debian/patches/series
index 3199e41..eb924c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+02-fix-build-on-non-armv5te.patch
 03-disable-configuration-warnings.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list